improve map initialization

strip prefixes in each section
CSS to follow

.dockerignore

@@ -0,0 +1,32 @@
+.idea
+.git
+Dockerfile
+
+
+# Gradle
+.gradle
+build
+apps/BOB/build
+apps/addressbook/build
+apps/desktopgui/build
+apps/i2pcontrol/build
+apps/i2psnark/build
+apps/i2ptunnel/build
+apps/imagegen/build
+apps/jetty/build
+apps/jrobin/build
+apps/ministreaming/java/build
+apps/ministreaming/build
+apps/routerconsole/build
+apps/sam/build
+apps/streaming/build
+apps/susidns/build
+apps/susimail/build
+apps/systray/build
+core/java/build
+core/build
+installer/build
+router/java/build
+router/build
+
+override.properties

.github/workflows/ant.yml

@@ -0,0 +1,34 @@
+# Mostly copied from https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
+# zlatinb
+
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: GetText
+        run: sudo apt install gettext
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: build with Ant
+        run: ant distclean pkg
+      - name: Upload installer.jar
+        uses: actions/upload-artifact@v2
+        with:
+          name: I2P-install.jar-${{ github.sha }}
+          path: install.jar
+        
+

.gitignore

@@ -54,4 +54,12 @@ sloccount.sc
 .settings/
 # IDEA
 *.iml
+.idea
 
+# Gradle
+.gradle
+
+# TODO: why does this file appear?
+apps/routerconsole/jsp/favicon.ico
+.tx
+/*.sh

.gitlab-ci.yml

@@ -0,0 +1,103 @@
+image: openjdk:8-alpine
+
+stages:
+    - test
+    - build
+
+test:gradle:
+    stage: test
+    coverage: '/Total.*?([0-9]{1,3})%/'
+    before_script:
+        - apk add --no-cache grep
+    script:
+        - ./gradlew codeCoverageReport
+        # The actual output that will be parsed by the code coverage
+        - grep -oP "Total.*?%" build/reports/jacoco/html/index.html
+    cache:
+        key: ${CI_COMMIT_REF_SLUG}
+        paths:
+            - $HOME/.gradle/caches/
+            - $HOME/.gradle/wrapper/
+            - .gradle
+    only:
+        - master
+        - merge_requests
+        - tags
+
+test:ant:
+    stage: test
+    image: debian:buster-slim
+    variables:
+        SCALA: https://downloads.lightbend.com/scala/2.12.13/scala-2.12.13.deb
+        LIBPREFIX: /usr/share/scala/lib
+        LIB_SCALATEST: https://repo1.maven.org/maven2/org/scalatest/scalatest_2.12/3.0.4/scalatest_2.12-3.0.4.jar
+        LIB_SCALACTIC: https://repo1.maven.org/maven2/org/scalactic/scalactic_2.12/3.0.4/scalactic_2.12-3.0.4.jar
+    before_script:
+        # Fix bug installing openjdk-11-jdk-headless's manuals
+        - mkdir -p /usr/share/man/man1/
+        - apt-get update -q
+        - apt-get install -y wget gettext
+            ant default-jdk-headless
+            libmockito-java libhamcrest-java junit4
+        # Install specific version of scala
+        - wget -qO scala.deb "${SCALA}"
+        - dpkg -i scala.deb
+        # link to the scala libs with the name `ant test` expects
+        - ln -s "${LIBPREFIX}/scala-xml_2.12-1.0.6.jar" "${LIBPREFIX}/scala-xml.jar"
+        # Download required scala libs
+        - wget -qO "${LIBPREFIX}/scalactic.jar" "${LIB_SCALACTIC}"
+        - wget -qO "${LIBPREFIX}/scalatest.jar" "${LIB_SCALATEST}"
+        # Point ant to the right directories
+        - echo scalatest.libs=/usr/share/scala/lib > override.properties
+        - echo junit.home=/usr/share/java >> override.properties
+        - echo hamcrest.home=/usr/share/java >> override.properties
+        - echo mockito.home=/usr/share/java >> override.properties
+        - echo build.built-by=GitHub Actions >> override.properties
+    script:
+        - ant test
+    only:
+        - master
+        - merge_requests
+        - tags
+
+# Make sure we can build a docker image
+# It's cached for later jobs
+build_docker:
+    stage: build
+    image: docker:24.0.7
+    services:
+        - docker:24.0.7-dind
+    script:
+        # Try to load latest branch image from local tar or from registry
+        - docker load -i ci-exports/$CI_COMMIT_REF_SLUG.tar || docker pull $CI_REGISTRY_IMAGE:latest || true
+        - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:latest .
+        - mkdir -p ci-exports/
+        - echo docker save $CI_REGISTRY_IMAGE:latest > ci-exports/$CI_COMMIT_REF_SLUG.tar
+    variables:
+        # When using dind service, we need to instruct docker to talk with
+        # the daemon started inside of the service. The daemon is available
+        # with a network connection instead of the default
+        # /var/run/docker.sock socket. Docker 19.03 does this automatically
+        # by setting the DOCKER_HOST in
+        # https://github.com/docker-library/docker/blob/d45051476babc297257df490d22cbd806f1b11e4/19.03/docker-entrypoint.sh#L23-L29
+        #
+        # The 'docker' hostname is the alias of the service container as described at
+        # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services.
+        #
+        # Specify to Docker where to create the certificates, Docker will
+        # create them automatically on boot, and will create
+        # `/certs/client` that will be shared between the service and job
+        # container, thanks to volume mount from config.toml
+        DOCKER_TLS_CERTDIR: "/certs"
+        # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
+        # DOCKER_HOST: tcp://docker:2376
+    cache:
+        # The same key should be used across branches
+        key: "$CI_COMMIT_REF_SLUG"
+        paths:
+            - ci-exports/
+    only:
+        - master
+        - merge_requests
+        - tags
+

.idea/ant.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build.xml" />
-  </component>
-</project>

.idea/compiler.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel>
-      <module name="addressbook_main" target="1.7" />
-      <module name="addressbook_test" target="1.7" />
-      <module name="BOB_main" target="1.7" />
-      <module name="BOB_test" target="1.7" />
-      <module name="core_main" target="1.7" />
-      <module name="core_test" target="1.7" />
-      <module name="desktopgui_main" target="1.7" />
-      <module name="desktopgui_test" target="1.7" />
-      <module name="i2psnark_main" target="1.7" />
-      <module name="i2psnark_test" target="1.7" />
-      <module name="i2ptunnel_main" target="1.7" />
-      <module name="i2ptunnel_test" target="1.7" />
-      <module name="installer_main" target="1.7" />
-      <module name="installer_test" target="1.7" />
-      <module name="jetty_main" target="1.7" />
-      <module name="jetty_test" target="1.7" />
-      <module name="jrobin_main" target="1.7" />
-      <module name="jrobin_test" target="1.7" />
-      <module name="ministreaming_main" target="1.7" />
-      <module name="ministreaming_test" target="1.7" />
-      <module name="router_main" target="1.7" />
-      <module name="router_test" target="1.7" />
-      <module name="routerconsole_main" target="1.7" />
-      <module name="routerconsole_test" target="1.7" />
-      <module name="sam_main" target="1.7" />
-      <module name="sam_test" target="1.7" />
-      <module name="streaming_main" target="1.7" />
-      <module name="streaming_test" target="1.7" />
-      <module name="susidns_main" target="1.7" />
-      <module name="susidns_test" target="1.7" />
-      <module name="susimail_main" target="1.7" />
-      <module name="susimail_test" target="1.7" />
-      <module name="systray_main" target="1.7" />
-      <module name="systray_test" target="1.7" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>

.idea/libraries/javax_servlet_jsp_2_2_0_v201112011158.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="javax.servlet.jsp-2.2.0.v201112011158">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jsp/javax.servlet.jsp-2.2.0.v201112011158.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/jettylib.xml

@@ -1,22 +0,0 @@
-<component name="libraryTable">
-  <library name="jettylib">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-security-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlets-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-deploy-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-util-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-servlet-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-http-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-xml-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-server-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/servlet-api-3.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-jmx-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-webapp-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-io-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-continuation-8.1.17.v20150415.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/lib/jetty-rewrite-8.1.17.v20150415.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/jrobin_1_5_9_1.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jrobin-1.5.9.1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/jrobin/jrobin-1.5.9.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/lib.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="lib">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/susidns/src/lib/jstl.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/susidns/src/lib/standard.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/start.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="start">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/jetty/jetty-distribution-8.1.17.v20150415/start.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/systray4j.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="systray4j">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/systray/java/lib/systray4j.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/tomcat_coyote_util.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="tomcat-coyote-util">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat/lib/tomcat-coyote-util.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/tomcat_lib.xml

@@ -1,12 +0,0 @@
-<component name="libraryTable">
-  <library name="tomcat-lib">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/el-api.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/jasper.jar!/" />
-      <root url="jar://$PROJECT_DIR$/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/wrapper.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="wrapper">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/installer/lib/wrapper/all/wrapper.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/wrapper_win.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="wrapper-win">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/installer/lib/wrapper/win-all/wrapper.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/misc.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ClientPropertiesManager">
-    <properties class="javax.swing.AbstractButton">
-      <property name="hideActionText" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JComponent">
-      <property name="html.disable" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JEditorPane">
-      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
-      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
-      <property name="charset" class="java.lang.String" />
-    </properties>
-    <properties class="javax.swing.JList">
-      <property name="List.isFileList" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JPasswordField">
-      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JSlider">
-      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
-      <property name="JSlider.isFilled" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JTable">
-      <property name="Table.isFileList" class="java.lang.Boolean" />
-      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
-      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JToolBar">
-      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
-    </properties>
-    <properties class="javax.swing.JTree">
-      <property name="JTree.lineStyle" class="java.lang.String" />
-    </properties>
-    <properties class="javax.swing.text.JTextComponent">
-      <property name="caretAspectRatio" class="java.lang.Double" />
-      <property name="caretWidth" class="java.lang.Integer" />
-    </properties>
-  </component>
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/BOB/BOB.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/BOB/BOB.iml" group="apps/BOB" />
-      <module fileurl="file://$PROJECT_DIR$/apps/BOB/BOB.iml" filepath="$PROJECT_DIR$/apps/BOB/BOB.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_main.iml" group="apps/BOB" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/BOB/BOB_test.iml" group="apps/BOB" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook.iml" group="apps/addressbook" />
-      <module fileurl="file://$PROJECT_DIR$/apps/addressbook/addressbook.iml" filepath="$PROJECT_DIR$/apps/addressbook/addressbook.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_main.iml" group="apps/addressbook" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/addressbook/addressbook_test.iml" group="apps/addressbook" />
-      <module fileurl="file://$PROJECT_DIR$/apps/admin/admin.iml" filepath="$PROJECT_DIR$/apps/admin/admin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/apps.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/apps.iml" group="apps" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/core/core.iml" filepath="$PROJECT_DIR$/.idea/modules/core/core.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/core/core_main.iml" filepath="$PROJECT_DIR$/.idea/modules/core/core_main.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/core/core_test.iml" filepath="$PROJECT_DIR$/.idea/modules/core/core_test.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui.iml" group="apps/desktopgui" />
-      <module fileurl="file://$PROJECT_DIR$/apps/desktopgui/desktopgui.iml" filepath="$PROJECT_DIR$/apps/desktopgui/desktopgui.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_main.iml" group="apps/desktopgui" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/desktopgui/desktopgui_test.iml" group="apps/desktopgui" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/i2p.i2p.sl.iml" filepath="$PROJECT_DIR$/.idea/modules/i2p.i2p.sl.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark.iml" group="apps/i2psnark" />
-      <module fileurl="file://$PROJECT_DIR$/apps/i2psnark/i2psnark.iml" filepath="$PROJECT_DIR$/apps/i2psnark/i2psnark.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_main.iml" group="apps/i2psnark" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2psnark/i2psnark_test.iml" group="apps/i2psnark" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel.iml" group="apps/i2ptunnel" />
-      <module fileurl="file://$PROJECT_DIR$/apps/i2ptunnel/i2ptunnel.iml" filepath="$PROJECT_DIR$/apps/i2ptunnel/i2ptunnel.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_main.iml" group="apps/i2ptunnel" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/i2ptunnel/i2ptunnel_test.iml" group="apps/i2ptunnel" />
-      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/identicon/identicon.iml" filepath="$PROJECT_DIR$/apps/imagegen/identicon/identicon.iml" />
-      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/imagegen/imagegen.iml" filepath="$PROJECT_DIR$/apps/imagegen/imagegen/imagegen.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/installer/installer.iml" filepath="$PROJECT_DIR$/.idea/modules/installer/installer.iml" group="installer" />
-      <module fileurl="file://$PROJECT_DIR$/installer/installer.iml" filepath="$PROJECT_DIR$/installer/installer.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/installer/installer_main.iml" filepath="$PROJECT_DIR$/.idea/modules/installer/installer_main.iml" group="installer" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/installer/installer_test.iml" filepath="$PROJECT_DIR$/.idea/modules/installer/installer_test.iml" group="installer" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jetty/jetty.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jetty/jetty.iml" group="apps/jetty" />
-      <module fileurl="file://$PROJECT_DIR$/apps/jetty/jetty.iml" filepath="$PROJECT_DIR$/apps/jetty/jetty.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_main.iml" group="apps/jetty" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jetty/jetty_test.iml" group="apps/jetty" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin.iml" group="apps/jrobin" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_main.iml" group="apps/jrobin" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/jrobin/jrobin_test.iml" group="apps/jrobin" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming.iml" group="apps/ministreaming" />
-      <module fileurl="file://$PROJECT_DIR$/apps/ministreaming/ministreaming.iml" filepath="$PROJECT_DIR$/apps/ministreaming/ministreaming.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_main.iml" group="apps/ministreaming" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/ministreaming/ministreaming_test.iml" group="apps/ministreaming" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/router/router.iml" filepath="$PROJECT_DIR$/.idea/modules/router/router.iml" group="router" />
-      <module fileurl="file://$PROJECT_DIR$/router/router.iml" filepath="$PROJECT_DIR$/router/router.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/router/router_main.iml" filepath="$PROJECT_DIR$/.idea/modules/router/router_main.iml" group="router" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/router/router_test.iml" filepath="$PROJECT_DIR$/.idea/modules/router/router_test.iml" group="router" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole.iml" group="apps/routerconsole" />
-      <module fileurl="file://$PROJECT_DIR$/apps/routerconsole/routerconsole.iml" filepath="$PROJECT_DIR$/apps/routerconsole/routerconsole.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_main.iml" group="apps/routerconsole" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/routerconsole/routerconsole_test.iml" group="apps/routerconsole" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/sam/sam.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/sam/sam.iml" group="apps/sam" />
-      <module fileurl="file://$PROJECT_DIR$/apps/sam/sam.iml" filepath="$PROJECT_DIR$/apps/sam/sam.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/sam/sam_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/sam/sam_main.iml" group="apps/sam" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/sam/sam_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/sam/sam_test.iml" group="apps/sam" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/streaming/streaming.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/streaming/streaming.iml" group="apps/streaming" />
-      <module fileurl="file://$PROJECT_DIR$/apps/streaming/streaming.iml" filepath="$PROJECT_DIR$/apps/streaming/streaming.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_main.iml" group="apps/streaming" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/streaming/streaming_test.iml" group="apps/streaming" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susidns/susidns.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susidns/susidns.iml" group="apps/susidns" />
-      <module fileurl="file://$PROJECT_DIR$/apps/susidns/susidns.iml" filepath="$PROJECT_DIR$/apps/susidns/susidns.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_main.iml" group="apps/susidns" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susidns/susidns_test.iml" group="apps/susidns" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susimail/susimail.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susimail/susimail.iml" group="apps/susimail" />
-      <module fileurl="file://$PROJECT_DIR$/apps/susimail/susimail.iml" filepath="$PROJECT_DIR$/apps/susimail/susimail.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_main.iml" group="apps/susimail" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/susimail/susimail_test.iml" group="apps/susimail" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/systray/systray.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/systray/systray.iml" group="apps/systray" />
-      <module fileurl="file://$PROJECT_DIR$/apps/systray/systray.iml" filepath="$PROJECT_DIR$/apps/systray/systray.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/systray/systray_main.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/systray/systray_main.iml" group="apps/systray" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/apps/systray/systray_test.iml" filepath="$PROJECT_DIR$/.idea/modules/apps/systray/systray_test.iml" group="apps/systray" />
-      <module fileurl="file://$PROJECT_DIR$/apps/imagegen/zxing/zxing.iml" filepath="$PROJECT_DIR$/apps/imagegen/zxing/zxing.iml" />
-    </modules>
-  </component>
-</project>

.idea/runConfigurations/updater.xml

@@ -1,6 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="updater" type="AntRunConfiguration" factoryName="Ant Target">
-    <antsettings antfile="file://$PROJECT_DIR$/build.xml" target="updater" />
-    <method />
-  </configuration>
-</component>

.mtn-ignore

@@ -1,90 +0,0 @@
-# Just to try and prevent some noob disasters.
-# Use mtn add --no-respect-ignore foo.jar to ignore this ignore list
-
-# Temporary/build files
-_jsp\.java$
-\.bz2$
-\.tar$
-\.class$
-\.diff$
-\.exe$
-\.fba$
-\.gz$
-\.jar$
-\.out$
-\.patch$
-\.sig$
-\.sud$
-\.su2$
-.\su3$
-\.tar$
-\.war$
-.\deb$
-\.zip$
-\.torrent$
-^\.
-~$
-web-fragment.xml
-web-out.xml
-
-# Temporary/build dirs
-^build$
-^pkg-temp
-/build$
-/classes
-/dist
-^installer/resources/locale/mo
-/tmp
-^apps/jetty/jettylib
-
-# MSVC files
-core/c/jcpuid/msvc/*.opendb
-core/c/jcpuid/msvc/*.pdb
-core/c/jcpuid/msvc/*.sdf
-core/c/jcpuid/msvc/*.user
-
-# Debian-related
-^debian/copyright
-^.pc/
-
-# Build property overrides
-override.properties
-
-# Launcher build paths
-launchers/macosx/target
-launchers/browserbundle/target
-launchers/macosx/project/target
-launchers/browserbundle/project/target
-launchers/target
-launchers/project/target
-launchers/common/target
-launchers/output
-launchers/project/project
-
-# Reporting
-sloccount.sc
-^reports/
-
-# IDE project files
-# Eclipse
-/.classpath$
-/.project$
-/.settings
-# IDEA
-\.iml$
-
-
-# Meeh stuff
-target/scala-2.12
-target/streams
-project/target
-launchers/macosx/version.h
-launchers/macosx/project/project/target
-launchers/macosx/I2PLauncher.xcodeproj/project.xcworkspace/xcuserdata
-launchers/macosx/I2PLauncher.xcodeproj/xcuserdata
-launchers/macosx/I2PLauncher.xcworkspace/xcuserdata
-launchers/macosx/Sparkle.framework
-launchers/macosx/I2PLauncher.app
-launchers/macosx/releases.done
-launchers/macosx/target
-

.travis.yml

@@ -1,38 +1,18 @@
 language: java
+dist: bionic
 
 jdk:
   - oraclejdk11
-  - oraclejdk9
-  - openjdk12
-  - openjdk11
-  - openjdk10
-  - openjdk9
 
 matrix:
   include:
-    - jdk: oraclejdk8
+    - jdk: oraclejdk11
       addons:
         sonarcloud:
           organization: "i2p"
       before_install:
-        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
-        - sed -i "1iplugins {\n    id 'org.sonarqube' version '2.6.1'\n}\n" build.gradle
+        - sed -i "1iplugins {\n    id 'org.sonarqube' version '3.0'\n}\n" build.gradle
     - jdk: openjdk8
-      before_install:
-        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
-    - jdk: openjdk7
-      sudo: required
-      before_install: # Work around missing crypto in openjdk7
-        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
-        - sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
-        - sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
-        - echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
-      install:
-        - export TARGET_JAVA_HOME=$JAVA_HOME
-        - jdk_switcher use oraclejdk8
-        - ./gradlew assemble
-  allow_failures:
-    - jdk: openjdk12
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -44,13 +24,11 @@ cache:
     - $HOME/.sonar/cache/
     - .gradle
 
+env:
+  - SONAR_SCANNER_OPTS="-Xmx2048m" 
+
 script:
-  - |
-    if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
-      ./gradlew sonarqube codeCoverageReport
-    else
-      ./gradlew check codeCoverageReport
-    fi
+  - travis_wait 45 ./tests/scripts/travis.sh
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

.tx/config

@@ -1,4 +1,12 @@
-[I2P.i2ptunnel]
+;; warning - conversions for all Java bundles:
+;; id->in, he->iw, iy, yi->ji
+
+[main]
+host     = https://www.transifex.com
+lang_map = ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA: uk, zh_CN: zh, et_EE: et, id: in, he: iw
+
+[o:otf:p:I2P:r:i2ptunnel]
+file_filter = apps/i2ptunnel/locale/messages_<lang>.po
 source_file = apps/i2ptunnel/locale/messages_en.po
 source_lang = en
 trans.ar = apps/i2ptunnel/locale/messages_ar.po
@@ -6,6 +14,7 @@ trans.cs = apps/i2ptunnel/locale/messages_cs.po
 trans.da = apps/i2ptunnel/locale/messages_da.po
 trans.de = apps/i2ptunnel/locale/messages_de.po
 trans.es = apps/i2ptunnel/locale/messages_es.po
+trans.es_AR = apps/i2ptunnel/locale/messages_es_AR.po
 trans.fa = apps/i2ptunnel/locale/messages_fa.po
 trans.fi = apps/i2ptunnel/locale/messages_fi.po
 trans.fr = apps/i2ptunnel/locale/messages_fr.po
@@ -24,6 +33,7 @@ trans.pt_BR = apps/i2ptunnel/locale/messages_pt_BR.po
 trans.ro = apps/i2ptunnel/locale/messages_ro.po
 trans.ru_RU = apps/i2ptunnel/locale/messages_ru.po
 trans.sk = apps/i2ptunnel/locale/messages_sk.po
+trans.sq = apps/i2ptunnel/locale/messages_sq.po
 trans.sv_SE = apps/i2ptunnel/locale/messages_sv.po
 trans.tr_TR = apps/i2ptunnel/locale/messages_tr.po
 trans.uk_UA = apps/i2ptunnel/locale/messages_uk.po
@@ -31,7 +41,8 @@ trans.vi = apps/i2ptunnel/locale/messages_vi.po
 trans.zh_CN = apps/i2ptunnel/locale/messages_zh.po
 trans.zh_TW = apps/i2ptunnel/locale/messages_zh_TW.po
 
-[I2P.proxy]
+[o:otf:p:I2P:r:proxy]
+file_filter = apps/i2ptunnel/locale-proxy/messages_<lang>.po
 source_file = apps/i2ptunnel/locale-proxy/messages_en.po
 source_lang = en
 trans.ar = apps/i2ptunnel/locale-proxy/messages_ar.po
@@ -39,12 +50,15 @@ trans.cs = apps/i2ptunnel/locale-proxy/messages_cs.po
 trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
 trans.el = apps/i2ptunnel/locale-proxy/messages_el.po
 trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
+trans.es_AR = apps/i2ptunnel/locale-proxy/messages_es_AR.po
+trans.fa = apps/i2ptunnel/locale-proxy/messages_fa.po
 trans.fi = apps/i2ptunnel/locale-proxy/messages_fi.po
 trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
 trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/i2ptunnel/locale-proxy/messages_in.po
 trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
+trans.ja = apps/i2ptunnel/locale-proxy/messages_ja.po
 trans.ko = apps/i2ptunnel/locale-proxy/messages_ko.po
 trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
 trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
@@ -60,17 +74,101 @@ trans.tr_TR = apps/i2ptunnel/locale-proxy/messages_tr.po
 trans.uk_UA = apps/i2ptunnel/locale-proxy/messages_uk.po
 trans.vi = apps/i2ptunnel/locale-proxy/messages_vi.po
 trans.zh_CN = apps/i2ptunnel/locale-proxy/messages_zh.po
+trans.zh_TW = apps/i2ptunnel/locale-proxy/messages_zh_TW.po
 
-[I2P.routerconsole]
+[o:otf:p:I2P:r:core]
+file_filter = core/locale/messages_<lang>.po
+type = PO
+source_file = core/locale/messages_en.po
+source_lang = en
+trans.ar = core/locale/messages_ar.po
+trans.az = core/locale/messages_az.po
+trans.cs = core/locale/messages_cs.po
+trans.da = core/locale/messages_da.po
+trans.de = core/locale/messages_de.po
+trans.el = core/locale/messages_el.po
+trans.es = core/locale/messages_es.po
+trans.et_EE = core/locale/messages_et.po
+trans.fa = core/locale/messages_fa.po
+trans.fi = core/locale/messages_fi.po
+trans.fr = core/locale/messages_fr.po
+trans.hu = core/locale/messages_hu.po
+;; Java converts id to in
+trans.id = core/locale/messages_in.po
+trans.it = core/locale/messages_it.po
+trans.ja = core/locale/messages_ja.po
+trans.ko = core/locale/messages_ko.po
+trans.ku = core/locale/messages_ku.po
+trans.nb = core/locale/messages_nb.po
+trans.nl = core/locale/messages_nl.po
+trans.pl = core/locale/messages_pl.po
+trans.pt = core/locale/messages_pt.po
+trans.pt_BR = core/locale/messages_pt_BR.po
+trans.ro = core/locale/messages_ro.po
+trans.ru_RU = core/locale/messages_ru.po
+trans.sl = core/locale/messages_sl.po
+trans.sv_SE = core/locale/messages_sv.po
+trans.tk = core/locale/messages_tk.po
+trans.tr_TR = core/locale/messages_tr.po
+trans.uk_UA = core/locale/messages_uk.po
+trans.vi = core/locale/messages_vi.po
+trans.zh_CN = core/locale/messages_zh.po
+trans.zh_TW = core/locale/messages_zh_TW.po
+
+[o:otf:p:I2P:r:router]
+file_filter = router/locale/messages_<lang>.po
+type = PO
+source_file = router/locale/messages_en.po
+source_lang = en
+trans.ar = router/locale/messages_ar.po
+trans.az = router/locale/messages_az.po
+trans.cs = router/locale/messages_cs.po
+trans.da = router/locale/messages_da.po
+trans.de = router/locale/messages_de.po
+trans.el = router/locale/messages_el.po
+trans.es = router/locale/messages_es.po
+trans.es_AR = router/locale/messages_es_AR.po
+trans.et_EE = router/locale/messages_et.po
+trans.fa = router/locale/messages_fa.po
+trans.fi = router/locale/messages_fi.po
+trans.fr = router/locale/messages_fr.po
+trans.hu = router/locale/messages_hu.po
+;; Java converts id to in
+trans.id = router/locale/messages_in.po
+trans.it = router/locale/messages_it.po
+trans.ja = router/locale/messages_ja.po
+trans.ko = router/locale/messages_ko.po
+trans.ku = router/locale/messages_ku.po
+trans.nb = router/locale/messages_nb.po
+trans.nl = router/locale/messages_nl.po
+trans.pl = router/locale/messages_pl.po
+trans.pt = router/locale/messages_pt.po
+trans.pt_BR = router/locale/messages_pt_BR.po
+trans.ro = router/locale/messages_ro.po
+trans.ru_RU = router/locale/messages_ru.po
+trans.sl = router/locale/messages_sl.po
+trans.sv_SE = router/locale/messages_sv.po
+trans.tk = router/locale/messages_tk.po
+trans.tr_TR = router/locale/messages_tr.po
+trans.uk_UA = router/locale/messages_uk.po
+trans.vi = router/locale/messages_vi.po
+trans.zh_CN = router/locale/messages_zh.po
+trans.zh_TW = router/locale/messages_zh_TW.po
+
+[o:otf:p:I2P:r:routerconsole]
+file_filter = apps/routerconsole/locale/messages_<lang>.po
 source_file = apps/routerconsole/locale/messages_en.po
 source_lang = en
 trans.ar = apps/routerconsole/locale/messages_ar.po
+trans.az = apps/routerconsole/locale/messages_az.po
 trans.cs = apps/routerconsole/locale/messages_cs.po
 trans.da = apps/routerconsole/locale/messages_da.po
 trans.de = apps/routerconsole/locale/messages_de.po
 trans.el = apps/routerconsole/locale/messages_el.po
 trans.es = apps/routerconsole/locale/messages_es.po
+trans.es_AR = apps/routerconsole/locale/messages_es_AR.po
 trans.et_EE = apps/routerconsole/locale/messages_et.po
+trans.fa = apps/routerconsole/locale/messages_fa.po
 trans.fi = apps/routerconsole/locale/messages_fi.po
 trans.fr = apps/routerconsole/locale/messages_fr.po
 trans.hu = apps/routerconsole/locale/messages_hu.po
@@ -93,7 +191,8 @@ trans.vi = apps/routerconsole/locale/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale/messages_zh.po
 trans.zh_TW = apps/routerconsole/locale/messages_zh_TW.po
 
-[I2P.welcome]
+[o:otf:p:I2P:r:welcome]
+file_filter = apps/routerconsole/locale-news/messages_<lang>.po
 source_file = apps/routerconsole/locale-news/messages_en.po
 source_lang = en
 trans.ar = apps/routerconsole/locale-news/messages_ar.po
@@ -102,15 +201,20 @@ trans.cs = apps/routerconsole/locale-news/messages_cs.po
 trans.de = apps/routerconsole/locale-news/messages_de.po
 trans.el = apps/routerconsole/locale-news/messages_el.po
 trans.es = apps/routerconsole/locale-news/messages_es.po
+trans.es_AR = apps/routerconsole/locale-news/messages_es_AR.po
+trans.fa = apps/routerconsole/locale-news/messages_fa.po
 trans.fi = apps/routerconsole/locale-news/messages_fi.po
 trans.fr = apps/routerconsole/locale-news/messages_fr.po
 trans.gl = apps/routerconsole/locale-news/messages_gl.po
-trans.he = apps/routerconsole/locale-news/messages_he.po
+;; Java converts he to iw
+trans.he = apps/routerconsole/locale-news/messages_iw.po
+trans.hu = apps/routerconsole/locale-news/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/routerconsole/locale-news/messages_in.po
 trans.it = apps/routerconsole/locale-news/messages_it.po
 trans.ja = apps/routerconsole/locale-news/messages_ja.po
 trans.ko = apps/routerconsole/locale-news/messages_ko.po
+trans.ku = apps/routerconsole/locale-news/messages_ku.po
 trans.mg = apps/routerconsole/locale-news/messages_mg.po
 trans.nb = apps/routerconsole/locale-news/messages_nb.po
 trans.nl = apps/routerconsole/locale-news/messages_nl.po
@@ -120,37 +224,47 @@ trans.pt_BR = apps/routerconsole/locale-news/messages_pt_BR.po
 trans.ro = apps/routerconsole/locale-news/messages_ro.po
 trans.ru_RU = apps/routerconsole/locale-news/messages_ru.po
 trans.sk = apps/routerconsole/locale-news/messages_sk.po
+trans.sl = apps/routerconsole/locale-news/messages_sl.po
 trans.sq = apps/routerconsole/locale-news/messages_sq.po
 trans.sr = apps/routerconsole/locale-news/messages_sr.po
 trans.sv_SE = apps/routerconsole/locale-news/messages_sv.po
+trans.tk = apps/routerconsole/locale-news/messages_tk.po
 trans.tr_TR = apps/routerconsole/locale-news/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale-news/messages_uk.po
 trans.zh_CN = apps/routerconsole/locale-news/messages_zh.po
 trans.zh_TW = apps/routerconsole/locale-news/messages_zh_TW.po
 
-[I2P.countries]
+[o:otf:p:I2P:r:countries]
+file_filter = apps/routerconsole/locale-countries/messages_<lang>.po
 type = PO
 source_file = apps/routerconsole/locale-countries/messages_en.po
 source_lang = en
 trans.ar = apps/routerconsole/locale-countries/messages_ar.po
 trans.az = apps/routerconsole/locale-countries/messages_az.po
+trans.bg = apps/routerconsole/locale-countries/messages_bg.po
 trans.ca = apps/routerconsole/locale-countries/messages_ca.po
+trans.cs = apps/routerconsole/locale-countries/messages_cs.po
 trans.da = apps/routerconsole/locale-countries/messages_da.po
 trans.de = apps/routerconsole/locale-countries/messages_de.po
 trans.el = apps/routerconsole/locale-countries/messages_el.po
 trans.es = apps/routerconsole/locale-countries/messages_es.po
+trans.es_AR = apps/routerconsole/locale-countries/messages_es_AR.po
 trans.et_EE = apps/routerconsole/locale-countries/messages_et.po
 trans.fa = apps/routerconsole/locale-countries/messages_fa.po
 trans.fi = apps/routerconsole/locale-countries/messages_fi.po
 trans.fr = apps/routerconsole/locale-countries/messages_fr.po
 trans.gl = apps/routerconsole/locale-countries/messages_gl.po
+trans.hi = apps/routerconsole/locale-countries/messages_hi.po
 trans.hr = apps/routerconsole/locale-countries/messages_hr.po
 trans.hu = apps/routerconsole/locale-countries/messages_hu.po
+;; Java converts he to iw
+trans.he = apps/routerconsole/locale-countries/messages_iw.po
 ;; Java converts id to in
 trans.id = apps/routerconsole/locale-countries/messages_in.po
 trans.it = apps/routerconsole/locale-countries/messages_it.po
 trans.ja = apps/routerconsole/locale-countries/messages_ja.po
 trans.ko = apps/routerconsole/locale-countries/messages_ko.po
+trans.ku = apps/routerconsole/locale-countries/messages_ku.po
 trans.mg = apps/routerconsole/locale-countries/messages_mg.po
 trans.nb = apps/routerconsole/locale-countries/messages_nb.po
 trans.nl = apps/routerconsole/locale-countries/messages_nl.po
@@ -160,22 +274,28 @@ trans.pt_BR = apps/routerconsole/locale-countries/messages_pt_BR.po
 trans.ro = apps/routerconsole/locale-countries/messages_ro.po
 trans.ru_RU = apps/routerconsole/locale-countries/messages_ru.po
 trans.sk = apps/routerconsole/locale-countries/messages_sk.po
+trans.sl = apps/routerconsole/locale-countries/messages_sl.po
 trans.sq = apps/routerconsole/locale-countries/messages_sq.po
+trans.sr = apps/routerconsole/locale-countries/messages_sr.po
 trans.sv_SE = apps/routerconsole/locale-countries/messages_sv.po
+trans.tk = apps/routerconsole/locale-countries/messages_tk.po
 trans.tr_TR = apps/routerconsole/locale-countries/messages_tr.po
 trans.uk_UA = apps/routerconsole/locale-countries/messages_uk.po
 trans.vi = apps/routerconsole/locale-countries/messages_vi.po
 trans.zh_CN = apps/routerconsole/locale-countries/messages_zh.po
 trans.zh_TW = apps/routerconsole/locale-countries/messages_zh_TW.po
 
-[I2P.i2psnark]
+[o:otf:p:I2P:r:i2psnark]
+file_filter = apps/i2psnark/locale/messages_<lang>.po
 source_file = apps/i2psnark/locale/messages_en.po
 source_lang = en
 trans.ar = apps/i2psnark/locale/messages_ar.po
 trans.cs = apps/i2psnark/locale/messages_cs.po
+trans.da = apps/i2psnark/locale/messages_da.po
 trans.de = apps/i2psnark/locale/messages_de.po
 trans.el = apps/i2psnark/locale/messages_el.po
 trans.es = apps/i2psnark/locale/messages_es.po
+trans.es_AR = apps/i2psnark/locale/messages_es_AR.po
 trans.fa = apps/i2psnark/locale/messages_fa.po
 trans.fi = apps/i2psnark/locale/messages_fi.po
 trans.fr = apps/i2psnark/locale/messages_fr.po
@@ -199,8 +319,10 @@ trans.tr_TR = apps/i2psnark/locale/messages_tr.po
 trans.uk_UA = apps/i2psnark/locale/messages_uk.po
 trans.vi = apps/i2psnark/locale/messages_vi.po
 trans.zh_CN = apps/i2psnark/locale/messages_zh.po
+trans.zh_TW = apps/i2psnark/locale/messages_zh_TW.po
 
-[I2P.susidns]
+[o:otf:p:I2P:r:susidns]
+file_filter = apps/susidns/locale/messages_<lang>.po
 source_file = apps/susidns/locale/messages_en.po
 source_lang = en
 trans.ar = apps/susidns/locale/messages_ar.po
@@ -209,6 +331,8 @@ trans.da = apps/susidns/locale/messages_da.po
 trans.de = apps/susidns/locale/messages_de.po
 trans.el = apps/susidns/locale/messages_el.po
 trans.es = apps/susidns/locale/messages_es.po
+trans.es_AR = apps/susidns/locale/messages_es_AR.po
+trans.fa = apps/susidns/locale/messages_fa.po
 trans.fi = apps/susidns/locale/messages_fi.po
 trans.fr = apps/susidns/locale/messages_fr.po
 trans.gl = apps/susidns/locale/messages_gl.po
@@ -231,7 +355,8 @@ trans.vi = apps/susidns/locale/messages_vi.po
 trans.zh_CN = apps/susidns/locale/messages_zh.po
 trans.zh_TW = apps/susidns/locale/messages_zh_TW.po
 
-[I2P.desktopgui]
+[o:otf:p:I2P:r:desktopgui]
+file_filter = apps/desktopgui/locale/messages_<lang>.po
 source_file = apps/desktopgui/locale/messages_en.po
 source_lang = en
 trans.ar = apps/desktopgui/locale/messages_ar.po
@@ -243,6 +368,7 @@ trans.da = apps/desktopgui/locale/messages_da.po
 trans.de = apps/desktopgui/locale/messages_de.po
 trans.el = apps/desktopgui/locale/messages_el.po
 trans.es = apps/desktopgui/locale/messages_es.po
+trans.es_AR = apps/desktopgui/locale/messages_es_AR.po
 trans.fa = apps/desktopgui/locale/messages_fa.po
 trans.fi = apps/desktopgui/locale/messages_fi.po
 trans.fr = apps/desktopgui/locale/messages_fr.po
@@ -253,6 +379,7 @@ trans.id = apps/desktopgui/locale/messages_in.po
 trans.it = apps/desktopgui/locale/messages_it.po
 trans.ja = apps/desktopgui/locale/messages_ja.po
 trans.ko = apps/desktopgui/locale/messages_ko.po
+trans.ku = apps/desktopgui/locale/messages_ku.po
 trans.mg = apps/desktopgui/locale/messages_mg.po
 trans.nb = apps/desktopgui/locale/messages_nb.po
 trans.nl = apps/desktopgui/locale/messages_nl.po
@@ -262,28 +389,39 @@ trans.pt_BR = apps/desktopgui/locale/messages_pt_BR.po
 trans.ro = apps/desktopgui/locale/messages_ro.po
 trans.ru_RU = apps/desktopgui/locale/messages_ru.po
 trans.sk = apps/desktopgui/locale/messages_sk.po
+trans.sl = apps/desktopgui/locale/messages_sl.po
+trans.sr = apps/desktopgui/locale/messages_sr.po
 trans.sv_SE = apps/desktopgui/locale/messages_sv.po
 trans.sq = apps/desktopgui/locale/messages_sq.po
-trans.uk_UA = apps/desktopgui/locale/messages_uk.po
+trans.tk = apps/desktopgui/locale/messages_tk.po
 trans.tr_TR = apps/desktopgui/locale/messages_tr.po
+trans.uk_UA = apps/desktopgui/locale/messages_uk.po
 trans.vi = apps/desktopgui/locale/messages_vi.po
 trans.zh_CN = apps/desktopgui/locale/messages_zh.po
+trans.zh_TW = apps/desktopgui/locale/messages_zh_TW.po
 
-[I2P.susimail]
+[o:otf:p:I2P:r:susimail]
+file_filter = apps/susimail/locale/messages_<lang>.po
 source_file = apps/susimail/locale/messages_en.po
 source_lang = en
 trans.ar = apps/susimail/locale/messages_ar.po
 trans.az = apps/susimail/locale/messages_az.po
+trans.bg = apps/susimail/locale/messages_bg.po
+trans.ca = apps/susimail/locale/messages_ca.po
 trans.cs = apps/susimail/locale/messages_cs.po
 trans.da = apps/susimail/locale/messages_da.po
 trans.de = apps/susimail/locale/messages_de.po
 trans.el = apps/susimail/locale/messages_el.po
 trans.es = apps/susimail/locale/messages_es.po
+trans.es_AR = apps/susimail/locale/messages_es_AR.po
 trans.fa = apps/susimail/locale/messages_fa.po
 trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
 trans.gl = apps/susimail/locale/messages_gl.po
+trans.hr = apps/susimail/locale/messages_hr.po
 trans.hu = apps/susimail/locale/messages_hu.po
+;; Java converts he to iw
+trans.he = apps/susimail/locale/messages_iw.po
 ;; Java converts id to in
 trans.id = apps/susimail/locale/messages_in.po
 trans.it = apps/susimail/locale/messages_it.po
@@ -299,6 +437,7 @@ trans.ro = apps/susimail/locale/messages_ro.po
 trans.ru_RU = apps/susimail/locale/messages_ru.po
 trans.sk = apps/susimail/locale/messages_sk.po
 trans.sq = apps/susimail/locale/messages_sq.po
+trans.sr = apps/susimail/locale/messages_sr.po
 trans.sv_SE = apps/susimail/locale/messages_sv.po
 trans.tr_TR = apps/susimail/locale/messages_tr.po
 trans.uk_UA = apps/susimail/locale/messages_uk.po
@@ -306,7 +445,8 @@ trans.vi = apps/susimail/locale/messages_vi.po
 trans.zh_CN = apps/susimail/locale/messages_zh.po
 trans.zh_TW = apps/susimail/locale/messages_zh_TW.po
 
-[I2P.debconf]
+[o:otf:p:I2P:r:debconf]
+file_filter = debian/po/<lang>.po
 source_file = debian/po/templates.pot
 source_lang = en
 trans.ar = debian/po/ar.po
@@ -315,6 +455,7 @@ trans.cs = debian/po/cs.po
 trans.de = debian/po/de.po
 trans.el = debian/po/el.po
 trans.es = debian/po/es.po
+trans.es_AR = debian/po/es_AR.po
 trans.fi = debian/po/fi.po
 trans.fr = debian/po/fr.po
 trans.gl = debian/po/gl.po
@@ -331,14 +472,17 @@ trans.pt_BR = debian/po/pt_BR.po
 trans.ro = debian/po/ro.po
 trans.ru_RU = debian/po/ru.po
 trans.sk = debian/po/sk.po
+trans.sl = debian/po/sl.po
 trans.sq = debian/po/sq.po
 trans.sv_SE = debian/po/sv.po
+trans.tk = debian/po/tk.po
 trans.tr_TR = debian/po/tr.po
 trans.uk_UA = debian/po/uk.po
 trans.zh_CN = debian/po/zh.po
 trans.zh_TW = debian/po/zh_TW.po
 
-[I2P.i2prouter-script]
+[o:otf:p:I2P:r:i2prouter-script]
+file_filter = installer/resources/locale/po/messages_<lang>.po
 source_file = installer/resources/locale/po/messages_en.po
 source_lang = en
 trans.ar = installer/resources/locale/po/messages_ar.po
@@ -346,6 +490,7 @@ trans.az = installer/resources/locale/po/messages_az.po
 trans.ca = installer/resources/locale/po/messages_ca.po
 trans.de = installer/resources/locale/po/messages_de.po
 trans.es = installer/resources/locale/po/messages_es.po
+trans.es_AR = installer/resources/locale/po/messages_es_AR.po
 trans.fi = installer/resources/locale/po/messages_fi.po
 trans.fr = installer/resources/locale/po/messages_fr.po
 trans.id = installer/resources/locale/po/messages_id.po
@@ -364,8 +509,9 @@ trans.sv_SE = installer/resources/locale/po/messages_sv.po
 trans.tr_TR = installer/resources/locale/po/messages_tr.po
 trans.uk_UA = installer/resources/locale/po/messages_uk.po
 trans.zh_CN = installer/resources/locale/po/messages_zh.po
+trans.zh_TW = installer/resources/locale/po/messages_zh_TW.po
 
-[I2P.getopt]
+[o:otf:p:I2P:r:getopt]
 ;;
 ;; Java properties files (when not read with our DataHelper methods) must be ISO-8859-1 encoded.
 ;; See https://docs.oracle.com/javase/6/docs/api/java/util/Properties.html
@@ -382,6 +528,7 @@ trans.zh_CN = installer/resources/locale/po/messages_zh.po
 ;; and should be escaped using native2ascii after downloading:
 ;;   gl, pt, pt_BR, sq, sv, tr
 ;;
+file_filter = core/java/src/gnu/getopt/MessagesBundle_<lang>.properties
 source_file = core/java/src/gnu/getopt/MessagesBundle.properties
 source_lang = en
 type = PROPERTIES
@@ -390,6 +537,7 @@ trans.az = core/java/src/gnu/getopt/MessagesBundle_az.properties
 trans.cs = core/java/src/gnu/getopt/MessagesBundle_cs.properties
 trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties
 trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties
+trans.es_AR = core/java/src/gnu/getopt/MessagesBundle_es_AR.properties
 trans.fi = core/java/src/gnu/getopt/MessagesBundle_fi.properties
 trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties
 trans.gl = core/java/src/gnu/getopt/MessagesBundle_gl.properties
@@ -399,6 +547,7 @@ trans.id = core/java/src/gnu/getopt/MessagesBundle_in.properties
 trans.it = core/java/src/gnu/getopt/MessagesBundle_it.properties
 trans.ja = core/java/src/gnu/getopt/MessagesBundle_ja.properties
 trans.ko = core/java/src/gnu/getopt/MessagesBundle_ko.properties
+trans.ku = core/java/src/gnu/getopt/MessagesBundle_ku.properties
 trans.nb = core/java/src/gnu/getopt/MessagesBundle_nb.properties
 trans.nl = core/java/src/gnu/getopt/MessagesBundle_nl.properties
 trans.pl = core/java/src/gnu/getopt/MessagesBundle_pl.properties
@@ -407,6 +556,7 @@ trans.pt_BR = core/java/src/gnu/getopt/MessagesBundle_pt_BR.properties
 trans.ro = core/java/src/gnu/getopt/MessagesBundle_ro.properties
 trans.ru_RU = core/java/src/gnu/getopt/MessagesBundle_ru.properties
 trans.sk = core/java/src/gnu/getopt/MessagesBundle_sk.properties
+trans.sl = core/java/src/gnu/getopt/MessagesBundle_sl.properties
 trans.sq = core/java/src/gnu/getopt/MessagesBundle_sq.properties
 trans.sr = core/java/src/gnu/getopt/MessagesBundle_sr.properties
 trans.sv_SE = core/java/src/gnu/getopt/MessagesBundle_sv.properties
@@ -415,7 +565,8 @@ trans.uk_UA = core/java/src/gnu/getopt/MessagesBundle_uk.properties
 trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties
 trans.zh_TW = core/java/src/gnu/getopt/MessagesBundle_zh_TW.properties
 
-[I2P.streaming]
+[o:otf:p:I2P:r:streaming]
+file_filter = apps/ministreaming/locale/messages_<lang>.po
 source_file = apps/ministreaming/locale/messages_en.po
 source_lang = en
 trans.ar = apps/ministreaming/locale/messages_ar.po
@@ -424,9 +575,12 @@ trans.ca = apps/ministreaming/locale/messages_ca.po
 trans.cs = apps/ministreaming/locale/messages_cs.po
 trans.de = apps/ministreaming/locale/messages_de.po
 trans.es = apps/ministreaming/locale/messages_es.po
+trans.es_AR = apps/ministreaming/locale/messages_es_AR.po
+trans.fa = apps/ministreaming/locale/messages_fa.po
 trans.fi = apps/ministreaming/locale/messages_fi.po
 trans.fr = apps/ministreaming/locale/messages_fr.po
 trans.gl = apps/ministreaming/locale/messages_gl.po
+trans.hu = apps/ministreaming/locale/messages_hu.po
 ;; Java converts id to in
 trans.id = apps/ministreaming/locale/messages_in.po
 trans.it = apps/ministreaming/locale/messages_it.po
@@ -438,15 +592,20 @@ trans.pt = apps/ministreaming/locale/messages_pt.po
 trans.pt_BR = apps/ministreaming/locale/messages_pt_BR.po
 trans.ro = apps/ministreaming/locale/messages_ro.po
 trans.ru_RU = apps/ministreaming/locale/messages_ru.po
+trans.sl = apps/ministreaming/locale/messages_sl.po
 trans.sv_SE = apps/ministreaming/locale/messages_sv.po
+trans.tk = apps/ministreaming/locale/messages_tk.po
 trans.tr_TR = apps/ministreaming/locale/messages_tr.po
 trans.uk_UA = apps/ministreaming/locale/messages_uk.po
 trans.zh_CN = apps/ministreaming/locale/messages_zh.po
+trans.zh_TW = apps/ministreaming/locale/messages_zh_TW.po
 
-[I2P.manpages]
+[o:otf:p:I2P:r:manpages]
 ;;
 ;; after adding languages here, add to debian/*.manpages also
+;; You must run installer/resources/poupdate-man.sh first.
 ;;
+file_filter = installer/resources/locale-man/man_<lang>.po
 type = PO
 source_file = installer/resources/locale-man/man.pot
 source_lang = en
@@ -454,34 +613,44 @@ trans.ar = installer/resources/locale-man/man_ar.po
 trans.az = installer/resources/locale-man/man_az.po
 trans.de = installer/resources/locale-man/man_de.po
 trans.es = installer/resources/locale-man/man_es.po
+trans.es_AR = installer/resources/locale-man/man_es_AR.po
 trans.fi = installer/resources/locale-man/man_fi.po
 trans.fr = installer/resources/locale-man/man_fr.po
+trans.hu = installer/resources/locale-man/man_hu.po
 trans.id = installer/resources/locale-man/man_id.po
 trans.it = installer/resources/locale-man/man_it.po
+trans.ja = installer/resources/locale-man/man_ja.po
 trans.ko = installer/resources/locale-man/man_ko.po
 trans.nl = installer/resources/locale-man/man_nl.po
 trans.pl = installer/resources/locale-man/man_pl.po
 trans.pt = installer/resources/locale-man/man_pt.po
 trans.pt_BR = installer/resources/locale-man/man_pt_BR.po
+trans.ro = installer/resources/locale-man/man_ro.po
 trans.ru_RU = installer/resources/locale-man/man_ru.po
 trans.sv_SE = installer/resources/locale-man/man_sv.po
 trans.tr_TR = installer/resources/locale-man/man_tr.po
 trans.zh_CN = installer/resources/locale-man/man_zh.po
+trans.zh_TW = installer/resources/locale-man/man_zh_TW.po
 
-[I2P.eepsite]
+[o:otf:p:I2P:r:eepsite]
 ;;
 ;; For any new translations, add links in installer/resources/eepsite/docroot/help/index.html
 ;; and copy new flags in build.xml copyflags-unlesspkg target,
 ;; and add to debian/i2p-router.links and debian-alt/*/i2p-router.links
 ;;
+file_filter = installer/resources/eepsite/docroot/help/index_<lang>.po
 type = HTML
 source_file = installer/resources/eepsite/docroot/help/index.html
 source_lang = en
-trans.ar = installer/resources/eepsite/docroot/help/index_ar.html
+;; File contains local changes to fix RTL issues.
+;; Merge locally or make changes on TX side before re-enabling
+;;trans.ar = installer/resources/eepsite/docroot/help/index_ar.html
 trans.az = installer/resources/eepsite/docroot/help/index_az.html
 trans.de = installer/resources/eepsite/docroot/help/index_de.html
+trans.el = installer/resources/eepsite/docroot/help/index_el.html
 ;; not yet translated on TX, use old page
 ;;trans.es = installer/resources/eepsite/docroot/help/index_es.html
+trans.fa = installer/resources/eepsite/docroot/help/index_fa.html
 trans.fr = installer/resources/eepsite/docroot/help/index_fr.html
 trans.hu = installer/resources/eepsite/docroot/help/index_hu.html
 ;; Java converts id to in
@@ -491,32 +660,39 @@ trans.it = installer/resources/eepsite/docroot/help/index_it.html
 ;;trans.nl = installer/resources/eepsite/docroot/help/index_nl.html
 trans.pl = installer/resources/eepsite/docroot/help/index_pl.html
 trans.pt = installer/resources/eepsite/docroot/help/index_pt.html
+trans.ro = installer/resources/eepsite/docroot/help/index_ro.html
 trans.ru_RU = installer/resources/eepsite/docroot/help/index_ru.html
-;; not yet translated on TX, use old page
-;;trans.sv_SE = installer/resources/eepsite/docroot/help/index_sv.html
+trans.sv_SE = installer/resources/eepsite/docroot/help/index_sv.html
 trans.tr_TR = installer/resources/eepsite/docroot/help/index_tr.html
-;; not yet translated on TX, use old page
-;;trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
+trans.uk_UA = installer/resources/eepsite/docroot/help/index_uk.html
+trans.zh_CN = installer/resources/eepsite/docroot/help/index_zh.html
 
-[I2P.readme]
+[o:otf:p:I2P:r:readme]
 ;;
 ;; Text on /console
 ;;
+;; NOTE: No support for country suffixes right now.
+;; See ResourceHelper.java
+;;
+file_filter = apps/routerconsole/resources/docs/readme_<lang>.html
 type = HTML
-source_file = installer/resources/readme/readme.html
+source_file = apps/routerconsole/resources/docs/readme.html
 source_lang = en
-trans.ar = installer/resources/readme/readme_ar.html
-trans.de = installer/resources/readme/readme_de.html
+trans.ar = apps/routerconsole/resources/docs/readme_ar.html
+trans.de = apps/routerconsole/resources/docs/readme_de.html
+trans.fr = apps/routerconsole/resources/docs/readme_fr.html
+trans.hu = apps/routerconsole/resources/docs/readme_hu.html
 ;; Java converts id to in
-trans.id = installer/resources/readme/readme_in.html
-trans.it = installer/resources/readme/readme_it.html
-trans.ja = installer/resources/readme/readme_ja.html
-trans.pl = installer/resources/readme/readme_pl.html
-trans.pt = installer/resources/readme/readme_pt.html
-trans.ro = installer/resources/readme/readme_ro.html
-trans.ru_RU = installer/resources/readme/readme_ru.html
-trans.tr_TR = installer/resources/readme/readme_tr.html
-
-[main]
-host = https://www.transifex.com
+trans.id = apps/routerconsole/resources/docs/readme_in.html
+trans.it = apps/routerconsole/resources/docs/readme_it.html
+trans.ja = apps/routerconsole/resources/docs/readme_ja.html
+trans.pl = apps/routerconsole/resources/docs/readme_pl.html
+trans.pt = apps/routerconsole/resources/docs/readme_pt.html
+trans.ro = apps/routerconsole/resources/docs/readme_ro.html
+trans.ru_RU = apps/routerconsole/resources/docs/readme_ru.html
+trans.sl = apps/routerconsole/resources/docs/readme_sl.html
+trans.tr_TR = apps/routerconsole/resources/docs/readme_tr.html
+trans.uk_UA = apps/routerconsole/resources/docs/readme_uk.html
+trans.zh_CN = apps/routerconsole/resources/docs/readme_zh.html
+trans.zh_TW = apps/routerconsole/resources/docs/readme_zh_TW.html
 

Docker.entrypoint.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-export JAVA_HOME=/opt/jdk/jre
-
-# Ensure user rights
-chown -R i2p:nobody /opt/i2p
-chmod -R u+rwx /opt/i2p
-
-gosu i2p /opt/i2p/i2psvc /opt/i2p/wrapper.config wrapper.pidfile=/var/tmp/i2p.pid \
-   wrapper.name=i2p \
-   wrapper.displayname="I2P Service" \
-   wrapper.statusfile=/var/tmp/i2p.status \
-   wrapper.java.statusfile=/var/tmp/i2p.java.status \
-   wrapper.logfile=/var/tmp/wrapper.log

Docker.expt

@@ -1,7 +0,0 @@
-#!/usr/bin/expect
-set timeout 15;
-spawn java -jar /tmp/i2pinstall.jar -console
-expect {
- -re ".*press 1 to continue, 2 to quit, 3 to redisplay" {send "1\r"; exp_continue;}
- -re "Select target path *" {send "/opt/i2p\r"; exp_continue;}
-}

Docker.md

@@ -0,0 +1,93 @@
+# I2P in Docker
+
+### Very quick start
+If you just want to give I2P a quick try or are using it on a home network, follow these steps:
+
+1. Create two directories `i2pconfig` and `i2ptorrents`
+2. Copy the following text and save it in a file `docker-compose.yml`
+```
+version: "3.5"
+services:
+    i2p:
+        image: geti2p/i2p
+        ports:
+            - 127.0.0.1:4444:4444
+            - 127.0.0.1:6668:6668
+            - 127.0.0.1:7657:7657
+            - 54321:12345
+            - 54321:12345/udp
+        volumes:
+            - ./i2pconfig:/i2p/.i2p
+            - ./i2ptorrents:/i2psnark
+```
+3. Execute `docker-compose up`
+4. Start a browser and go to `http://127.0.0.1:7657` to complete the setup wizard.
+
+Note that this quick-start approach is not recommended for production deployments on remote servers.  Please read the rest of this document for more information.
+
+### Building an image
+There is an i2P image available over at [DockerHub](https://hub.docker.com).  If you do not want to use that one, you can build one yourself:
+```
+docker build -t geti2p/i2p .
+```
+
+### Running a container
+
+#### Environment Variables
+
+It is possible to set the IP address where the I2P router is accessible by setting
+the `IP_ADDR` environment variable in your `docker run` command or your `docker-compose`
+file. For example, if you want to make your I2P router listen on all addresses, then
+you should pass `-e IP_ADDR=0.0.0.0` to your `docker run` command.
+
+It is also possible to configure the memory available to the I2P router using
+environment variables. To do this, use the: `JVM_XMX` environment variable by passing,
+for example, `-e JVM_XMX=256m`.
+
+#### Volumes
+The container requires a volume for the configuration data to be mounted.  Optionally, you can mount a separate volume for torrent ("i2psnark") downloads.  See the example below.
+
+#### Memory usage
+By the default the image limits the memory available to the Java heap to 512MB.  You can override that with the `JVM_XMX` environment variable.
+
+#### Ports
+There are several ports which are exposed by the image.  You can choose which ones to publish depending on your specific needs.
+
+|Port|Interface|Description|TCP/UDP|
+|---|---|---|---|
+|4444|127.0.0.1|HTTP Proxy|TCP|
+|4445|127.0.0.1|HTTPS Proxy|TCP|
+|6668|127.0.0.1|IRC Proxy|TCP|
+|7654|127.0.0.1|I2CP Protocol|TCP|
+|7656|127.0.0.1|SAM Bridge TCP|TCP|
+|7657|127.0.0.1|Router console|TCP|
+|7658|127.0.0.1|I2P Site|TCP|
+|7659|127.0.0.1|SMTP Proxy|TCP|
+|7660|127.0.0.1|POP Proxy|TCP|
+|7652|LAN interface|UPnP|TCP|
+|7653|LAN interface|UPnP|UDP|
+|12345|0.0.0.0|I2NP Protocol|TCP and UDP|
+
+You probably want at least the Router Console (7657)  and the HTTP Proxy (4444).  If you want I2P to be able to receive incoming connections from the internet, and hence not think it's firewalled, publish the I2NP Protocol port (12345) - but make sure you publish to a different random port, otherwise others may be able to guess you're running I2P in a Docker image.
+
+#### Networking
+A best-practices guide for cloud deployments is beyond the scope of this document, but in general you should try to minimize the number of published ports, while exposing only the `I2NP` ports to the internet.  That means that the services in the list above which are bound to `127.0.0.1` (which include the router console) will need to be accessed via other methods like ssh tunneling or be manually configured to bind to a different interface.
+
+#### Example
+Here is an example container that mounts `i2phome` as home directory, `i2ptorrents` for torrents, and opens HTTP Proxy, IRC, Router Console and I2NP Protocols.  It also limits the memory available to the JVM to 256MB.
+
+```
+docker build -t geti2p/i2p .
+# I2NP port needs TCP and UDP.  Change the 54321 to something random, greater than 1024.
+docker run \
+    -e JVM_XMX=256m \
+    -v i2phome:/i2p/.i2p \
+    -v i2ptorrents:/i2psnark \
+    -p 127.0.0.1:4444:4444 \
+    -p 127.0.0.1:6668:6668 \
+    -p 127.0.0.1:7657:7657 \
+    -p 54321:12345 \
+    -p 54321:12345/udp \
+    geti2p/i2p:latest
+```
+

Dockerfile

@@ -1,62 +1,40 @@
-FROM meeh/java8server:latest
-# Docker image based on Alpine with Java.
+FROM alpine:3.17.1 as builder
 
-# We use Oracle Java to run I2P, but uses the openjdk to build it.
+ENV APP_HOME="/i2p"
 
+WORKDIR /tmp/build
+COPY . .
 
-MAINTAINER Mikal Villa <mikal@sigterm.no>
+RUN apk add --virtual build-base gettext tar bzip2 apache-ant openjdk17 \
+    && echo "build.built-by=Docker" >> override.properties \
+    && ant preppkg-linux-only \
+    && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.* \
+    && apk del build-base gettext tar bzip2 apache-ant openjdk17
 
-ENV GIT_BRANCH="master"
-ENV I2P_PREFIX="/opt/i2p"
-ENV PATH=${I2P_PREFIX}/bin:$PATH
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
+FROM alpine:3.17.1
+ENV APP_HOME="/i2p"
 
-ENV GOSU_VERSION=1.7
-ENV GOSU_SHASUM="34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50  /usr/local/bin/gosu"
+RUN apk add openjdk17-jre ttf-dejavu
 
-RUN mkdir /user && adduser -S -h /user i2p && chown -R i2p:nobody /user
+WORKDIR ${APP_HOME}
+COPY --from=builder /tmp/build/pkg-temp .
 
-# Adding files first, since Docker.expt is required for installation
-ADD Docker.expt /tmp/Docker.expt
-ADD Docker.entrypoint.sh /entrypoint.sh
+# "install" i2p by copying over installed files
+COPY --chown=root:root docker/rootfs/ /
+RUN chmod +x /startapp.sh
 
-# Required for wget https
-RUN apk add --no-cache openssl
-# Gosu is a replacement for su/sudo in docker and not a backdoor :) See https://github.com/tianon/gosu
-RUN wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 \
-    && echo "${GOSU_SHASUM}" | sha256sum -c && chmod +x /usr/local/bin/gosu
+# Mount home and snark
+VOLUME ["${APP_HOME}/.i2p"]
+VOLUME ["/i2psnark"]
 
-#
-# Each RUN is a layer, adding the dependencies and building i2pd in one layer takes around 8-900Mb, so to keep the
-# image under 200mb we need to remove all the build dependencies in the same "RUN" / layer.
-#
+EXPOSE 7654 7656 7657 7658 4444 6668 7659 7660 4445 12345
 
-# The main layer
-RUN apk --no-cache add build-base git gettext tar bzip2 apache-ant openjdk8 expect \
-    && mkdir -p /usr/src/build \
-    && cd /usr/src/build \
-    && git clone -b ${GIT_BRANCH} https://github.com/i2p/i2p.i2p.git \
-    && cd /usr/src/build/i2p.i2p \
-    && echo "noExe=true" >> build.properties \
-    && ant installer-linux \
-    && cp i2pinstall*.jar /tmp/i2pinstall.jar \
-    && mkdir -p /opt \
-    && chown i2p:root /opt \
-    && chmod u+rw /opt \
-    && gosu i2p expect -f /tmp/Docker.expt \
-    && cd ${I2P_PREFIX} \
-    && rm -fr man docs *.bat *.command *.app /tmp/i2pinstall.jar /tmp/Docker.expt \
-    && rm -fr /usr/src/build \
-    && apk --purge del build-base apache-ant expect tcl expat git openjdk8 openjdk8-jre openjdk8-jre-base openjdk8-jre-lib bzip2 tar \
-      binutils-libs binutils pkgconfig libcurl libc-dev musl-dev g++ make fortify-headers pkgconf giflib libssh2 libxdmcp libxcb \
-      libx11 pcre alsa-lib libxi libxrender libxml2 readline bash openssl \
-    && rm -fr /usr/lib/jvm/default-jre \
-    && ln -sf /opt/jdk/jre /usr/lib/jvm/default-jre \
-    && chmod a+x /entrypoint.sh
-
-
-
-EXPOSE 7654 7656 7657 7658 4444 6668 8998 7659 7660 4445 15000-20000
-
-ENTRYPOINT [ "/entrypoint.sh" ]
+# Metadata.
+LABEL \
+      org.label-schema.name="i2p" \
+      org.label-schema.description="Docker container for I2P" \
+      org.label-schema.version="1.0" \
+      org.label-schema.vcs-url="https://github.com/i2p/i2p.i2p" \
+      org.label-schema.schema-version="1.0"
 
+ENTRYPOINT ["/startapp.sh"]

INSTALL-headless.txt

@@ -15,7 +15,7 @@ If you're having trouble, check the
 website at https://geti2p.net/, or get on irc://irc.freenode.net/#i2p
 
 I2P will create and store files and configuration data in the user directory
-~/.i2p/ on Linux and %APPDATA%\I2P\ on Windows. This directory is created
+~/.i2p/ on Linux and %LOCALAPPDATA%\I2P\ on Windows. This directory is created
 when I2P is run for the first time. It also creates files in the system
 temporary directory specified by the Java Virtual Machine.
 To change the location of these directories, or to configure I2P to
@@ -40,7 +40,7 @@ To uninstall I2P:
    rm -rf $I2PInstallDir ~/.i2p
 
 Supported JVMs:
-  All platforms: Java 1.7 or higher required
+  All platforms: Java 1.8 or higher required
   Windows: OpenJDK or Oracle from http://java.com/download
   Linux:   OpenJDK or Oracle from http://java.com/download
   FreeBSD: OpenJDK or Oracle from http://java.com/download

INSTALL.txt

@@ -1,10 +1,10 @@
 I2P source installation instructions
 
 Prerequisites to build from source:
-	Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
+	Java SDK (preferably Oracle or OpenJDK) 8 or higher
           Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
           Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
-	Apache Ant 1.7.0 or higher
+	Apache Ant 1.9.8 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
 	  from the GNU gettext package http://www.gnu.org/software/gettext/
 	Build environment must use a UTF-8 locale.

LICENSE.txt

@@ -36,10 +36,6 @@ Public domain except as listed below:
    Copyright (c) 2003, TheCrypto
    See licenses/LICENSE-ElGamalDSA.txt
 
-   HMAC:
-   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
-   See licenses/LICENSE-SHA256.txt
-
    ElGamal:
    Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
    See licenses/LICENSE-SHA256.txt
@@ -82,18 +78,28 @@ Public domain except as listed below:
    Copyright (c) 1998 by Aaron M. Renn (arenn@urbanophile.com)
    See licenses/LICENSE-LGPLv2.1.txt
 
+   EdDSA-Java:
+   See licenses/LICENSE-CC0-1.0-Universal.txt
+
    HostnameVerifier:
    From Apache HttpClient 4.4.1 and HttpCore 4.4.1
    See licenses/LICENSE-Apache2.0.txt
 
-   json-simple 1.1.1
+   json-simple 2.3.0
    (not included in most distribution packages)
+   Copyright 2016 Clifton Labs
    See licenses/LICENSE-Apache2.0.txt
 
    Noise library:
    Copyright (C) 2016 Southern Storm Software, Pty Ltd.
    See licenses/LICENSE-Noise.txt
 
+   MiniDNS library 1.0.0
+   This software may be used under the terms of (at your choice)
+   - LGPL version 2 (or later) (see licenses/LICENSE-LGPL2.1.txt)
+   - Apache Software licence (see licenses/LICENSE-Apache2.0.txt)
+   - DWTFYWTPL
+
 
 Router (router.jar):
 Public domain except as listed below:
@@ -118,6 +124,14 @@ Public domain except as listed below:
    Copyright (C) 2016 Southern Storm Software, Pty Ltd.
    See licenses/LICENSE-Noise.txt
 
+   SparseArray:
+   Copyright (C) 2006 The Android Open Source Project
+   See licenses/LICENSE-Apache2.0.txt
+
+   SSU HMAC:
+   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
+   See licenses/LICENSE-SHA256.txt
+
 
 Installer:
    (not included in distribution packages)
@@ -164,17 +178,18 @@ Installer:
 
 GeoIP Data:
    (not included in most distribution packages)
-   This product includes GeoLite2 data created by MaxMind, available from http://www.maxmind.com/
-   See licenses/LICENSE-GeoIP.txt
+   IP Geolocation by DB-IP https://db-ip.com/
+   See https://creativecommons.org/licenses/by/4.0/
 
 Launchers:
    (not included in distribution packages)
    Copyright (c) 2002-2018 EPFL, Lausanne / Lightbend, Inc. , unless otherwise specified.
    See licenses/LICENSE-Scala.md
 
-Java Service Wrapper Community Edition 32-bit 3.5.39:
+Java Service Wrapper Community Edition 3.5.44:
+   (Windows: 3.5.25)
    (not included in most distribution packages)
-   Copyright (C) 1999-2019 Tanuki Software, Ltd. All Rights Reserved.
+   Copyright (C) 1999-2020 Tanuki Software, Ltd. All Rights Reserved.
    See licenses/LICENSE-Wrapper.txt
 
 
@@ -184,7 +199,7 @@ Jbigi Libraries (jbigi.jar):
    GMP 4.3.2 / 5.0.2:
    Copyright 1991, 1996, 1999, 2000, 2007 Free Software Foundation, Inc.
    See licenses/LICENSE-LGPLv3.txt
-   GMP 6.0.0:
+   GMP 6.0.0 / 6.1.2 / 6.2.0:
    See licenses/LICENSE-GPLv2.txt
 
 
@@ -197,10 +212,6 @@ Applications:
        Copyright (c) 2006, Matthew Estes
        See licenses/LICENSE-BlockFile.txt
 
-   BOB (BOB.jar):
-   Copyright (C) sponge
-   See licenses/COPYING-BOB.txt
-
    Desktopgui (desktopgui.jar):
    Copyright (c) Mathias De Maré
    See licenses/LICENSE-DesktopGUI.txt
@@ -246,23 +257,22 @@ Applications:
        Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
        Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
        See licenses/LICENSE-BSD.txt
-     Zxing 3.3.0:
+     Zxing 3.4.1:
        See licenses/LICENSE-Apache2.0.txt
 
-   Jetty 9.2.25.v20180606 (jetty-*.jar, org.mortbay.*.jar):
+   Jetty 9.3.30.v20211001 (jetty-*.jar, org.mortbay.*.jar):
    (not included in most distribution packages, except for jetty-i2p.jar)
    See licenses/ABOUT-Jetty.html
    See licenses/NOTICE-Jetty.html
    See licenses/LICENSE-Apache2.0.txt
    See licenses/LICENSE-ECLIPSE-1.0.html
 
-   JRobin 1.6.0-1 (jrobin.jar):
+   RRD4J 3.8 (jrobin.jar):
    Copyright (c) 2001-2005 Sasa Markovic and Ciaran Treanor.
    Copyright (c) 2011 The OpenNMS Group, Inc.
+   Copyright 2011 The RRD4J Authors.
+   See licenses/LICENSE-Apache2.0.txt
    See licenses/LICENSE-LGPLv2.1.txt
-   DeallocationHelper:
-   Copyright (c) 2006-2016 Julien Gouesse
-   See licenses/LICENSE-GPLv2.txt
 
    Ministreaming Lib (mstreaming.jar):
    By mihi.
@@ -286,6 +296,7 @@ Applications:
        FatCow icons: See licenses/LICENSE-FatCowIcons.txt
        Fugue Icons: See licenses/LICENSE-FugueIcons.txt
        Feather icons: Copyright (c) 2013-2017 Cole Bemis; see licenses/LICENSE-Feather.txt
+       Fontawesome icons: Copyright (c) 2018 @fontawesome(company) see licenses/LICENSE-fontawesome.txt
 
    Router Console unthemed, light, and dark theme logos:
    Copyright (c) 2019 The Invisible Internet Project. All rights reserved.
@@ -324,9 +335,9 @@ Applications:
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 8.5.40 (jasper-runtime.jar):
+   Tomcat 9.0.62 (jasper-runtime.jar):
    (not included in most distribution packages)
-   Copyright 1999-2019 The Apache Software Foundation
+   Copyright 1999-2022 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
@@ -340,24 +351,7 @@ distributions. See the source package for the additional license information.
    Admin Manager:
    Public domain
 
-   BOB Demos:
-   Copyright (C) sponge
-   DWTFYWTPL
-
-   Gradle wrapper:
+   Gradle wrapper 5.2.1:
+   (not included in most distribution packages)
    Copyright (c) 2017 the original author or authors.
    See licenses/LICENSE-Apache2.0.txt
-
-   SAM C Library:
-   Copyright (c) 2004, Matthew P. Cashdollar <mpc@innographx.com>
-   See apps/sam/c/doc/license.txt
-
-   SAM C# Library:
-   Public domain.
-   See apps/sam/csharp/README
-
-   SAM Perl Library:
-   See licenses/LICENSE-GPLv2.txt
-
-   SAM Python Library:
-   Public domain.

Makefile.gcj

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

README.md

@@ -2,19 +2,19 @@
 
 This is the source code for the reference Java implementation of I2P.
 
-Latest release: https://geti2p.net/download
+Latest release: [https://geti2p.net/download](https://geti2p.net/download) 
 
 ## Installing
 
-See INSTALL.txt or https://geti2p.net/download for installation instructions.
+See [INSTALL.txt](INSTALL.txt) or [https://geti2p.net/download](https://geti2p.net/download) for installation instructions.
 
 ## Documentation
 
-https://geti2p.net/how
+[https://geti2p.net/how](https://geti2p.net/how)
 
-FAQ: https://geti2p.net/faq
+FAQ: [https://geti2p.net/faq](https://geti2p.net/faq) 
 
-API: http://docs.i2p-projekt.de/javadoc/
+API: [http://docs.i2p-projekt.de/javadoc/](http://docs.i2p-projekt.de/javadoc/) 
 or run 'ant javadoc' then start at build/javadoc/index.html
 
 ## How to contribute / Hack on I2P
@@ -23,17 +23,17 @@ Please check out [HACKING.md](docs/HACKING.md) and other documents in the docs d
 
 ## Building packages from source
 
-To get development branch from source control: https://geti2p.net/newdevelopers
+To get development branch from source control: [https://geti2p.net/newdevelopers](https://geti2p.net/newdevelopers) 
 
 ### Prerequisites
 
-- Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
-  - Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
+- Java SDK (preferably Oracle or OpenJDK) 8 or higher
+  - Non-linux operating systems and JVMs: See [https://trac.i2p2.de/wiki/java](https://trac.i2p2.de/wiki/java) 
   - Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel)
-    require only Java 1.6
-- Apache Ant 1.7.0 or higher
+    require only Java 6
+- Apache Ant 1.9.8 or higher
 - The xgettext, msgfmt, and msgmerge tools installed from the GNU gettext package
-  http://www.gnu.org/software/gettext/
+ [http://www.gnu.org/software/gettext/](http://www.gnu.org/software/gettext/) 
 - Build environment must use a UTF-8 locale.
 
 ### Ant build process
@@ -64,17 +64,22 @@ your `~/.gradle/gradle.properties`:
     systemProp.socksProxyHost=localhost
     systemProp.socksProxyPort=9150
 
+### Development builds
+Automatic CI builds are available at the [continuous integration](https://github.com/i2p/i2p.i2p/actions/workflows/ant.yml) page.
+
+### Docker
+For more information how to run I2P in Docker, see [Docker.md](Docker.md)
 ## Contact info
 
 Need help? See the IRC channel #i2p on irc.freenode.net
 
-Bug reports: https://trac.i2p2.de/report/1
+Bug reports: [https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues](https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues) [http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues](http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues)
 
-Contact information, security issues, press inquiries: https://geti2p.net/en/contact
+Contact information, security issues, press inquiries: [https://geti2p.net/en/contact](https://geti2p.net/en/contact) 
 
-Twitter: @i2p, @geti2p
+Twitter: [@i2p](https://twitter.com/i2p), [@geti2p](https://twitter.com/GetI2P)
 
 ## Licenses
 
-See LICENSE.txt
+See [LICENSE.txt](LICENSE.txt) 
 

README.txt

@@ -1,8 +1,8 @@
 Prerequisites to build from source:
-	Java SDK (preferably Oracle/Sun or OpenJDK) 1.7.0 or higher
+	Java SDK (preferably Oracle or OpenJDK) 8 or higher
           Non-linux operating systems and JVMs: See https://trac.i2p2.de/wiki/java
-          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 1.6
-	Apache Ant 1.7.0 or higher
+          Certain subsystems for embedded (core, router, mstreaming, streaming, i2ptunnel) require only Java 6
+	Apache Ant 1.9.8 or higher
 	The xgettext, msgfmt, and msgmerge tools installed
 	  from the GNU gettext package http://www.gnu.org/software/gettext/
 	Build environment must use a UTF-8 locale.
@@ -47,7 +47,8 @@ Need help?
 	IRC irc.freenode.net #i2p
 
 Bug reports:
-	https://trac.i2p2.de/report/1
+	https://i2pgit.org/i2p-hackers/i2p.i2p/-/issues
+	http://git.idk.i2p/i2p-hackers/i2p.i2p/-/issues
 
 Contact information, security issues, press inquiries:
 	https://geti2p.net/en/contact

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<project name="echoclient" default="default" basedir=".">
-    <description>Builds, tests, and runs the project echoclient.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="echoclient-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>

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

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

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

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

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

@@ -1,629 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="echoclient-impl">
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="" name="sourcepath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <delete>
-                    <files includes="${javac.includes.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target depends="init" name="deps-jar" unless="no.deps"/>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <j2seproject3:depend/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-</project>

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

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=8ce3cee9
-build.xml.script.CRC32=d1de2df3
-build.xml.stylesheet.CRC32=be360661
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=8ce3cee9
-nbproject/build-impl.xml.script.CRC32=22d1fbbb
-nbproject/build-impl.xml.stylesheet.CRC32=487672f9

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

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

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

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

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

@@ -1,60 +0,0 @@
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/echoclient.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.BOB.jar=../../../dist/BOB.jar
-includes=**
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=net.i2p.BOB.Demos.echo.echoclient.Main
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>echoclient</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>

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

@@ -1,193 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license 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 care 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(DataHelper.getUTF8(s));
-		CMDout.write('\n');
-		CMDout.flush();
-	}
-
-	static void setupconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// setup the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		try {
-			wrtxt(CMDout, "status " + args[2]);
-			line = Lread(CMDin); // get the status of this nickname, if it's an error, create it
-			checkline(line);
-		} catch(RuntimeException rte) {
-			wrtxt(CMDout, "setnick " + args[2]);
-			line = Lread(CMDin); // create a new nickname
-			checkline(line);
-			wrtxt(CMDout, "newkeys");
-			line = Lread(CMDin); // set up new keys
-			checkline(line);
-			wrtxt(CMDout, "inport " + args[1]);
-			line = Lread(CMDin); // set the port we connect in on
-			checkline(line);
-		}
-		wrtxt(CMDout, "getnick " + args[2]);
-		line = Lread(CMDin); // Set to our nick
-		try {
-			checkline(line);
-		} catch(RuntimeException rte) {
-			System.out.println("Continuing on existing tunnel..");
-			return;
-		}
-		wrtxt(CMDout, "start");
-		line = Lread(CMDin); // an error here is OK
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void deleteconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		// Wait for things to flush
-		try {
-			Thread.sleep(10000);
-		} catch(InterruptedException ex) {
-			// nop
-		}
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// delete the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		wrtxt(CMDout, "getnick " + args[2]); // Set to our nick
-		line = Lread(CMDin);
-		checkline(line);
-		wrtxt(CMDout, "stop");
-		line = Lread(CMDin);
-		checkline(line);
-		try {
-			Thread.sleep(2000); //sleep for 2000 ms (Two seconds)
-		} catch(Exception e) {
-			// nop
-		}
-
-		wrtxt(CMDout, "clear");
-		line = Lread(CMDin);
-		while(line.startsWith("ERROR")) {
-			wrtxt(CMDout, "clear");
-			line = Lread(CMDin);
-		}
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void chatter(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket sock = new Socket("localhost", Integer.parseInt(args[1]));
-		InputStream in = sock.getInputStream();
-		OutputStreamWriter out = new OutputStreamWriter(sock.getOutputStream());
-		out.write(args[3] + "\n"); // send out the i2p address to connect to
-		out.flush();
-		System.out.println("Connecting to " + args[3]);
-		line = Lread(in); // get server greeting
-		System.out.println("Got " + line); // show user
-		out.write("Test complete.\n"); // send something back
-		out.flush(); // make sure it's sent.
-		sock.close(); // done.
-	}
-
-	/**
-	 *
-	 * @param args tunnelport tunnelnickname I2Pdestkey
-	 */
-	public static void main(String[] args) {
-		// I'm lazy, and want to exit on any failures.
-		try {
-			setupconn(args); // talk to BOB, set up an outbound port
-			chatter(args);  // talk over the connection
-
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-		try {
-			deleteconn(args);
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(RuntimeException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-	}
-}

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<project name="echoserver" default="default" basedir=".">
-    <description>Builds, tests, and runs the project echoserver.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="echoserver-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>

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

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

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

@@ -1,629 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="echoserver-impl">
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="" name="sourcepath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <delete>
-                    <files includes="${javac.includes.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target depends="init" name="deps-jar" unless="no.deps"/>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <j2seproject3:depend/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-</project>

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

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=4ce39738
-build.xml.script.CRC32=c1deb82c
-build.xml.stylesheet.CRC32=be360661
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=4ce39738
-nbproject/build-impl.xml.script.CRC32=555cdd2d
-nbproject/build-impl.xml.stylesheet.CRC32=487672f9

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

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

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

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

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

@@ -1,60 +0,0 @@
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/echoserver.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-file.reference.BOB.jar=../../../dist/BOB.jar
-includes=**
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=net.i2p.BOB.Demos.echo.echoserver.Main
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>echoserver</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>

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

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

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

@@ -1,189 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license 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 care 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(DataHelper.getUTF8(s));
-		CMDout.write('\n');
-		CMDout.flush();
-	}
-
-	static void setupconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// setup the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		try {
-			wrtxt(CMDout, "status " + args[2]);
-			line =Lread(CMDin); // get the status of this nickname, if it's an error, create it
-			checkline(line);
-		} catch(RuntimeException rte) {
-			wrtxt(CMDout, "setnick " + args[2]);
-			line =Lread(CMDin); // create a new nickname
-			checkline(line);
-			wrtxt(CMDout, "newkeys ");
-			line =Lread(CMDin); // set up new keys
-			checkline(line);
-			wrtxt(CMDout, "outport " + args[1]);
-			line = Lread(CMDin); // set the port we connect out on
-			checkline(line);
-		}
-		wrtxt(CMDout, "getnick " + args[2]);
-		line = Lread(CMDin); // Set to our nick
-		checkline(line);
-		wrtxt(CMDout, "start ");
-		line = Lread(CMDin); // an error here is OK
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void deleteconn(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		Socket CMDsock = new Socket("localhost", 0xB0B);
-		InputStream CMDin = CMDsock.getInputStream();
-		OutputStream CMDout = CMDsock.getOutputStream();
-		// delete the tunnel.
-		line = Lread(CMDin);
-		System.out.println(line); // print the banner
-		line = Lread(CMDin);
-		System.out.println(line); // print initial status, should always be "OK"
-		wrtxt(CMDout, "getnick " + args[2]); // Set to our nick
-		line = Lread(CMDin);
-		checkline(line);
-		wrtxt(CMDout, "stop");
-		line = Lread(CMDin);
-		checkline(line);
-		try {
-			Thread.sleep(2000); //sleep for 2000 ms (Two seconds)
-		} catch(Exception e) {
-			// nop
-		}
-
-		wrtxt(CMDout, "clear");
-		line = Lread(CMDin);
-		while(line.startsWith("ERROR")) {
-			wrtxt(CMDout, "clear");
-			line = Lread(CMDin);
-		}
-		System.out.println(line); // print status
-		CMDsock.close(); // we no longer need this particular socket
-
-	}
-
-	static void chatter(Socket sock) throws UnknownHostException, IOException, RuntimeException {
-		String line;
-		InputStream in = sock.getInputStream();
-		OutputStreamWriter out = new OutputStreamWriter(new BufferedOutputStream(sock.getOutputStream()));
-
-		line = Lread(in); // get remote I2P address
-		System.out.println("Connect from: " + line); // show user
-
-		out.write("Hello, You are connecting from " + line + "\n"); // send greeting
-		out.flush(); // make sure it's sent.
-		line = Lread(in); // get test text from client
-		System.out.println("Got "+line); // show user
-		sock.close(); // done.
-	}
-
-	private static void serverlistener(String[] args) throws UnknownHostException, IOException, RuntimeException {
-		ServerSocket listener = new ServerSocket(Integer.parseInt(args[1]), 10, InetAddress.getByName("localhost"));
-		Socket server;
-
-		while(true) {
-			server = listener.accept();
-			chatter(server);
-		}
-	}
-
-	/**
-	 *
-	 * @param args tunnelport tunnelnickname
-	 */
-	public static void main(String[] args) {
-		// I'm lazy, and want to exit on any failures.
-		try {
-			setupconn(args); // talk to BOB, set up an inbound port
-			serverlistener(args);  // talk over the connection
-
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-		try {
-			deleteconn(args);
-		} catch(UnknownHostException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(IOException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		} catch(RuntimeException ex) {
-			Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
-		}
-	}
-}

apps/BOB/bob.config

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

apps/BOB/build.gradle

@@ -1,12 +0,0 @@
-sourceSets {
-    main {
-        java {
-            srcDir 'src'
-        }
-    }
-}
-
-dependencies {
-    compile project(':core')
-    compile project(':apps:ministreaming')
-}

apps/BOB/build.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="BOB" default="default" basedir=".">
-    <description>Builds, tests, and runs the project BOB.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="BOB-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-
-    <target depends="jar" description="Build BOB into a SINGLE JAR." name="onejar">
-	<!-- Make needed working dirs -->
-	<mkdir dir="${dist.dir}/lib" />
-	<mkdir dir="${dist.dir}/classes" />
-
-	<!-- Copy jars -->
-	<copy todir="${dist.dir}/lib" flatten="true" >
-	    <path>
-	        <pathelement path="${javac.classpath}" />
-	    </path>
-	</copy>
-	<copy todir="${dist.dir}/lib" file="../../build/jbigi.jar" />
-
-	<!-- Extract the classes inside the jar files -->
-	<unjar dest="${dist.dir}/classes" >
-            <fileset dir="${dist.dir}/lib" >
-                <include name="**/*.jar" />
-            </fileset>
-        </unjar>
-
-        <!-- Recombine the classes into a new jar file -->
-	<jar jarfile="${dist.dir}/lib/all-in-one.jar" >
-	    <fileset dir="${dist.dir}/classes" />
-        </jar>
-
-        <!-- Clean up work area -->        
-        <delete dir="${dist.dir}/classes" followsymlinks="false" includeemptydirs="true"/>
-
-        <!-- Make the single jar file -->
-        <jar jarfile="dist/BOB-one.jar" >
-            <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-            <zipfileset src="${dist.dir}/lib/all-in-one.jar" excludes="**/META-INF/*" />
-            <manifest>
-                <attribute name="Main-Class" value="net.i2p.BOB.Main" />
-            </manifest>
-        </jar>
-
-        <!-- Clean up the fake jar file -->
-        <delete file="${dist.dir}/lib/all-in-one.jar" />
-    </target>
-</project>

apps/BOB/manifest.mf

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

apps/BOB/nbproject/build-impl.xml

@@ -1,642 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="BOB-impl">
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="/does/not/exist" name="sourcepath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <delete>
-                    <files includes="${javac.includes.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.classes}">
-                        <include name="${fix.includes}*.class"/>
-                    </fileset>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-            <os family="windows"/>
-        </condition>
-        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
-            <isset property="debug.transport"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target depends="init" name="deps-jar" unless="no.deps"/>
-    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
-    <target depends="init" name="-check-automatic-build">
-        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
-    </target>
-    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <j2seproject3:depend/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-</project>

apps/BOB/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=209349b6
-build.xml.script.CRC32=403e69e6
-build.xml.stylesheet.CRC32=958a1d3e
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=209349b6
-nbproject/build-impl.xml.script.CRC32=c51e188e
-nbproject/build-impl.xml.stylesheet.CRC32=65b8de21

apps/BOB/nbproject/project.properties

@@ -1,93 +0,0 @@
-application.homepage=http://bob.i2p/
-application.title=BOB
-application.vendor=Sponge
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=false
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=8
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=8
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
-auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/BOB.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=**/*.html,**/*.txt
-file.reference.build-javadoc=../../i2p.i2p/build/javadoc
-file.reference.i2p.jar=../../core/java/build/i2p.jar
-file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
-file.reference.jbigi.jar=../../build/jbigi.jar
-file.reference.mstreaming.jar=../ministreaming/java/build/mstreaming.jar
-file.reference.router.jar=../../router/java/build/router.jar
-file.reference.streaming.jar=../streaming/java/build/streaming.jar
-file.reference.wrapper.jar=../../installer/lib/wrapper/all/wrapper.jar
-includes=**
-jar.compress=true
-javac.classpath=\
-    ${file.reference.router.jar}:\
-    ${file.reference.i2ptunnel.jar}:\
-    ${file.reference.mstreaming.jar}:\
-    ${file.reference.streaming.jar}:\
-    ${file.reference.wrapper.jar}:\
-    ${file.reference.i2p.jar}:\
-    ${file.reference.router.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.version=1.7
-javac.source=${javac.version}
-javac.target=${javac.version}
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jnlp.codebase.type=local
-jnlp.codebase.url=file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/dist
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.offline-allowed=false
-jnlp.signed=false
-main.class=net.i2p.BOB.Main
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test

apps/BOB/nbproject/project.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>BOB</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>

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

@@ -1,532 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import static net.i2p.app.ClientAppState.*;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import net.i2p.I2PAppContext;
-import net.i2p.app.*;
-import net.i2p.client.I2PClient;
-import net.i2p.util.I2PAppThread;
-import net.i2p.util.PortMapper;
-import net.i2p.util.SimpleTimer2;
-
-/**
- * <span style="font-size:8px;font-family:courier;color:#EEEEEE;background-color:#000000">
- * ################################################################################<br>
- * ############################.#..........#..#..........##########################<br>
- * #######################......................................###################<br>
- * ####################...........................#.......#........################<br>
- * #################..................##...................#.........##############<br>
- * ###############................###...####.....#..###.....#.........#############<br>
- * #############...........###..#..###...#####...###.##........#.......############<br>
- * ###########................#......##...#####...##..##.......#..#........########<br>
- * ##########.........................#....##.##..#...##.....................######<br>
- * #########...................................#....#.........................#####<br>
- * ########.........................................#...............#..........####<br>
- * ########.........................................#..........#######..........###<br>
- * #######.................................................############..........##<br>
- * #######..........................................####################.........##<br>
- * #######............####################......########################.........##<br>
- * ######.............###############################################.##.........##<br>
- * ######............################################################..##........##<br>
- * ######............################################################..##........##<br>
- * ######.............##############################################..##.........##<br>
- * ######............##############################################...##..........#<br>
- * ######............#..###########################################...##..........#<br>
- * ######.............#############################################....#..........#<br>
- * #######...........###############################################..##.........##<br>
- * #######...........#####.#.#.#.########################.....#.####...##........##<br>
- * ######............#..............##################.................##.........#<br>
- * ######................####.........###############........#####......##........#<br>
- * ######..............####..#.........############.......##.#.######...##.......##<br>
- * ######.................#.####.........########...........##....###...##.......##<br>
- * #######....#....###...................#######...............#...###..##.......##<br>
- * #######.........###..###.....###.......######.##.#####.........####..##.......##<br>
- * #######.....#...##############.........############......###########.###......##<br>
- * #######....##...##########.......##...##############......#.############.....###<br>
- * ########....#..########......######...##################################....####<br>
- * ########....##.####################...##################################....####<br>
- * ########..#.##..###################..##################################..#..####<br>
- * ##########..###..#################...##################################...#.####<br>
- * #########....##...##############....########..#####.################.##..#.#####<br>
- * ############.##....##########.......#########.###.......###########..#.#########<br>
- * ###############.....#######...#.......########.....##.....######.....###########<br>
- * ###############......###....##..........##.......######....#.........#.#########<br>
- * ##############............##..................##########..............##########<br>
- * ##############..............................##########..#.............##########<br>
- * ###############.......##..................#####..............####....###########<br>
- * ###############.......#####.......#.............####.....#######.....###########<br>
- * ################...#...####......##################.....########....############<br>
- * ################...##..#####.........####.##.....#....##########....############<br>
- * ##################..##..####...........#####.#....############.....#############<br>
- * ##################......#####.................################....##############<br>
- * ###################.....####..........##########..###########....###############<br>
- * ####################..#..#..........................########.....###############<br>
- * #####################.##.......###.................########....#################<br>
- * ######################.........#.......#.##.###############....#################<br>
- * #############.#######...............#####################....###################<br>
- * ###..#.....##...####..........#.....####################....####################<br>
- * ####......##........................##################....######################<br>
- * #.##...###..............###.........###############......#######################<br>
- * #...###..##............######...........................########################<br>
- * ##.......###..........##########....#...#...........############################<br>
- * ##.........##.......############################################################<br>
- * ###........##.....##############################################################<br>
- * ####.............###############################################################<br>
- * ######.........#################################################################<br>
- * #########....###################################################################<br>
- * ################################################################################<br>
- * </span>
- * BOB, main command socket listener, launches the command parser engine.
- *
- * @author sponge
- */
-public class BOB implements Runnable, ClientApp {
-
-	public final static String PROP_CONFIG_LOCATION = "BOB.config";
-	public final static String PROP_BOB_PORT = "BOB.port";
-	public final static String PROP_BOB_HOST = "BOB.host";
-	public final static String PROP_CFG_VER = "BOB.CFG.VER";
-
-	/** unused when started via the ClientApp interface */
-	private static BOB _bob;
-
-	private final NamedDB database;
-	private final Properties props = new Properties();
-	private final AtomicBoolean spin = new AtomicBoolean(true);
-	private static final String P_RUNNING = "RUNNING";
-	private static final String P_STARTING = "STARTING";
-	private static final String P_STOPPING = "STOPPING";
-	private final AtomicBoolean lock = new AtomicBoolean(false);
-	// no longer used.
-	// private static int maxConnections = 0;
-
-	private final I2PAppContext _context;
-	private final Logger _log;
-	private final ClientAppManager _mgr;
-	private final String[] _args;
-	private volatile ClientAppState _state = UNINITIALIZED;
-
-	private volatile ServerSocket listener;
-	private volatile Thread _runner;
-
-	/**
-	 * Stop BOB gracefully
-	 * @deprecated unused
-	 */
-	@Deprecated
-	public synchronized static void stop() {
-		if (_bob != null)
-			_bob.shutdown(null);
-	}
-
-	/**
-	 *  For ClientApp interface.
-	 *  Does NOT open the listener socket or start threads; caller must call startup()
-	 *
-	 *  @param mgr may be null
-	 *  @param args non-null
-	 *  @since 0.9.10
-	 */
-	public BOB(I2PAppContext context, ClientAppManager mgr, String[] args) {
-		_context = context;
-		// If we were run from command line, log to stdout
-		boolean logToStdout = false;
-		URL classResource = BOB.class.getResource("BOB.class");
-		if (classResource != null) {
-		    String classPath = classResource.toString();
-		    if (classPath.startsWith("jar")) {
-		        String manifestPath = classPath.substring(0, classPath.lastIndexOf('!') + 1) +
-		                "/META-INF/MANIFEST.MF";
-		        try {
-		            Manifest manifest = new Manifest(new URL(manifestPath).openStream());
-		            Attributes attrs = manifest.getMainAttributes();
-		            String mainClass = attrs.getValue("Main-Class");
-		            if ("net.i2p.BOB.Main".equals(mainClass))
-		                logToStdout = true;
-		        } catch (IOException ioe) {}
-		    }
-		}
-
-		_log = new Logger(context.logManager().getLog(BOB.class), logToStdout);
-
-		_mgr = mgr;
-		_args = args;
-		_state = INITIALIZED;
-		database = new NamedDB();
-		loadConfig();
-	}
-
-	/**
-	 * Listen for incoming connections and handle them
-	 *
-	 * @param args
-	 */
-	public synchronized static void main(String[] args) {
-		try {
-			_bob = new BOB(I2PAppContext.getGlobalContext(), null, args);
-			_bob.startup();
-		} catch (RuntimeException e) {
-			e.printStackTrace();
-			throw e;
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	private void loadConfig() {
-		int i = 0;
-		boolean save = false;
-		// Set up all defaults to be passed forward to other threads.
-		// Re-reading the config file in each thread is pretty damn stupid.
-		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
-		// This is here just to ensure there is no interference with our threadgroups.
-		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-		i = Y2.hashCode();
-		{
-			File cfg = new File(configLocation);
-			if (!cfg.isAbsolute()) {
-				cfg = new File(_context.getConfigDir(), configLocation);
-			}
-			FileInputStream fi = null;
-			try {
-				fi = new FileInputStream(cfg);
-				props.load(fi);
-			} catch (FileNotFoundException fnfe) {
-				_log.warn("Unable to load up the BOB config file " + cfg.getAbsolutePath() + ", Using defaults.", fnfe);
-				save = true;
-			} catch (IOException ioe) {
-				_log.warn("IOException on BOB config file " + cfg.getAbsolutePath() + ", using defaults.", ioe);
-			} finally {
-				if (fi != null) try { fi.close(); } catch (IOException ioe) {}
-			}
-		}
-		// Global router and client API configurations that are missing are set to defaults here.
-		if (!props.containsKey(I2PClient.PROP_TCP_HOST)) {
-			props.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
-			save = true;
-		}
-		if (!props.containsKey(I2PClient.PROP_TCP_PORT)) {
-			props.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT));
-			save = true;
-		}
-		if (!props.containsKey(PROP_BOB_PORT)) {
-			props.setProperty(PROP_BOB_PORT, "2827"); // 0xB0B
-			save = true;
-		}
-		if (!props.containsKey("inbound.length")) {
-			props.setProperty("inbound.length", "3");
-			save = true;
-		}
-		if (!props.containsKey("outbound.length")) {
-			props.setProperty("outbound.length", "3");
-			save = true;
-		}
-		if (!props.containsKey("inbound.lengthVariance")) {
-			props.setProperty("inbound.lengthVariance", "0");
-			save = true;
-		}
-		if (!props.containsKey("outbound.lengthVariance")) {
-			props.setProperty("outbound.lengthVariance", "0");
-			save = true;
-		}
-		if (!props.containsKey(PROP_BOB_HOST)) {
-			props.setProperty(PROP_BOB_HOST, "localhost");
-			save = true;
-		}
-		// PROP_RELIABILITY_NONE, PROP_RELIABILITY_BEST_EFFORT, PROP_RELIABILITY_GUARANTEED
-		if (!props.containsKey(PROP_CFG_VER)) {
-			props.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
-			props.setProperty(PROP_CFG_VER,"1");
-			save = true;
-		}
-		if (save) {
-			File cfg = new File(configLocation);
-			if (!cfg.isAbsolute()) {
-				cfg = new File(_context.getConfigDir(), configLocation);
-			}
-			FileOutputStream fo = null;
-			try {
-				_log.warn("Writing new defaults file " + cfg.getAbsolutePath());
-				fo = new FileOutputStream(cfg);
-				props.store(fo, cfg.getAbsolutePath());
-			} catch (IOException ioe) {
-				_log.error("IOException on BOB config file " + cfg.getAbsolutePath(), ioe);
-			} finally {
-				if (fo != null) try { fo.close(); } catch (IOException ioe) {}
-			}
-		}
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	private void startListener() throws IOException {
-		listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));
-		listener.setSoTimeout(500); // .5 sec
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	private void startThread() {
-		I2PAppThread t = new I2PAppThread(this, "BOBListener");
-		t.start();
-		_runner = t;
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	public void run() {
-		if (listener == null) return;
-		changeState(RUNNING);
-		_log.info("BOB is now running.");
-		if (_mgr != null)
-			_mgr.register(this);
-		_context.portMapper().register(PortMapper.SVC_BOB, props.getProperty(PROP_BOB_HOST),
-		                               Integer.parseInt(props.getProperty(PROP_BOB_PORT)));
-
-		int i = 0;
-		boolean g = false;
-		spin.set(true);
-		try {
-			Socket server = null;
-
-			while (spin.get()) {
-				//DoCMDS connection;
-
-				try {
-					server = listener.accept();
-					server.setKeepAlive(true);
-					g = true;
-				} catch (ConnectException ce) {
-					g = false;
-				} catch (SocketTimeoutException ste) {
-					g = false;
-				}
-
-				if (g) {
-					DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
-					Thread t = new I2PAppThread(conn_c);
-					t.setName("BOB.DoCMDS " + i);
-					t.start();
-					i++;
-				}
-			}
-			changeState(STOPPING);
-		} catch (Exception e) {
-			if (spin.get())
-				_log.error("Unexpected error while listening for connections", e);
-			else
-				e = null;
-			changeState(STOPPING, e);
-		} finally {
-			_log.info("BOB is now shutting down...");
-			_context.portMapper().unregister(PortMapper.SVC_BOB);
-			// Clean up everything.
-			try {
-				listener.close();
-			} catch (Exception ex) {
-				// nop
-			}
-			// Find all our "BOB.DoCMDS" threads, wait for them to be finished.
-			// We could order them to stop, but that could cause nasty issues in the locks.
-			visitAllThreads();
-			database.getReadLock();
-			NamedDB nickinfo;
-			try {
-				for (Object ndb : database.values()) {
-					nickinfo = (NamedDB) ndb;
-					nickinfo.getReadLock();
-					boolean released = false;
-					try {
-						if (nickinfo.get(P_RUNNING).equals(Boolean.TRUE) && nickinfo.get(P_STOPPING).equals(Boolean.FALSE) && nickinfo.get(P_STARTING).equals(Boolean.FALSE)) {
-							nickinfo.releaseReadLock();
-							released = true;
-							nickinfo.getWriteLock();
-							try {
-								nickinfo.add(P_STOPPING, Boolean.TRUE);
-							} finally {
-								nickinfo.releaseWriteLock();
-							}
-						}
-					} finally {
-						if (!released)
-							nickinfo.releaseReadLock();
-					}
-				}
-			} finally {
-				database.releaseReadLock();
-			}
-			changeState(STOPPED);
-			_log.info("BOB is now stopped.");
-		}
-	}
-
-	/**
-	 *	Find the root thread group,
-	 *	then find all theads with certain names and wait for them all to be dead.
-	 *
-	 */
-	private static void visitAllThreads() {
-		ThreadGroup root = Thread.currentThread().getThreadGroup().getParent();
-		while (root.getParent() != null) {
-			root = root.getParent();
-		}
-
-		// Visit each thread group
-		waitjoin(root, 0, root.getName());
-	}
-
-	private static void waitjoin(ThreadGroup group, int level, String tn) {
-		// Get threads in `group'
-		int numThreads = group.activeCount();
-		Thread[] threads = new Thread[numThreads * 2];
-		numThreads = group.enumerate(threads, false);
-		// Enumerate each thread in `group' and wait for it to stop if it is one of ours.
-		for (int i = 0; i < numThreads; i++) {
-			// Get thread
-			Thread thread = threads[i];
-			if (thread.getName().startsWith("BOB.DoCMDS ")) {
-				try {
-					if (thread.isAlive()) {
-						try {
-							thread.join();
-						} catch (InterruptedException ex) {
-						}
-					}
-				} catch (SecurityException se) {
-					//nop
-				}
-			}
-		}
-
-		// Get thread subgroups of `group'
-		int numGroups = group.activeGroupCount();
-		ThreadGroup[] groups = new ThreadGroup[numGroups * 2];
-		numGroups = group.enumerate(groups, false);
-
-		// Recursively visit each subgroup
-		for (int i = 0; i < numGroups; i++) {
-			waitjoin(groups[i], level + 1, groups[i].getName());
-		}
-	}
-
-	////// begin ClientApp interface
-
-	/**
-	 * @since 0.9.10
-	 */
-	@Override
-	public void startup() throws IOException {
-		if (_state != INITIALIZED)
-			return;
-		changeState(STARTING);
-		try {
-			startListener();
-		} catch (IOException e) {
-			_log.error("Error starting BOB on"
-					+ props.getProperty(PROP_BOB_HOST)
-					+ ":" + props.getProperty(PROP_BOB_PORT), e);
-			changeState(START_FAILED, e);
-			throw e;
-		}
-		startThread();
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	@Override
-	public void shutdown(String[] args) {
-		if (_state != RUNNING)
-			return;
-		changeState(STOPPING);
-		spin.set(false);
-		if (_runner != null)
-			_runner.interrupt();
-		else
-			changeState(STOPPED);
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	@Override
-	public ClientAppState getState() {
-		return _state;
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	@Override
-	public String getName() {
-		return "BOB";
-	}
-
-	/**
-	 * @since 0.9.10
-	 */
-	@Override
-	public String getDisplayName() {
-		return "BOB " + Arrays.toString(_args);
-	}
-
-	////// end ClientApp interface
-	////// begin ClientApp helpers
-
-	/**
-	 *  @since 0.9.10
-	 */
-	private void changeState(ClientAppState state) {
-		changeState(state, null);
-	}
-
-	/**
-	 *  @since 0.9.10
-	 */
-	private synchronized void changeState(ClientAppState state, Exception e) {
-		_state = state;
-		if (_mgr != null)
-			_mgr.notify(this, state, null, e);
-	}
-
-	////// end ClientApp helpers
-}

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

@@ -1,996 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.net.Socket;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.StringTokenizer;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.I2PClientFactory;
-import net.i2p.data.Destination;
-import net.i2p.util.I2PAppThread;
-
-// needed only for debugging.
-// import java.util.logging.Level;
-// import java.util.logging.Logger;
-
-/**
- * Simplistic command parser for BOB
- *
- * @author sponge
- *
- */
-public class DoCMDS implements Runnable {
-
-	// FIX ME
-	// I need a better way to do versioning, but this will do for now.
-	public static final String BMAJ = "00",  BMIN = "00",  BREV = "10",  BEXT = "";
-	public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT;
-	private final Socket server;
-	private final Properties props;
-	private final NamedDB database;
-	private String line;
-	private Destination d;
-	private ByteArrayOutputStream prikey;
-	private boolean dk,  ns,  ip,  op;
-	private NamedDB nickinfo;
-	private final Logger _log;
-	private final AtomicBoolean LIVE;
-	private final AtomicBoolean lock;
-	/* database strings */
-	private static final String P_DEST = "DESTINATION";
-	private static final String P_INHOST = "INHOST";
-	private static final String P_INPORT = "INPORT";
-	private static final String P_KEYS = "KEYS";
-	private static final String P_NICKNAME = "NICKNAME";
-	private static final String P_OUTHOST = "OUTHOST";
-	private static final String P_OUTPORT = "OUTPORT";
-	private static final String P_PROPERTIES = "PROPERTIES";
-	private static final String P_QUIET = "QUIET";
-	private static final String P_RUNNING = "RUNNING";
-	private static final String P_STARTING = "STARTING";
-	private static final String P_STOPPING = "STOPPING";
-
-	/* command strings */
-	private static final String C_help = "help";
-	private static final String C_clear = "clear";
-	private static final String C_getdest = "getdest";
-	private static final String C_getkeys = "getkeys";
-	private static final String C_getnick = "getnick";
-	private static final String C_inhost = "inhost";
-	private static final String C_inport = "inport";
-	private static final String C_list = "list";
-	private static final String C_lookup = "lookup";
-	private static final String C_newkeys = "newkeys";
-	private static final String C_option = "option";
-	private static final String C_outhost = "outhost";
-	private static final String C_outport = "outport";
-	private static final String C_quiet = "quiet";
-	private static final String C_quit = "quit";
-	private static final String C_setkeys = "setkeys";
-	private static final String C_setnick = "setnick";
-	private static final String C_show = "show";
-	private static final String C_show_props = "showprops";
-	private static final String C_start = "start";
-	private static final String C_status = "status";
-	private static final String C_stop = "stop";
-	private static final String C_verify = "verify";
-	private static final String C_visit = "visit";
-	private static final String C_zap = "zap";
-
-	/* all the commands available, plus description */
-	private static final String C_ALL[][] = {
-		{C_help, C_help + " <command> * Get help on a command."},
-		{C_clear, C_clear + " * Clear the current nickname out of the list."},
-		{C_getdest, C_getdest + " * Return the destination for the current nickname."},
-		{C_getkeys, C_getkeys + " * Return the keypair for the current nickname."},
-		{C_getnick, C_getnick + " tunnelname * Set the nickname from the database."},
-		{C_inhost, C_inhost + " hostname | IP * Set the inbound hostname or IP."},
-		{C_inport, C_inport + " port_number * Set the inbound port number nickname listens on."},
-		{C_list, C_list + " * List all tunnels."},
-		{C_lookup, C_lookup + " * Lookup an i2p address."},
-		{C_newkeys, C_newkeys + " * Generate a new keypair for the current nickname."},
-		{C_option, C_option + " I2CPoption=something * Set an I2CP option. NOTE: Don't use any spaces."},
-		{C_outhost, C_outhost + " hostname | IP * Set the outbound hostname or IP."},
-		{C_outport, C_outport + " port_number * Set the outbound port that nickname contacts."},
-		{C_quiet, C_quiet + " True | False * Don't send to the application the incoming destination."},
-		{C_quit, C_quit + " * Quits this session with BOB."},
-		{C_setkeys, C_setkeys + " BASE64_keypair * Sets the keypair for the current nickname."},
-		{C_setnick, C_setnick + " nickname * Create a new nickname."},
-		{C_show, C_show + " * Display the status of the current nickname."},
-		{C_show_props, C_show_props + " * Display the properties of the current nickname."},
-		{C_start, C_start + " * Start the current nickname tunnel."},
-		{C_status, C_status + " nickname * Display status of a nicknamed tunnel."},
-		{C_stop, C_stop + " * Stops the current nicknamed tunnel."},
-		{C_verify, C_verify + " BASE64_key * Verifies BASE64 destination."},
-		{C_visit, C_visit + " * Thread dump to wrapper.log."},
-		{C_zap, C_zap + " * Shuts down BOB."},
-		{"", "COMMANDS: " + // this is ugly, but...
-			C_help + " " +
-			C_clear + " " +
-			C_getdest + " " +
-			C_getkeys + " " +
-			C_getnick + " " +
-			C_inhost + " " +
-			C_inport + " " +
-			C_list + " " +
-			C_lookup + " " +
-			C_newkeys + " " +
-			C_option + " " +
-			C_outhost + " " +
-			C_outport + " " +
-			C_quiet + " " +
-			C_quit + " " +
-			C_setkeys + " " +
-			C_setnick + " " +
-			C_show + " " +
-			C_show_props + " " +
-			C_start + " " +
-			C_status + " " +
-			C_stop + " " +
-			C_verify + " " +
-			C_visit + " " +
-			C_zap
-		},
-		{" ", " "} // end of list
-	};
-
-	/**
-	 * @param LIVE
-	 * @param server
-	 * @param props
-	 * @param database
-	 * @param _log
-	 */
-	DoCMDS(AtomicBoolean LIVE, AtomicBoolean lock, Socket server, Properties props, NamedDB database, Logger _log) {
-		this.lock = lock;
-		this.LIVE = LIVE;
-		this.server = server;
-		this.props = new Properties();
-		this.database = database;
-		this._log = _log;
-		Lifted.copyProperties(props, this.props);
-	}
-
-	private void rlock() {
-		rlock(nickinfo);
-	}
-
-	private void rlock(NamedDB Arg) {
-		database.getReadLock();
-		Arg.getReadLock();
-	}
-
-	private void runlock() {
-		runlock(nickinfo);
-	}
-
-	private void runlock(NamedDB Arg) {
-		Arg.releaseReadLock();
-		database.releaseReadLock();
-	}
-
-	private void wlock() {
-		wlock(nickinfo);
-	}
-
-	private void wlock(NamedDB Arg) {
-		database.getWriteLock();
-		Arg.getWriteLock();
-	}
-
-	private void wunlock() {
-		wunlock(nickinfo);
-	}
-
-	private void wunlock(NamedDB Arg) {
-		Arg.releaseWriteLock();
-		database.releaseWriteLock();
-	}
-
-	/**
-	 * Try to print info from the database
-	 *
-	 * @param out
-	 * @param info
-	 * @param key
-	 */
-	private void trypnt(PrintStream out, NamedDB info, String key) {
-		rlock(info);
-		try {
-			out.print(" " + key + ": ");
-			if (info.exists(key)) {
-				out.print(info.get(key));
-			} else {
-				out.print("not_set");
-			}
-		} finally {
-			runlock(info);
-		}
-	}
-
-	/**
-	 * Print true or false if an object exists
-	 *
-	 * @param out
-	 * @param info
-	 * @param key
-	 */
-	private void tfpnt(PrintStream out, NamedDB info, String key) {
-		rlock(info);
-		try {
-			out.print(" " + key + ": ");
-			out.print(info.exists(key));
-		} finally {
-			runlock(info);
-		}
-	}
-
-	/**
-	 * Print an error message
-	 *
-	 * @param out
-	 */
-	private static void nns(PrintStream out) {
-		out.println("ERROR no nickname has been set");
-	}
-
-	/**
-	 * Dump various information from the database
-	 *
-	 * @param out
-	 * @param info
-	 */
-	private void nickprint(PrintStream out, NamedDB info) {
-		trypnt(out, info, P_NICKNAME);
-		trypnt(out, info, P_STARTING);
-		trypnt(out, info, P_RUNNING);
-		trypnt(out, info, P_STOPPING);
-		tfpnt(out, info, P_KEYS);
-		trypnt(out, info, P_QUIET);
-		trypnt(out, info, P_INPORT);
-		trypnt(out, info, P_INHOST);
-		trypnt(out, info, P_OUTPORT);
-		trypnt(out, info, P_OUTHOST);
-		out.println();
-	}
-
-	/**
-	 * Dump properties information from the database
-	 *
-	 * @param out
-	 * @param info
-	 */
-	private void propprint(PrintStream out, NamedDB info) {
-		trypnt(out, info, P_PROPERTIES);
-	}
-
-	/**
-	 * Print information on a specific record, indicated by NamedDB
-	 * @param out
-	 * @param Arg
-	 */
-	private void ttlpnt(PrintStream out, String Arg) {
-		database.getReadLock();
-		try {
-			if (database.exists(Arg)) {
-				out.print("DATA");
-				nickprint(out, (NamedDB) database.get(Arg));
-			}
-		} finally {
-			database.releaseReadLock();
-		}
-	}
-
-	/**
-	 * Is this NamedDB's tunnel active?
-	 *
-	 * @param Arg
-	 * @return true if the tunnel is active
-	 */
-	private boolean tunnelactive(NamedDB Arg) {
-		boolean retval;
-		rlock(Arg);
-		try {
-			retval = (Arg.get(P_STARTING).equals(Boolean.TRUE) ||
-				Arg.get(P_STOPPING).equals(Boolean.TRUE) ||
-				Arg.get(P_RUNNING).equals(Boolean.TRUE));
-		} finally {
-			runlock();
-		}
-		return retval;
-	}
-
-	/**
-	 * Does the base64 information look OK
-	 *
-	 * @param data
-	 * @return OK
-	 */
-	private static boolean is64ok(String data) {
-		try {
-			new Destination(data);
-			return true;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	/**
-	 * The actual parser.
-	 * It probabbly needs a rewrite into functions, but I kind-of like inline code.
-	 *
-	 */
-	public void run() {
-		dk = ns = ip = op = false;
-		try {
-			try {
-				// Get input from the client
-				BufferedReader in = new BufferedReader(new InputStreamReader(server.getInputStream()));
-				PrintStream out = new PrintStream(server.getOutputStream());
-				quit:
-				{
-					die:
-					{
-						prikey = new ByteArrayOutputStream();
-						out.println("BOB " + BOBversion);
-						out.println("OK");
-						while ((line = in.readLine()) != null) {
-							StringTokenizer token = new StringTokenizer(line, " "); // use a space as a delimiter
-							String Command = "";
-							String Arg = "";
-							NamedDB info;
-
-							if (token.countTokens() != 0) {
-								Command = token.nextToken();
-								Command =
-									Command.toLowerCase(Locale.US);
-								if (token.countTokens() != 0) {
-									Arg = token.nextToken();
-								} else {
-									Arg = "";
-								}
-								// The rest of the tokens are considered junk,
-								// and discarded without any warnings.
-								if (Command.equals(C_help)) {
-									for (int i = 0; !C_ALL[i][0].equals(" "); i++) {
-										if (C_ALL[i][0].equalsIgnoreCase(Arg)) {
-											out.println("OK " + C_ALL[i][1]);
-										}
-									}
-								} else if (Command.equals(C_visit)) {
-									visitAllThreads();
-									out.println("OK ");
-								} else if (Command.equals(C_lookup)) {
-									Destination dest = null;
-									String reply = null;
-									if (Arg.endsWith(".i2p")) {
-										try {
-											//try {
-												//dest = I2PTunnel.destFromName(Arg);
-											//} catch (DataFormatException ex) {
-											//}
-											dest = I2PAppContext.getGlobalContext().namingService().lookup(Arg);
-											if(dest != null) {
-												reply = dest.toBase64();
-											}
-										} catch (NullPointerException npe) {
-											// Could not find the destination!?
-										}
-									}
-									if (reply == null) {
-										out.println("ERROR Address Not found.");
-									} else {
-										out.println("OK " + reply);
-									}
-								} else if (Command.equals(C_getdest)) {
-									if (ns) {
-										if (dk) {
-											rlock();
-											try {
-												out.println("OK " + nickinfo.get(P_DEST));
-											} catch (Exception e) {
-												break die;
-											} finally {
-												runlock();
-											}
-										} else {
-											out.println("ERROR keys not set.");
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_list)) {
-									// Produce a formatted list of all nicknames
-									database.getReadLock();
-									try {
-										for (Object ndb : database.values()) {
-											try {
-												info = (NamedDB) ndb;
-												out.print("DATA");
-											} catch (Exception e) {
-												break die;
-											}
-											nickprint(out, info);
-										}
-									} finally {
-										database.releaseReadLock();
-									}
-									out.println("OK Listing done");
-								} else if (Command.equals(C_quit)) {
-									// End the command session
-									break quit;
-								} else if (Command.equals(C_zap)) {
-									// Kill BOB!! (let's hope this works!)
-									LIVE.set(false);
-									// End the command session
-									break quit;
-								} else if (Command.equals(C_newkeys)) {
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												try {
-													// Make a new PublicKey and PrivateKey
-													prikey = new ByteArrayOutputStream();
-													d = I2PClientFactory.createClient().createDestination(prikey);
-													wlock();
-													try {
-														nickinfo.add(P_KEYS, prikey.toByteArray());
-														nickinfo.add(P_DEST, d.toBase64());
-														out.println("OK " + nickinfo.get(P_DEST));
-													} catch (Exception e) {
-														break die;
-													} finally {
-														wunlock();
-													}
-													dk = true;
-												} catch (I2PException ipe) {
-													_log.error("Error generating keys", ipe);
-													out.println("ERROR generating keys");
-												}
-											}
-										} catch (Exception e) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_getkeys)) {
-									// Return public key
-									if (dk) {
-										prikey = new ByteArrayOutputStream();
-										rlock();
-										try {
-											prikey.write(((byte[]) nickinfo.get(P_KEYS)));
-										} catch (Exception ex) {
-											break die;
-										} finally {
-											runlock();
-										}
-										out.println("OK " + net.i2p.data.Base64.encode(prikey.toByteArray()));
-									} else {
-										out.println("ERROR no public key has been set");
-									}
-
-								} else if (Command.equals(C_quiet)) {
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												wlock();
-												try {
-													nickinfo.add(P_QUIET, Boolean.valueOf(Arg));
-												} catch (Exception ex) {
-													break die;
-												} finally {
-													wunlock();
-												}
-												out.println("OK Quiet set");
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_verify)) {
-									if (is64ok(Arg)) {
-										out.println("OK");
-									} else {
-										out.println("ERROR not in BASE64 format");
-									}
-								} else if (Command.equals(C_setkeys)) {
-									// Set the NamedDB to a privatekey in BASE64 format
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												try {
-													prikey = new ByteArrayOutputStream();
-													prikey.write(net.i2p.data.Base64.decode(Arg));
-													d = new Destination();
-													d.fromBase64(Arg);
-												} catch (Exception ex) {
-													Arg = "";
-												}
-
-												if ((Arg.length() == 884) && is64ok(Arg)) {
-													wlock();
-													try {
-														nickinfo.add(P_KEYS, prikey.toByteArray());
-														nickinfo.add(P_DEST, d.toBase64());
-														out.println("OK " + nickinfo.get(P_DEST));
-													} catch (Exception ex) {
-														break die;
-													} finally {
-														wunlock();
-													}
-													dk = true;
-												} else {
-													out.println("ERROR not in BASE64 format");
-												}
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_setnick)) {
-									ns = dk = ip = op = false;
-									database.getReadLock();
-									try {
-										nickinfo = (NamedDB) database.get(Arg);
-										if (!tunnelactive(nickinfo)) {
-											nickinfo = null;
-											ns = true;
-										}
-
-									} catch (Exception b) {
-										nickinfo = null;
-										ns = true;
-									} finally {
-										database.releaseReadLock();
-									}
-									// Clears and Sets the initial NamedDB structure to work with
-									if (ns) {
-										nickinfo = new NamedDB();
-										wlock();
-										try {
-											database.add(Arg, nickinfo);
-											nickinfo.add(P_NICKNAME, Arg);
-											nickinfo.add(P_STARTING, Boolean.FALSE);
-											nickinfo.add(P_RUNNING, Boolean.FALSE);
-											nickinfo.add(P_STOPPING, Boolean.FALSE);
-											nickinfo.add(P_QUIET, Boolean.FALSE);
-											nickinfo.add(P_INHOST, "localhost");
-											nickinfo.add(P_OUTHOST, "localhost");
-											Properties Q = new Properties();
-											Lifted.copyProperties(this.props, Q);
-											Q.setProperty("inbound.nickname", Arg);
-											Q.setProperty("outbound.nickname", Arg);
-											nickinfo.add(P_PROPERTIES, Q);
-										} catch (Exception e) {
-											break die;
-										} finally {
-											wunlock();
-										}
-										out.println("OK Nickname set to " + Arg);
-									} else {
-										out.println("ERROR tunnel is active");
-									}
-
-								} else if (Command.equals(C_option)) {
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												StringTokenizer otoken = new StringTokenizer(Arg, "="); // use an equal sign as a delimiter
-												if (otoken.countTokens() != 2) {
-													out.println("ERROR too many or no options.");
-												} else {
-													String pname = otoken.nextToken();
-													String pval = otoken.nextToken();
-													wlock();
-													try {
-														Properties Q = (Properties) nickinfo.get(P_PROPERTIES);
-														Q.setProperty(pname, pval);
-														nickinfo.add(P_PROPERTIES, Q);
-													} catch (Exception ex) {
-														break die;
-													} finally {
-														wunlock();
-													}
-													out.println("OK " + pname + " set to " + pval);
-												}
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_getnick)) {
-									// Get the NamedDB to work with...
-									boolean nsfail = false;
-									database.getReadLock();
-									try {
-										nickinfo = (NamedDB) database.get(Arg);
-										ns = true;
-									} catch (RuntimeException b) {
-										nsfail = true;
-										nns(out);
-									} finally {
-										database.releaseReadLock();
-									}
-									if (ns && !nsfail) {
-										rlock();
-										try {
-											dk = nickinfo.exists(P_KEYS);
-											ip = nickinfo.exists(P_INPORT);
-											op = nickinfo.exists(P_OUTPORT);
-										} catch (Exception ex) {
-											break die;
-										} finally {
-											runlock();
-										}
-										// Finally say OK.
-										out.println("OK Nickname set to " + Arg);
-									}
-
-								} else if (Command.equals(C_inport)) {
-									// Set the NamedDB inbound TO the router port
-									// app --> BOB
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												int prt;
-												wlock();
-												try {
-													nickinfo.kill(P_INPORT);
-													prt = Integer.parseInt(Arg);
-													if (prt > 1 && prt < 65536) {
-														try {
-															nickinfo.add(P_INPORT, Integer.valueOf(prt));
-														} catch (Exception ex) {
-															break die;
-														}
-													}
-													ip = nickinfo.exists(P_INPORT);
-												} catch (NumberFormatException nfe) {
-													out.println("ERROR not a number");
-												} finally {
-													wunlock();
-												}
-												if (ip) {
-													out.println("OK inbound port set");
-												} else {
-													out.println("ERROR port out of range");
-												}
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_outport)) {
-									// Set the NamedDB outbound FROM the router port
-									// BOB --> app
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												int prt;
-												wlock();
-												try {
-													nickinfo.kill(P_OUTPORT);
-													prt = Integer.parseInt(Arg);
-													if (prt > 1 && prt < 65536) {
-														nickinfo.add(P_OUTPORT, Integer.valueOf(prt));
-													}
-													ip = nickinfo.exists(P_OUTPORT);
-												} catch (NumberFormatException nfe) {
-													out.println("ERROR not a number");
-												} catch (Exception ex) {
-													break die;
-												} finally {
-													wunlock();
-												}
-												if (ip) {
-													out.println("OK outbound port set");
-												} else {
-													out.println("ERROR port out of range");
-												}
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_inhost)) {
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												wlock();
-												try {
-													nickinfo.add(P_INHOST, Arg);
-												} catch (Exception ex) {
-													break die;
-												} finally {
-													wunlock();
-												}
-												out.println("OK inhost set");
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_outhost)) {
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												wlock();
-												try {
-													nickinfo.add(P_OUTHOST, Arg);
-												} catch (Exception ex) {
-													break die;
-												} finally {
-													wunlock();
-												}
-												out.println("OK outhost set");
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_show)) {
-									// Get the current NamedDB properties
-									if (ns) {
-										out.print("OK");
-										nickprint(out, nickinfo);
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_show_props)) {
-									// Get the current options properties
-									if (ns) {
-										out.print("OK");
-										propprint(out, nickinfo);
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_start)) {
-									// Start the tunnel, if we have all the information
-									if (ns && dk && (ip || op)) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												MUXlisten tunnel;
-												try {
-													while (!lock.compareAndSet(false, true)) {
-														// wait
-													}
-													tunnel = new MUXlisten(lock, database, nickinfo, _log);
-													Thread t = new I2PAppThread(tunnel);
-													t.start();
-													// try {
-													//	Thread.sleep(1000 * 10); // Slow down the startup.
-													// } catch(InterruptedException ie) {
-													//	// ignore it
-													// }
-													out.println("OK tunnel starting");
-												} catch (I2PException e) {
-													lock.set(false);
-													out.println("ERROR starting tunnel: " + e);
-												} catch (IOException e) {
-													lock.set(false);
-													out.println("ERROR starting tunnel: " + e);
-												}
-											}
-										} catch (Exception ex) {
-											break die;
-										}
-
-									} else {
-										out.println("ERROR tunnel settings incomplete");
-									}
-
-								} else if (Command.equals(C_stop)) {
-									// Stop the tunnel, if it is running
-									if (ns) {
-										rlock();
-										boolean released = false;
-										try {
-											if (nickinfo.get(P_RUNNING).equals(Boolean.TRUE) && nickinfo.get(P_STOPPING).equals(Boolean.FALSE) && nickinfo.get(P_STARTING).equals(Boolean.FALSE)) {
-												runlock();
-												released = true;
-												wlock();
-												try {
-													nickinfo.add(P_STOPPING, Boolean.TRUE);
-												} catch (Exception e) {
-													break die;
-												} finally {
-													wunlock();
-												}
-												out.println("OK tunnel stopping");
-											} else {
-												out.println("ERROR tunnel is inactive");
-											}
-										} catch (Exception e) {
-											break die;
-										} finally {
-											if (!released)
-												runlock();
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_clear)) {
-									// Clear use of the NamedDB if stopped
-									if (ns) {
-										try {
-											if (tunnelactive(nickinfo)) {
-												out.println("ERROR tunnel is active");
-											} else {
-												database.getWriteLock();
-												try {
-													database.kill((String) nickinfo.get(P_NICKNAME));
-												} catch (Exception e) {
-												} finally {
-													database.releaseWriteLock();
-												}
-												dk = ns = ip = op = false;
-												out.println("OK cleared");
-											}
-
-										} catch (Exception ex) {
-											break die;
-										}
-									} else {
-										nns(out);
-									}
-
-								} else if (Command.equals(C_status)) {
-									database.getReadLock();
-									try {
-										if (database.exists(Arg)) {
-											// Show status of a NamedDB
-											out.print("OK ");
-											try {
-												ttlpnt(out, Arg);
-											} catch (Exception e) {
-												out.println(); // this will cause an IOE if IOE
-												break die;
-											}
-										} else {
-											nns(out);
-										}
-									} catch (Exception e) {
-										break die;
-									} finally {
-										database.releaseReadLock();
-									}
-								} else {
-									out.println("ERROR UNKNOWN COMMAND! Try help");
-								}
-
-							}
-						}
-					} // die
-					out.print("ERROR A really bad error just happened, ");
-				} // quit
-				// Say goodbye.
-
-				out.println("OK Bye!");
-
-			} catch (IOException ioe) {
-				// not really needed, except to debug.
-				// BOB.warn("IOException on socket listen: " + ioe);
-				// ioe.printStackTrace();
-			}
-		} finally {
-			try {
-				server.close();
-			} catch (IOException ex) {
-				// nop
-			}
-		}
-	}
-	// Debugging... None of this is normally used.
-
-	/**
-	 *	Find the root thread group and print them all.
-	 *
-	 */
-	private void visitAllThreads() {
-		ThreadGroup root = Thread.currentThread().getThreadGroup().getParent();
-		while (root.getParent() != null) {
-			root = root.getParent();
-		}
-
-		// Visit each thread group
-		visit(root, 0, root.getName());
-	}
-
-	/**
-	 * Recursively visits all thread groups under `group' and dumps them.
-	 * @param group ThreadGroup to visit
-	 * @param level Current level
-	 */
-	private static void visit(ThreadGroup group, int level, String tn) {
-		// Get threads in `group'
-		int numThreads = group.activeCount();
-		Thread[] threads = new Thread[numThreads * 2];
-		numThreads = group.enumerate(threads, false);
-		String indent = "------------------------------------".substring(0, level) + "-> ";
-		// Enumerate each thread in `group' and print it.
-		for (int i = 0; i < numThreads; i++) {
-			// Get thread
-			Thread thread = threads[i];
-			System.out.println("BOB: " + indent + tn + ": " + thread.toString());
-		}
-
-		// Get thread subgroups of `group'
-		int numGroups = group.activeGroupCount();
-		ThreadGroup[] groups = new ThreadGroup[numGroups * 2];
-		numGroups = group.enumerate(groups, false);
-
-		// Recursively visit each subgroup
-		for (int i = 0; i < numGroups; i++) {
-			visit(groups[i], level + 1, groups[i].getName());
-		}
-	}
-}

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

@@ -1,99 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.util.I2PAppThread;
-
-/**
- * Listen on I2P and connect to TCP
- *
- * @author sponge
- */
-public class I2Plistener implements Runnable {
-
-	private final NamedDB info,  database;
-	private final Logger _log;
-	private final I2PServerSocket serverSocket;
-	private final AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 * @param SS
-	 * @param S unused
-	 * @param info
-	 * @param database
-	 * @param _log
-	 */
-	I2Plistener(I2PServerSocket SS, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
-		this.database = database;
-		this.info = info;
-		this._log = _log;
-		this.serverSocket = SS;
-		this.lives = lives;
-	}
-
-	/**
-	 * Simply listen on I2P port, and thread connections
-	 *
-	 */
-	public void run() {
-		boolean g = false;
-		I2PSocket sessSocket = null;
-		int conn = 0;
-		try {
-			try {
-				serverSocket.setSoTimeout(50);
-
-				while (lives.get()) {
-					try {
-						sessSocket = serverSocket.accept();
-						g = true;
-					} catch (ConnectException ce) {
-						g = false;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-					if (g) {
-						g = false;
-						conn++;
-						// toss the connection to a new thread.
-						I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database, lives);
-						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn);
-						t.start();
-					}
-
-				}
-			} catch (I2PException e) {
-				// bad stuff
-				System.out.println("Exception " + e);
-			}
-		} finally {
-			try {
-				serverSocket.close();
-			} catch (I2PException ex) {
-			}
-			// System.out.println("I2Plistener: Close");
-		}
-	}
-}

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

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

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

@@ -1,46 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Sets of "friendly" utilities to make life easier.
- * Any "Lifted" code will apear here, and credits given.
- * It's better to "Lift" a small chunk of "free" code than add in piles of
- * code we don't need, and don't want.
- *
- * @author sponge
- */
-public class Lifted {
-
-	/**
-	 * Copy a set of properties from one Property to another.
-	 * Lifted from Apache Derby code svn repository.
-	 * Liscenced as follows:
-	 * http://svn.apache.org/repos/asf/db/derby/code/trunk/LICENSE
-	 *
-	 * @param src_prop  Source set of properties to copy from.
-	 * @param dest_prop Dest Properties to copy into.
-	 *
-	 **/
-	public static void copyProperties(Properties src_prop, Properties dest_prop) {
-		for (Map.Entry<Object, Object> e : src_prop.entrySet()) {
-			dest_prop.put((String)e.getKey(), (String)e.getValue());
-		}
-	}
-}

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

@@ -1,44 +0,0 @@
-package net.i2p.BOB;
-
-import net.i2p.util.Log;
-
-public class Logger {
-	public Log log;
-	private boolean logToStdout;
-
-	public Logger(Log log, boolean logToStdout) {
-		this.log = log;
-		this.logToStdout = logToStdout;
-	}
-
-	public void info(String msg) {
-		if (logToStdout)
-			System.out.println("INFO: " + msg);
-		if (log.shouldLog(Log.INFO))
-			log.info(msg);
-	}
-
-	public void warn(String msg) {
-		warn(msg, null);
-	}
-
-	public void warn(String msg, Throwable e) {
-		if (logToStdout) {
-			System.out.println("WARNING: " + msg);
-			if (e != null)
-				e.printStackTrace();
-		}
-		if (log.shouldLog(Log.WARN))
-			log.warn(msg, e);
-	}
-
-	public void error(String msg, Throwable e) {
-		if (logToStdout) {
-			System.out.println("ERROR: " + msg);
-			if (e != null)
-				e.printStackTrace();
-		}
-		if (log.shouldLog(Log.ERROR))
-			log.error(msg, e);
-	}
-}

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

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

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

@@ -1,39 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import net.i2p.util.SimpleTimer2;
-
-/**
- * Start from command line
- *
- * @author sponge
- *
- */
-public class Main {
-
-	/**
-	 * @param args the command line arguments, these are not used yet
-	 */
-	public static void main(String[] args) {
-		// THINK THINK THINK THINK THINK THINK
-		SimpleTimer2 Y2 = SimpleTimer2.getInstance();
-
-		BOB.main(args);
-
-		Y2.stop();
-	}
-}

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

@@ -1,106 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-
-/**
- * Internal database to relate nicknames to options to values
- *
- * @author sponge
- */
-public class NamedDB {
-
-	private final Map<String, Object> data;
-	private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(false);
-
-	/**
-	 *
-	 */
-	public NamedDB() {
-		this.data = new HashMap<String, Object>();
-	}
-
-	public void getReadLock() {
-		lock.readLock().lock();
-	}
-
-	public void releaseReadLock() {
-		lock.readLock().unlock();
-	}
-
-	public void getWriteLock() {
-		lock.writeLock().lock();
-	}
-
-	public void releaseWriteLock() {
-		lock.writeLock().unlock();
-	}
-
-	/**
-	 * Delete an object if it exists
-	 *
-	 * @param key
-	 */
-	public void kill(String key) {
-		data.remove(key);
-	}
-
-	/**
-	 * Add object, deletes the old one if it exists
-	 *
-	 * @param key
-	 * @param val
-	 */
-	public void add(String key, Object val) {
-		data.put(key, val);
-	}
-
-	/**
-	 * Get the object, and return it, throws RuntimeException if not found
-	 *
-	 * @param key non-null
-	 * @return Object non-null
-	 * @throws java.lang.RuntimeException if not found
-	 */
-	public Object get(String key) throws RuntimeException {
-		Object rv = data.get(key);
-		if (rv != null)
-			return rv;
-		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(String key) {
-		return data.containsKey(key);
-	}
-
-	/**
-	 * @since 0.9.29 replaces getcount() and getnext(int)
-	 */
-	public Collection<Object> values() {
-		return data.values();
-	}
-}

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

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

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

@@ -1,95 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import net.i2p.client.streaming.I2PServerSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.util.I2PAppThread;
-
-/**
- * Listen on TCP port and connect to I2P
- *
- * @author sponge
- */
-public class TCPlistener implements Runnable {
-
-	private final NamedDB info,  database;
-	private final Logger _log;
-	private final I2PSocketManager socketManager;
-	private final ServerSocket listener;
-	private final AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 * @param S
-	 * @param info
-	 * @param database
-	 * @param _log
-	 */
-	TCPlistener(ServerSocket listener, I2PSocketManager S, NamedDB info, NamedDB database, Logger _log, AtomicBoolean lives) {
-		this.database = database;
-		this.info = info;
-		this._log = _log;
-		this.socketManager = S;
-		this.listener = listener;
-		this.lives = lives;
-	}
-
-	/**
-	 * Simply listen on TCP port, and thread connections
-	 *
-	 */
-	public void run() {
-		boolean g = false;
-		int conn = 0;
-		Socket server = null;
-		try {
-			try {
-				listener.setSoTimeout(50); // We don't block, we cycle and check.
-				while (lives.get()) {
-					try {
-						server = listener.accept();
-						server.setKeepAlive(true);
-						g = true;
-					} catch (SocketTimeoutException ste) {
-						g = false;
-					}
-					if (g) {
-						conn++;
-						// toss the connection to a new thread.
-						TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database, lives);
-						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn);
-						t.start();
-						g = false;
-					}
-				}
-			} catch (IOException ioe) {
-			}
-		} finally {
-			try {
-				listener.close();
-			} catch (IOException ex) {
-			}
-		//System.out.println("TCPlistener: " + Thread.currentThread().getName() +  "Done.");
-		}
-	}
-}

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

@@ -1,222 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license questions.
- */
-package net.i2p.BOB;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.NoRouteToHostException;
-import java.net.Socket;
-import java.util.Locale;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import net.i2p.I2PAppContext;
-import net.i2p.I2PException;
-import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Destination;
-import net.i2p.util.I2PAppThread;
-
-/**
- *
- * Process TCP->I2P
- *
- * @author sponge
- */
-public class TCPtoI2P implements Runnable {
-
-	private I2PSocket I2P;
-	private final Socket sock;
-	private final I2PSocketManager socketManager;
-	private final AtomicBoolean lives;
-
-	/**
-	 * Constructor
-	 * @param i2p
-	 * @param socket
-	 * @param info unused
-	 * @param database unused
-	 */
-	TCPtoI2P(I2PSocketManager i2p, Socket socket, NamedDB info, NamedDB database, AtomicBoolean lives) {
-		this.sock = socket;
-		this.socketManager = i2p;
-		this.lives = lives;
-	}
-
-	/**
-	 * This is a more forgiving readline,
-	 * it works on unbuffered streams
-	 *
-	 * @param in
-	 * @return line of text as a String
-	 * @throws IOException
-	 */
-	private static String lnRead(InputStream in) throws IOException {
-		StringBuilder builder = new StringBuilder();
-		int b;
-		char c;
-
-		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 care about ASCII
-			builder.append(c);
-		}
-		return builder.toString();
-	}
-
-	/**
-	 * 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("UTF-8"));
-		out.write(13);
-		out.write(10);
-		out.flush();
-	}
-
-	/**
-	 * TCP stream to I2P stream thread starter
-	 *
-	 */
-	public void run() {
-		String line, input;
-		InputStream Iin = null;
-		OutputStream Iout = null;
-		InputStream in = null;
-		OutputStream out = null;
-		Thread t = null;
-		Thread q = null;
-		try {
-			try {
-
-				in = sock.getInputStream();
-				out = sock.getOutputStream();
-				line = lnRead(in);
-				input = line.toLowerCase(Locale.US);
-				Destination dest = null;
-				if (input.endsWith(".i2p")) {
-					//dest = I2PTunnel.destFromName(input);
-					dest = I2PAppContext.getGlobalContext().namingService().lookup(input);
-					if (dest != null) {
-						line = dest.toBase64();
-					} else {
-						Emsg("Can't find destination: " + input, out);
-						return;
-					}
-				}
-				dest = new Destination();
-				dest.fromBase64(line);
-
-				try {
-					// get a client socket
-					I2P = socketManager.connect(dest);
-					I2P.setReadTimeout(0); // temp bugfix, this *SHOULD* be the default
-					// make readers/writers
-					Iin = I2P.getInputStream();
-					Iout = I2P.getOutputStream();
-					// setup to cross the streams
-					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
-					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new I2PAppThread(conn_a, Thread.currentThread().getName() + " TCPioB");
-					// Fire!
-					t.start();
-					q.start();
-					while (t.isAlive() && q.isAlive() && lives.get()) { // AND is used here to kill off the other thread
-						Thread.sleep(10); //sleep for 10 ms
-					}
-				} catch (I2PException e) {
-					Emsg(e.toString(), out);
-				} catch (ConnectException e) {
-					Emsg(e.toString(), out);
-				} catch (NoRouteToHostException e) {
-					Emsg(e.toString(), out);
-				}
-
-			} catch (InterruptedIOException e) {
-				// We're breaking away.
-			} catch (InterruptedException e) {
-				// ditto
-			} catch (IOException e) {
-				try {
-					Emsg(e.toString(), out);
-				} catch (IOException ex) {
-					// ditto
-				}
-			} catch (DataFormatException e) {
-				try {
-					Emsg(e.toString(), out);
-				} catch (IOException ex) {
-					// ditto
-				}
-			}
-
-		} finally {
-			try {
-				t.interrupt();
-			} catch (Exception e) {
-			}
-			try {
-				q.interrupt();
-			} catch (Exception e) {
-			}
-			try {
-				in.close();
-			} catch (Exception e) {
-			}
-			try {
-				out.close();
-			} catch (Exception e) {
-			}
-			try {
-				Iin.close();
-			} catch (Exception e) {
-			}
-			try {
-				Iout.close();
-			} catch (Exception e) {
-			}
-			try {
-				// System.out.println("TCPtoI2P: Close I2P");
-				I2P.close();
-			} catch (Exception e) {
-			}
-
-			try {
-				// System.out.println("TCPtoI2P: Close sock");
-				sock.close();
-			} catch (Exception e) {
-			}
-		}
-	// System.out.println("TCPtoI2P: Done.");
-	}
-}

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

@@ -1,140 +0,0 @@
-/**
- *                    WTFPL
- *                    Version 2, December 2004
- *
- * Copyright (C) sponge
- *   Planet Earth
- *
- * See...
- *
- *	http://sam.zoy.org/wtfpl/
- *	and
- *	http://en.wikipedia.org/wiki/WTFPL
- *
- * ...for any additional details and license 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
- * @deprecated incomplete, unused
- */
-@Deprecated
-public class UDPIOthread implements I2PSessionListener, Runnable {
-
-	private final NamedDB info;
-	private final Log _log;
-	private final Socket socket;
-	private DataInputStream in;
-	private DataOutputStream out;
-	private final I2PSession _session;
-	// FIXME never set
-	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);
-			if (msg != null) {
-				out.write(msg);
-				out.flush();
-			}
-		} catch (I2PSessionException ise) {
-			up = false;
-		} catch (IOException ioe) {
-			up = false;
-		}
-	}
-
-	// Great, can these be used to kill ourselves.
-	/** required by {@link I2PSessionListener I2PSessionListener} to notify of disconnect */
-	public void disconnected(I2PSession session) {
-		_log.debug("Disconnected");
-	// up = false;
-	}
-
-	/** required by {@link I2PSessionListener I2PSessionListener} to notify of error */
-	public void errorOccurred(I2PSession session, String message, Throwable error) {
-		_log.debug("Error occurred: " + message, error);
-	// up = false;
-	}
-
-	/** required by {@link I2PSessionListener I2PSessionListener} to notify of abuse */
-	public void reportAbuse(I2PSession session, int severity) {
-		_log.debug("Abuse reported of severity " + severity);
-	// up = false;
-	}
-}

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

@@ -1,21 +0,0 @@
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) sponge
-   Planet Earth
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
-See...
-
-	http://sam.zoy.org/wtfpl/
-	and
-	http://en.wikipedia.org/wiki/WTFPL
-
-...for any additional details and license questions.

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

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

apps/addressbook/README.txt

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

apps/addressbook/build.gradle

@@ -1,3 +1,5 @@
+apply plugin:'war'
+
 sourceSets {
     main {
         java {
@@ -7,6 +9,14 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':core')
-    compile project(':apps:jetty')
+    providedCompile project(':core')
+    providedCompile project(':apps:jetty')
+}
+
+war {
+    rootSpec.exclude('**/*.class')
+}
+
+artifacts {
+    archives war
 }

apps/addressbook/build.xml

@@ -7,7 +7,9 @@
 	<property name="jar" value="addressbook.jar"/>
 	<property name="war" value="addressbook.war"/>
 	<property name="javac.compilerargs" value="" />
-	<property name="javac.version" value="1.7" />
+	<property name="javac.version" value="1.8" />
+	<property name="javac.release" value="8" />
+	<property name="manifest.classpath.name" value="Class-Path" />
 
 	<target name="all" depends="jar, emptyWar"/> 
 	
@@ -40,7 +42,9 @@
 
 	<target name="compile" depends="init, depend, warUpToDate">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+                       release="${javac.release}"
                        includeAntRuntime="false"
+                       encoding="UTF-8"
                        srcdir="${src}" destdir="${build}">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
@@ -54,8 +58,14 @@
 		<property name="workspace.changes.tr" value="" />
 		<jar basedir="${build}" destfile="${dist}/${jar}">
 			<manifest>
-				<attribute name="Main-Class" value="net.i2p.addressbook.Daemon"/>
+				<attribute name="${manifest.classpath.name}" value="i2p.jar" />
+				<attribute name="Main-Class" value="net.i2p.addressbook.CommandLine"/>
+				<attribute name="Specification-Title" value="I2P Address Book" />
+				<attribute name="Specification-Version" value="${api.version}" />
+				<attribute name="Specification-Vendor" value="The I2P Project https://geti2p.net/" />
+				<attribute name="Implementation-Title" value="I2P Java Address Book" />
 				<attribute name="Implementation-Version" value="${full.version}" />
+				<attribute name="Implementation-Vendor" value="The I2P Project https://geti2p.net/" />
 				<attribute name="Built-By" value="${build.built-by}" />
 		                <attribute name="Build-Date" value="${build.timestamp}" />
 		                <attribute name="Base-Revision" value="${workspace.version}" />
@@ -74,28 +84,36 @@
             </jar>
         </target>
 	
+	<!-- actually the jar -->
 	<target name="warUpToDate">
-	        <uptodate property="war.uptodate" targetfile="${dist}/${war}">
-		            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
+	        <uptodate property="war.uptodate" targetfile="${dist}/${jar}">
+		            <srcfiles dir= "." includes="${build}/**/*.class"/>
 	        </uptodate>
                 <condition property="shouldListChanges" >
                     <and>
                         <not>
                             <isset property="war.uptodate" />
                         </not>
-                        <isset property="mtn.available" />
+                        <isset property="git.available" />
                     </and>
                 </condition>
 	</target>
 
 	<target name="changes" depends="warUpToDate" if="shouldListChanges" >
-	        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
-	            <arg value="list" />
-	            <arg value="changed" />
-	            <arg value="." />
-	        </exec>
+		<exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
+		    <arg value="status" />
+		    <arg value="-s" />
+		    <arg value="--porcelain" />
+		    <arg value="-uno" />
+		    <arg value="." />
+		</exec>
+		<!-- trim flags -->
+		<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
+		    <arg value="-e" />
+		    <arg value="s/^[MTADRCU ]*//" />
+		</exec>
 		<!-- \n in an attribute value generates an invalid manifest -->
-		<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
+		<exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
 			<arg value="-s" />
 			<arg value="[:space:]" />
 			<arg value="," />

apps/addressbook/config.txt

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

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

@@ -136,9 +136,17 @@ class AddressBook implements Iterable<Map.Entry<String, HostTxtEntry>> {
         File tmp = null;
         try {
             tmp = SecureFile.createTempFile("addressbook", null, I2PAppContext.getGlobalContext().getTempDir());
+            // Apache 2.4 mod_deflate etag bug workaround
+            // strip -gzip from the etag
+            // Gitlab #454
+            String loc = subscription.getLocation();
+            String etag = subscription.getEtag();
+            if (loc.startsWith("http://i2p-projekt.i2p/") && etag != null && etag.endsWith("-gzip\""))
+                etag = etag.substring(0, etag.length() - 6) + '"';
+
             EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true,
                     proxyHost, proxyPort, 0, -1l, MAX_SUB_SIZE, tmp.getAbsolutePath(), null,
-                    subscription.getLocation(), true, subscription.getEtag(), subscription.getLastModified(), null);
+                    loc, true, etag, subscription.getLastModified(), null);
             if (get.fetch()) {
                 subscription.setEtag(get.getETag());
                 subscription.setLastModified(get.getLastModified());
@@ -246,19 +254,19 @@ class AddressBook implements Iterable<Map.Entry<String, HostTxtEntry>> {
     }
 
     /**
-     * Do basic validation of the hostname
-     * hostname was already converted to lower case by HostTxtParser.parse()
+     * Do basic validation of the address
+     * address was already converted to lower case by HostTxtParser.parse()
      */
     public static boolean isValidKey(String host) {
 	return
-		host.endsWith(".i2p") &&
-		host.length() > 4 &&
-		host.length() <= 67 &&          // 63 + ".i2p"
+	    host.endsWith(".i2p") &&
+        host.length() > 4 &&
+        host.length() <= 67 &&          // 63 + ".i2p"
                 (! host.startsWith(".")) &&
                 (! host.startsWith("-")) &&
                 host.indexOf(".-") < 0 &&
                 host.indexOf("-.") < 0 &&
-		host.indexOf("..") < 0 &&
+        host.indexOf("..") < 0 &&
                 // IDN - basic check, not complete validation
                 (host.indexOf("--") < 0 || host.startsWith("xn--") || host.indexOf(".xn--") > 0) &&
                 HOST_PATTERN.matcher(host).matches() &&
@@ -275,19 +283,19 @@ class AddressBook implements Iterable<Map.Entry<String, HostTxtEntry>> {
                 (! host.endsWith(".proxy.i2p")) &&
                 (! host.endsWith(".router.i2p")) &&
                 (! host.endsWith(".console.i2p"))
-                ;	
+                ;    
     }
 
     /**
      * Do basic validation of the b64 dest, without bothering to instantiate it
      */
     private static boolean isValidDest(String dest) {
-	return
+    return
                 // null cert ends with AAAA but other zero-length certs would be AA
-		((dest.length() == MIN_DEST_LENGTH && dest.endsWith("AA")) ||
-		 (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
-		// B64 comes in groups of 2, 3, or 4 chars, but never 1
-		((dest.length() % 4) != 1) &&
+        ((dest.length() == MIN_DEST_LENGTH && dest.endsWith("AA")) ||
+         (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
+        // B64 comes in groups of 2, 3, or 4 chars, but never 1
+        ((dest.length() % 4) != 1) &&
                 B64_PATTERN.matcher(dest).matches()
                 ;	
     }

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

@@ -0,0 +1,42 @@
+package net.i2p.addressbook;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import net.i2p.CoreVersion;
+
+/**
+ * Simple command line access to various utilities.
+ * Not a public API. Subject to change.
+ * Apps and plugins should use specific classes.
+ *
+ * @since 0.9.55
+ */
+public class CommandLine extends net.i2p.util.CommandLine {
+
+    protected static final List<String> ACLASSES = Arrays.asList(new String[] {
+        "net.i2p.addressbook.HostTxtParser",
+        "net.i2p.router.naming.BlockfileNamingService",
+        "net.metanotion.io.block.BlockFile",
+    });
+
+    protected CommandLine() {}
+
+    public static void main(String args[]) {
+        List<String> classes = new ArrayList<String>(ACLASSES.size() + CLASSES.size());
+        classes.addAll(ACLASSES);
+        classes.addAll(CLASSES);
+        if (args.length > 0) {
+            exec(args, classes);
+        }
+        usage(classes);
+        System.exit(1);
+    }
+
+    private static void usage(List<String> classes) {
+        System.err.println("I2P Address book version " + CoreVersion.VERSION + '\n' +
+                           "USAGE: java -jar /path/to/addressbook.jar command [args]");
+        printCommands(classes);
+    }
+}

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

@@ -166,6 +166,10 @@ class ConfigParser {
         Map<String, String> result;
         try {
             result = parse(file);
+            // migrate
+            String local = result.remove("master_addressbook");
+            if (local != null)
+                result.put("local_addressbook", local);
             for (Map.Entry<String, String> entry : map.entrySet()) {
                 if (!result.containsKey(entry.getKey()))
                     result.put(entry.getKey(), entry.getValue());

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

@@ -67,8 +67,8 @@ class Daemon {
      * Update the router and published address books using remote data from the
      * subscribed address books listed in subscriptions.
      * 
-     * @param master
-     *            The master AddressBook. This address book is never
+     * @param local
+     *            The local AddressBook. This address book is never
      *            overwritten, so it is safe for the user to write to.
      *            It is only merged to the published addressbook.
      *            May be null.
@@ -77,7 +77,7 @@ class Daemon {
      *            client applications.
      * @param published
      *            The published AddressBook. This address book is published on
-     *            the user's eepsite so that others may subscribe to it.
+     *            the user's I2P Site so that others may subscribe to it.
      *            May be null.
      *            If non-null, overwrite with the new addressbook.
      * @param subscriptions
@@ -87,7 +87,7 @@ class Daemon {
      *            The log to write changes and conflicts to.
      *            May be null.
      */
-    public static void update(AddressBook master, AddressBook router,
+    public static void update(AddressBook local, AddressBook router,
             File published, SubscriptionList subscriptions, Log log) {
         for (AddressBook book : subscriptions) {
             // yes, the EepGet fetch() is done in next()
@@ -95,8 +95,8 @@ class Daemon {
         }
         router.write();
         if (published != null) {
-            if (master != null)
-                router.merge(master, true, null);
+            if (local != null)
+                router.merge(local, true, null);
             router.write(published);
         }
         subscriptions.write();
@@ -105,13 +105,13 @@ class Daemon {
     /**
      * Update the router and published address books using remote data from the
      * subscribed address books listed in subscriptions.
-     * Merging of the "master" addressbook is NOT supported.
+     * Merging of the "local" addressbook is NOT supported.
      * 
      * @param router
      *            The NamingService to update, generally the root NamingService from the context.
      * @param published
      *            The published AddressBook. This address book is published on
-     *            the user's eepsite so that others may subscribe to it.
+     *            the user's I2P Site so that others may subscribe to it.
      *            May be null.
      *            If non-null, overwrite with the new addressbook.
      * @param subscriptions
@@ -697,7 +697,7 @@ class Daemon {
             StringBuilder buf = new StringBuilder(16);
             final int sz = dests.size();
             for (int i = 0; i < sz; i++) {
-                buf.append(dests.get(i).toBase64().substring(0, 6));
+                buf.append(dests.get(i).toBase64(), 0, 6);
                 if (i != sz - 1)
                     buf.append(", ");
             }
@@ -751,17 +751,17 @@ class Daemon {
         if (Boolean.parseBoolean(settings.get("update_direct"))) {
             // Direct hosts.txt access
             File routerFile = new File(home, settings.get("router_addressbook"));
-            AddressBook master;
+            AddressBook local;
             if (should_publish) {
-                File masterFile = new File(home, settings.get("master_addressbook"));
-                master = new AddressBook(masterFile);
+                File localFile = new File(home, settings.get("local_addressbook"));
+                local = new AddressBook(localFile);
             } else {
-                master = null;
+                local = null;
             }
             AddressBook router = new AddressBook(routerFile);
-            update(master, router, published, subscriptions, log);
+            update(local, router, published, subscriptions, log);
         } else {
-            // Naming service - no merging of master to router and published is supported.
+            // Naming service - no merging of local to router and published is supported.
             update(getNamingService(settings.get("naming_service")), published, subscriptions, log);
         }
     }
@@ -841,7 +841,7 @@ class Daemon {
         Map<String, String> defaultSettings = new HashMap<String, String>();
         defaultSettings.put("proxy_host", "127.0.0.1");
         defaultSettings.put("proxy_port", "4444");
-        defaultSettings.put("master_addressbook", "../userhosts.txt");
+        defaultSettings.put("local_addressbook", "../userhosts.txt");
         defaultSettings.put("router_addressbook", "../hosts.txt");
         defaultSettings.put("published_addressbook", "../eepsite/docroot/hosts.txt");
         defaultSettings.put("should_publish", "false");
@@ -868,7 +868,7 @@ class Daemon {
         // wait
         try {
             Thread.sleep(5*60*1000 + I2PAppContext.getGlobalContext().random().nextLong(5*60*1000));
-	    // Static method, and redundent Thread.currentThread().sleep(5*60*1000);
+	    // Static method, and redundant Thread.currentThread().sleep(5*60*1000);
         } catch (InterruptedException ie) {}
         
         while (_running) {

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

@@ -17,6 +17,7 @@ import java.util.Properties;
 
 import net.i2p.client.naming.HostTxtEntry;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
 import net.i2p.util.SecureFile;
 import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.SystemVersion;
@@ -25,9 +26,9 @@ import net.i2p.util.SystemVersion;
  * Utility class providing methods to parse and write files in a hosts.txt file
  * format, and subscription file format.
  * 
- * @since 0.9.26 modified from ConfigParser
+ * @since 0.9.26 modified from ConfigParser, public since 0.9.55 for CLI
  */
-class HostTxtParser {
+public class HostTxtParser {
 
     private static final boolean isWindows = SystemVersion.isWindows();
 
@@ -255,8 +256,23 @@ class HostTxtParser {
             System.exit(2);
         }
         if (!e.hasValidSig()) {
-            if (!quiet)
-                System.err.println("Bad signature");
+            if (!quiet) {
+                System.err.println("Bad signature for " + e.getName());
+                String dest = e.getDest();
+                try {
+                    Destination d = new Destination(dest);
+                    System.err.println(dest);
+                    System.err.println(d.toString());
+                } catch (Exception ex) {
+                    System.err.println("Invalid destination: " + dest);
+                }
+                Properties p = e.getProps();
+                if (p != null) {
+                    for (Map.Entry<?,?> m : p.entrySet()) {
+                        System.err.println(m.getKey() + "=" + m.getValue());
+                    }
+                }
+            }
             System.exit(3);
         }
         Properties p = e.getProps();
@@ -266,14 +282,30 @@ class HostTxtParser {
                 p.containsKey(HostTxtEntry.PROP_OLDNAME) ||
                 p.containsKey(HostTxtEntry.PROP_OLDSIG)) {
                 if (!e.hasValidSig()) {
-                    if (!quiet)
-                        System.err.println("Bad inner signature");
+                    if (!quiet) {
+                        System.err.println("Bad inner signature for " + e.getName());
+                        for (Map.Entry<?,?> m : p.entrySet()) {
+                            System.err.println(m.getKey() + "=" + m.getValue());
+                        }
+                    }
                     System.exit(4);
                 }
             }
         }
-        if (!quiet)
+        if (!quiet) {
             System.err.println("Good signature for " + e.getName());
+            try {
+                String dest = e.getDest();
+                Destination d = new Destination(dest);
+                System.err.println(dest);
+                System.err.println(d.toString());
+            } catch (Exception ex) {}
+            if (p != null) {
+                for (Map.Entry<?,?> m : p.entrySet()) {
+                    System.err.println(m.getKey() + "=" + m.getValue());
+                }
+            }
+        }
         System.exit(0);
     }
 

apps/addressbook/java/src/net/i2p/router/naming/BlockfileNamingService.java

@@ -98,7 +98,7 @@ import net.metanotion.util.skiplist.SkipList;
  *
  * </pre>
  *
- * All host names are converted to lower case.
+ * All hostnames are converted to lower case.
  *
  * @since 0.8.7, moved from core to addressbook in 0.9.31
  */
@@ -138,9 +138,11 @@ public class BlockfileNamingService extends DummyNamingService {
     private static final String VERSION = "4";
 
     private static final String PROP_ADDED = "a";
-    private static final String PROP_MODDED = "m";
+    // See susidns
+    //private static final String PROP_MODDED = "m";
     private static final String PROP_SOURCE = "s";
-    private static final String PROP_VALIDATED = "v";
+    // See susidns
+    //private static final String PROP_VALIDATED = "v";
     
     private static final String DUMMY = "";
     private static final int NEGATIVE_CACHE_SIZE = 32;
@@ -1395,6 +1397,11 @@ public class BlockfileNamingService extends DummyNamingService {
                             p = de.propsList.get(i);
                             d = de.destList.get(i);
                         }
+                        out.write("# ");
+                        out.write(key);
+                        out.write(": ");
+                        out.write(d.toBase32());
+                        out.write(nl);
                         out.write(key);
                         out.write('=');
                         out.write(d.toBase64());
@@ -1424,6 +1431,8 @@ public class BlockfileNamingService extends DummyNamingService {
     }
 
     /**
+     * Broken prior to 0.9.62, would only return one name.
+     *
      * @param options If non-null and contains the key "list", get
      *                from that list (default "hosts.txt", NOT all lists)
      *                Key "skip": skip that many entries
@@ -1495,6 +1504,7 @@ public class BlockfileNamingService extends DummyNamingService {
                             break;
                         }
                     }
+                    iter.next();
                     if (search != null && key.indexOf(search) < 0)
                         continue;
                     rv.add(key);
@@ -2062,9 +2072,8 @@ public class BlockfileNamingService extends DummyNamingService {
             }
             if (baos.size() > 65535)
                 throw new DataFormatException("Properties too big (65535 max): " + baos.size());
-            byte propBytes[] = baos.toByteArray();
-            DataHelper.writeLong(rawStream, 2, propBytes.length);
-            rawStream.write(propBytes);
+            DataHelper.writeLong(rawStream, 2, baos.size());
+            baos.writeTo(rawStream);
         } else {
             DataHelper.writeLong(rawStream, 2, 0);
         }

apps/addressbook/java/src/net/i2p/router/naming/package.html

@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+The BlockfileNamingService based on the Metanotion BlockFile Database.
+This is the default NamingService for the router.
+</p>
+</body>
+</html>

apps/addressbook/java/src/net/metanotion/package.html

@@ -19,7 +19,7 @@ the API may be subject to change.
 Contact I2P developers if you are considering use in another application.
 Following is the original documentation copied from metanotion website.
 </p>
-		<h1>Metanotion BlockFile Database</h1>
+		<h2>Metanotion BlockFile Database</h2>
 		<p>A 100% Java 1.3, BSD Licensed, embeddable single file database engine in 32KB. This database was designed for PDA based and J2ME applications.</p>
 
 		<h2>Table of Contents</h2>
@@ -32,18 +32,18 @@ Following is the original documentation copied from metanotion website.
 			<li><a href="#download">Download</a></li>
 		</ul>
 		
-		<a name="features"><h2>Features</h2></a>
+		<h2 id="features">Features</h2>
 		<ul>
 			<li>100% Java 1.3. No JNI.</li>
 			<li>Will work with any "file" as long as you can approximate something like <a href="http://java.sun.com/j2se/1.3/docs/api/java/io/RandomAccessFile.html">java.io.RandomAccessFile</a>, you can use this.</li>
-			<li>BSD Licensed. Yes, this means you can use it for free in a commercial project. However, if you base some really cool mobile technology startup on this code we'll gladly accept stock options...</p>
+			<li>BSD Licensed. Yes, this means you can use it for free in a commercial project. However, if you base some really cool mobile technology startup on this code we'll gladly accept stock options...</li>
 			<li>No dependence on file API's(useful for mobile apps)</li>
 			<li>Small. 32KB in a JAR file. &lt;2000 lines of code.</li>
 			<li>Reasonably fast. This is used in an app running on a sub 200MHz StrongARM PocketPC, and quite handily deals with 70,000 records. The load time is a little slow, but its been tested with a <a href="http://java.sun.com/javame/reference/apis.jsp">CDC 1.0/Personal Profile</a> device.
 			</li>
 		</ul>
 
-		<a name="unfeatures"><h2>Unfeatures</h2></a>
+		<h2 id="unfeatures">Unfeatures</h2>
 		<p>A good, ACID database is a nice thing to work with. Unfortunately, in the goal to make this small, fast, and work with minimal dependencies, something had to give. So I list things which this database will likely never have. Of course, since it is BSD Licensed, patches welcome...</p>
 		
 		<ul>
@@ -53,11 +53,11 @@ Following is the original documentation copied from metanotion website.
 			<li>No use of reflection or automagical serialization tricks.</li>
 		</ul>
 
-		<a name="future"><h2>Future Plans</h2></a>
+		<h2 id="future">Future Plans</h2>
 		<p>There are still bugs(none known...). The app that this was written for is still in testing, but we should most of the issues sorted by the time we deploy it in a few weeks(early November, 2006). Some loading speed issues on large record sets, and memory usage could still be improved. All this and feedback from other uses will direct this products evolution.</p>
 		<p>What is currently up here is not "1.0" code, but we will release a labeled "1.0" version once we feel happy with the state of the codebase.</p>
 	
-		<a name="design"><h2>What KIND of database is this?</h2></a>
+		<h2 id="design">What KIND of database is this?</h2>
 		<p>You probably store at least part of your application data in memory in a class from the <a href="http://java.sun.com/j2se/1.4.2/docs/guide/collections/">Java Collections Framework</a>. The BlockFile database stores data in a <a href="http://en.wikipedia.org/wiki/Skip_list">Skip</a> <a href="http://eternallyconfuzzled.com/tuts/skip.html">List</a> that almost implements <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/SortedMap.html">java.util.SortedMap</a>. You can create and store as many named(with a string) SkipList in the database as you want.</p>
 		<p>To serialize your data, you have to either extend our SerialStreams class or implement our Serializer interface. We could have done something cool and fancy with reflection(and other cool stuff with Java 1.5), but that would probably not do the Right Thing&trade; most of the time.  As you can see, there's not a lot to it anyway:</p>
 		<h3>net.metanotion.io.SerialStreams</h3>
@@ -91,9 +91,8 @@ public class SkipList {
 	public ListIterator find(Comparable key) ...
 }
 </pre>
-</p>
 
-		<a name="examples"><h2>Examples</h2></a>
+		<h2 id="examples">Examples</h2>
 		<p>Better documentation is forthcoming, but there really isn't much to know. The entire public interface to the library is on this page. Where possible, it sticks to idiomatic Java and standard interfaces.</p>
 		<ul>
 			<li>Open a database:
@@ -146,8 +145,8 @@ public class BlockFile implements Closeable {
 		
 		<p>So, in other words, if you can provide an implementation of this interface, you can use the BlockFile database. This frees it from dependence on the RandomAccessFile class. If you don't see why this is useful and you're going to be using "files" on PDA's and phone's, well, you'll understand soon enough...</p>
 
-		<a name="download"><h2>Download</h2></a>
-		<h3>Bugfix and cleanup Release 10/6/2006</h2>
+		<h2 id="download">Download</h2>
+		<h3>Bugfix and cleanup Release 10/6/2006</h3>
 		<p>An unnecessary class was removed, some junk methods removed, and a couple of JDK compatability issues were fixed. The StringBytes class was switched to ASCII(from UTF-8) for better compatibility.</p>
 		<ul>
 			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.2006.10.06.jar">BlockFile binary JAR, version 0.1.1</a></li>
@@ -160,7 +159,7 @@ public class BlockFile implements Closeable {
 			<li><a href="http://www.metanotion.net/software/sandbox/BlockFile.src.2006.09.28.zip">BlockFile source code</a></li>
 		</ul>
 
-		<hr />
-		<center>&copy; 2006 <a href="http://www.metanotion.net/">Metanotion Software</a></center>
+		<hr>
+		<p>&copy; 2006 <a href="http://www.metanotion.net/">Metanotion Software</a></p>
 	</body>
 </html>

apps/addressbook/myhosts.txt

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

apps/addressbook/subscriptions.txt

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

apps/desktopgui/build.gradle

@@ -2,6 +2,7 @@ sourceSets {
     main {
         java {
             srcDir 'src'
+            srcDir 'build/messages-src'
         }
     }
 }
@@ -12,3 +13,14 @@ dependencies {
     compile project(':installer')
     compile project(':apps:systray')
 }
+
+// Create the java files from the po files. The jar task will compile them.
+// This requires gettext 0.19 or higher.
+// We don't support the "slow way"
+task bundle {
+    doLast {
+        if (!(new File("$buildDir/classes/java/main/net/i2p/desktopgui/messages_de.class")).exists())
+            println "apps/desktopgui/bundle-messages.sh".execute().text
+    }
+}
+jar.dependsOn bundle

apps/desktopgui/build.xml

@@ -7,8 +7,10 @@
 	<property name="jar" value="desktopgui.jar"/>
 	<property name="javadoc" value="javadoc"/>
 	<property name="javac.compilerargs" value=""/>
-	<property name="javac.version" value="1.7" />
+	<property name="javac.version" value="1.8" />
+	<property name="javac.release" value="8" />
 	<property name="require.gettext" value="true" />
+	<property name="manifest.classpath.name" value="Class-Path" />
 
     <condition property="no.bundle">
         <isfalse value="${require.gettext}" />
@@ -27,7 +29,9 @@
 
         <target name="compile" depends="init">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+                       release="${javac.release}"
                        includeAntRuntime="false"
+                       encoding="UTF-8"
                        srcdir="${src}" destdir="${build}">
                 <compilerarg line="${javac.compilerargs}" />
                 <classpath>
@@ -51,36 +55,48 @@
                 <arg value="./bundle-messages.sh" />
             </exec>
             <javac source="${javac.version}" target="${javac.version}" 
+                   release="${javac.release}"
                    includeAntRuntime="false"
+                   encoding="UTF-8"
                    srcdir="${build}/messages-src" destdir="${build}">
                 <compilerarg line="${javac.compilerargs}" />
             </javac>
         </target>
 
         <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
-        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
-            <arg value="list" />
-            <arg value="changed" />
-            <arg value="." />
-        </exec>
-        <!-- \n in an attribute value generates an invalid manifest -->
-        <exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
-            <arg value="-s" />
-            <arg value="[:space:]" />
-            <arg value="," />
-        </exec>
+            <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
+                <arg value="status" />
+                <arg value="-s" />
+                <arg value="--porcelain" />
+                <arg value="-uno" />
+                <arg value="." />
+            </exec>
+            <!-- trim flags -->
+            <exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
+                <arg value="-e" />
+                <arg value="s/^[MTADRCU ]*//" />
+            </exec>
+            <!-- \n in an attribute value generates an invalid manifest -->
+            <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
+                <arg value="-s" />
+                <arg value="[:space:]" />
+                <arg value="," />
+            </exec>
 	</target>
 
 	<target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
 		<!-- set if unset -->
 		<property name="workspace.changes.tr" value="" />
                 <!-- ideal for linux: 24x24, but transparency doesn't work -->
-                <copy tofile="${build}/desktopgui/resources/images/logo.png" file="../../installer/resources/themes/console/images/itoopie_xsm.png" />
+                <copy tofile="${build}/desktopgui/resources/images/logo.png" file="../../apps/routerconsole/jsp/themes/console/images/itoopie_xsm.png" />
                 <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_black_24.png" />
                 <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_white_24.png" />
 		<jar basedir="${build}" excludes="messages-src/**" destfile="${dist}/${jar}">
 			<manifest>
 				<attribute name="Main-Class" value="net.i2p.desktopgui.Main"/>
+				<attribute name="${manifest.classpath.name}" value="i2p.jar router.jar" />
+				<attribute name="Implementation-Version" value="${full.version}" />
+				<attribute name="Built-By" value="${build.built-by}" />
 				<attribute name="Build-Date" value="${build.timestamp}" />
 				<attribute name="Base-Revision" value="${workspace.version}" />
 				<attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
@@ -99,7 +115,7 @@
                 <not>
                     <isset property="jar.uptodate" />
                 </not>
-                <isset property="mtn.available" />
+                <isset property="git.available" />
             </and>
         </condition>
     </target>

apps/desktopgui/bundle-messages.sh

@@ -11,6 +11,7 @@
 # zzz - public domain
 # Mathiasdm - modifications for desktopgui
 #
+cd `dirname $0`
 CLASS=net.i2p.desktopgui.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
@@ -105,12 +106,12 @@ do
         # only generate for non-source language
         echo "Generating ${CLASS}_$LG ResourceBundle..."
 
-        msgfmt -V | grep -q '0\.19'
+        msgfmt -V | grep -q -E ' 0\.((19)|[2-9])'
         if [ $? -ne 0 ]
         then
             # slow way
             # convert to class files in build
-            msgfmt --java --statistics -r $CLASS -l $LG -d build $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -128,7 +129,7 @@ do
             TDY=$TD2/net/i2p/desktopgui
             rm -rf $TD
             mkdir -p $TD $TDY
-            msgfmt --java --statistics --source -r $CLASS -l $LG -d $TD $i
+            msgfmt --java2 --statistics --source -r $CLASS -l $LG -d $TD $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"

apps/desktopgui/locale/messages_bg.po

@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2017-09-20 20:31+0000\n"
-"Last-Translator: Vitaly Zdorovenko <stenliterziev@gmail.com>\n"
+"POT-Creation-Date: 2022-02-09 19:13+0000\n"
+"PO-Revision-Date: 2022-02-09 19:23+0000\n"
+"Last-Translator: zzzi2p\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/I2P/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,69 +27,81 @@ msgstr "Стартиране на I2P"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "I2P is starting!"
 msgstr "I2P е стартиран!"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "Starting"
 msgstr "Стартиране"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:55
-#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+#: src/net/i2p/desktopgui/InternalTrayManager.java:65
+#: src/net/i2p/desktopgui/InternalTrayManager.java:249
 msgid "Launch I2P Browser"
 msgstr "Стартиране на I2P Браузер"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:76
-#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+#: src/net/i2p/desktopgui/InternalTrayManager.java:86
+#: src/net/i2p/desktopgui/InternalTrayManager.java:270
 msgid "Configure I2P System Tray"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:77
-#: src/net/i2p/desktopgui/InternalTrayManager.java:229
-msgid "Disable"
-msgstr "Деактивиране"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:87
+#: src/net/i2p/desktopgui/InternalTrayManager.java:271
+msgid "Enable notifications"
+msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:93
-#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+#: src/net/i2p/desktopgui/InternalTrayManager.java:101
+#: src/net/i2p/desktopgui/InternalTrayManager.java:285
+msgid "Disable notifications"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:115
+#: src/net/i2p/desktopgui/InternalTrayManager.java:299
+msgid "Disable system tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:131
+#: src/net/i2p/desktopgui/InternalTrayManager.java:315
 msgid "Restart I2P"
 msgstr "Рестартиране на I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:110
-#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+#: src/net/i2p/desktopgui/InternalTrayManager.java:148
+#: src/net/i2p/desktopgui/InternalTrayManager.java:332
 msgid "Stop I2P"
 msgstr "Спиране на I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:126
-#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+#: src/net/i2p/desktopgui/InternalTrayManager.java:164
+#: src/net/i2p/desktopgui/InternalTrayManager.java:348
 msgid "Restart I2P Immediately"
 msgstr "Рестартирайте Незабавно"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:143
-#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+#: src/net/i2p/desktopgui/InternalTrayManager.java:181
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
 msgid "Stop I2P Immediately"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:157
-#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+#: src/net/i2p/desktopgui/InternalTrayManager.java:195
+#: src/net/i2p/desktopgui/InternalTrayManager.java:379
 msgid "Cancel I2P Shutdown"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#: src/net/i2p/desktopgui/InternalTrayManager.java:437
 #, java-format
 msgid "Shutdown in {0}"
 msgstr "Изключване в {0}"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+#: src/net/i2p/desktopgui/InternalTrayManager.java:439
 msgid "Shutdown imminent"
 msgstr ""
 
 #. status translations are in the console bundle
-#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+#: src/net/i2p/desktopgui/InternalTrayManager.java:444
 msgid "Network"
-msgstr ""
+msgstr "Мрежа"
 
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
-#: src/net/i2p/desktopgui/TrayManager.java:63
+#: src/net/i2p/desktopgui/TrayManager.java:73
 msgid "I2P: Right-click for menu"
 msgstr ""

apps/desktopgui/locale/messages_cs.po

@@ -4,19 +4,21 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
+# slrslr, 2022
+# slrslr, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2017-06-30 21:32+0000\n"
-"Last-Translator: zzzi2p\n"
+"POT-Creation-Date: 2022-02-09 19:13+0000\n"
+"PO-Revision-Date: 2011-02-13 12:05+0000\n"
+"Last-Translator: slrslr, 2022\n"
 "Language-Team: Czech (http://www.transifex.com/otf/I2P/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:31
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:59
@@ -25,69 +27,81 @@ msgstr "Spustit I2P"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "I2P is starting!"
 msgstr "I2P startuje!"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "Starting"
 msgstr "Startuji"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:55
-#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+#: src/net/i2p/desktopgui/InternalTrayManager.java:65
+#: src/net/i2p/desktopgui/InternalTrayManager.java:249
 msgid "Launch I2P Browser"
 msgstr "Spouštím I2P Browser"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:76
-#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+#: src/net/i2p/desktopgui/InternalTrayManager.java:86
+#: src/net/i2p/desktopgui/InternalTrayManager.java:270
 msgid "Configure I2P System Tray"
-msgstr ""
+msgstr "Nastavit I2P Systémovou Lištu"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:77
-#: src/net/i2p/desktopgui/InternalTrayManager.java:229
-msgid "Disable"
-msgstr ""
+#: src/net/i2p/desktopgui/InternalTrayManager.java:87
+#: src/net/i2p/desktopgui/InternalTrayManager.java:271
+msgid "Enable notifications"
+msgstr "Zapnout upozornění"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:93
-#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+#: src/net/i2p/desktopgui/InternalTrayManager.java:101
+#: src/net/i2p/desktopgui/InternalTrayManager.java:285
+msgid "Disable notifications"
+msgstr "Vypnout upozornění"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:115
+#: src/net/i2p/desktopgui/InternalTrayManager.java:299
+msgid "Disable system tray"
+msgstr "Vypnout ikonu systémové lišty"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:131
+#: src/net/i2p/desktopgui/InternalTrayManager.java:315
 msgid "Restart I2P"
 msgstr "Restart I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:110
-#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+#: src/net/i2p/desktopgui/InternalTrayManager.java:148
+#: src/net/i2p/desktopgui/InternalTrayManager.java:332
 msgid "Stop I2P"
 msgstr "Zastavit I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:126
-#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+#: src/net/i2p/desktopgui/InternalTrayManager.java:164
+#: src/net/i2p/desktopgui/InternalTrayManager.java:348
 msgid "Restart I2P Immediately"
-msgstr ""
+msgstr "Restartovat I2P Hned"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:143
-#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+#: src/net/i2p/desktopgui/InternalTrayManager.java:181
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
 msgid "Stop I2P Immediately"
-msgstr ""
+msgstr "Zastavit I2P Hned"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:157
-#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+#: src/net/i2p/desktopgui/InternalTrayManager.java:195
+#: src/net/i2p/desktopgui/InternalTrayManager.java:379
 msgid "Cancel I2P Shutdown"
-msgstr ""
+msgstr "Zrušit I2P Zastavení"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#: src/net/i2p/desktopgui/InternalTrayManager.java:437
 #, java-format
 msgid "Shutdown in {0}"
-msgstr ""
+msgstr "Zastavení za {0}"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+#: src/net/i2p/desktopgui/InternalTrayManager.java:439
 msgid "Shutdown imminent"
-msgstr ""
+msgstr "Vypínání"
 
 #. status translations are in the console bundle
-#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+#: src/net/i2p/desktopgui/InternalTrayManager.java:444
 msgid "Network"
 msgstr "Síť"
 
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
-#: src/net/i2p/desktopgui/TrayManager.java:63
+#: src/net/i2p/desktopgui/TrayManager.java:73
 msgid "I2P: Right-click for menu"
-msgstr ""
+msgstr "I2P: Pravé-kliknutí pro menu"

apps/desktopgui/locale/messages_de.po

@@ -7,14 +7,15 @@
 # blabla <blabla@trash-mail.com>, 2011
 # Ettore Atalan <atalanttore@googlemail.com>, 2016
 # foo <foo@bar>, 2009
+# Georg Stadler, 2022
 # Lars Schimmer <echelon@i2pmail.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2017-06-30 21:32+0000\n"
-"Last-Translator: Lars Schimmer <echelon@i2pmail.org>\n"
+"POT-Creation-Date: 2022-02-09 19:13+0000\n"
+"PO-Revision-Date: 2011-02-13 12:05+0000\n"
+"Last-Translator: Georg Stadler, 2022\n"
 "Language-Team: German (http://www.transifex.com/otf/I2P/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,69 +30,81 @@ msgstr "I2P starten"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "I2P is starting!"
 msgstr "I2P startet gerade!"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "Starting"
 msgstr "Startend"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:55
-#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+#: src/net/i2p/desktopgui/InternalTrayManager.java:65
+#: src/net/i2p/desktopgui/InternalTrayManager.java:249
 msgid "Launch I2P Browser"
 msgstr "I2P-Browser öffnen"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:76
-#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+#: src/net/i2p/desktopgui/InternalTrayManager.java:86
+#: src/net/i2p/desktopgui/InternalTrayManager.java:270
 msgid "Configure I2P System Tray"
 msgstr "I2P System Tray konfigurieren"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:77
-#: src/net/i2p/desktopgui/InternalTrayManager.java:229
-msgid "Disable"
-msgstr "Deaktivieren"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:87
+#: src/net/i2p/desktopgui/InternalTrayManager.java:271
+msgid "Enable notifications"
+msgstr "Benachrichtigungen aktivieren"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:93
-#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+#: src/net/i2p/desktopgui/InternalTrayManager.java:101
+#: src/net/i2p/desktopgui/InternalTrayManager.java:285
+msgid "Disable notifications"
+msgstr "Benachrichtigungen deaktivieren"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:115
+#: src/net/i2p/desktopgui/InternalTrayManager.java:299
+msgid "Disable system tray"
+msgstr ""
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:131
+#: src/net/i2p/desktopgui/InternalTrayManager.java:315
 msgid "Restart I2P"
 msgstr "I2P neustarten"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:110
-#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+#: src/net/i2p/desktopgui/InternalTrayManager.java:148
+#: src/net/i2p/desktopgui/InternalTrayManager.java:332
 msgid "Stop I2P"
 msgstr "I2P beenden"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:126
-#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+#: src/net/i2p/desktopgui/InternalTrayManager.java:164
+#: src/net/i2p/desktopgui/InternalTrayManager.java:348
 msgid "Restart I2P Immediately"
 msgstr "I2P sofort neustarten"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:143
-#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+#: src/net/i2p/desktopgui/InternalTrayManager.java:181
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
 msgid "Stop I2P Immediately"
 msgstr "I2P sofort beenden"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:157
-#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+#: src/net/i2p/desktopgui/InternalTrayManager.java:195
+#: src/net/i2p/desktopgui/InternalTrayManager.java:379
 msgid "Cancel I2P Shutdown"
 msgstr "Herunterfahren von I2P abbrechen"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#: src/net/i2p/desktopgui/InternalTrayManager.java:437
 #, java-format
 msgid "Shutdown in {0}"
 msgstr "Herunterfahren in {0}"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+#: src/net/i2p/desktopgui/InternalTrayManager.java:439
 msgid "Shutdown imminent"
 msgstr "Herunterfahren bevorstehend"
 
 #. status translations are in the console bundle
-#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+#: src/net/i2p/desktopgui/InternalTrayManager.java:444
 msgid "Network"
 msgstr "Netzwerk"
 
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
-#: src/net/i2p/desktopgui/TrayManager.java:63
+#: src/net/i2p/desktopgui/TrayManager.java:73
 msgid "I2P: Right-click for menu"
 msgstr "I2P: Rechtsklick für Menü"

apps/desktopgui/locale/messages_en.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P desktopgui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-25 12:29+0000\n"
+"POT-Creation-Date: 2023-03-06 14:52+0000\n"
 "PO-Revision-Date: 2010-06-15 14:09+0100\n"
 "Last-Translator: duck <duck@mail.i2p>\n"
 "Language-Team: duck <duck@mail.i2p>\n"
@@ -19,75 +19,84 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:31
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
 msgid "Start I2P"
 msgstr ""
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "I2P is starting!"
 msgstr ""
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
-#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "Starting"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:55
-#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+#: src/net/i2p/desktopgui/InternalTrayManager.java:65
+#: src/net/i2p/desktopgui/InternalTrayManager.java:221
 msgid "Launch I2P Browser"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:76
-#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+#: src/net/i2p/desktopgui/InternalTrayManager.java:86
+#: src/net/i2p/desktopgui/InternalTrayManager.java:242
 msgid "Configure I2P System Tray"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:77
-#: src/net/i2p/desktopgui/InternalTrayManager.java:229
-msgid "Disable"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:88
+#: src/net/i2p/desktopgui/InternalTrayManager.java:244
+msgid "Disable system tray"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:93
-#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+#: src/net/i2p/desktopgui/InternalTrayManager.java:104
+#: src/net/i2p/desktopgui/InternalTrayManager.java:260
 msgid "Restart I2P"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:110
-#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+#: src/net/i2p/desktopgui/InternalTrayManager.java:121
+#: src/net/i2p/desktopgui/InternalTrayManager.java:277
 msgid "Stop I2P"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:126
-#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+#: src/net/i2p/desktopgui/InternalTrayManager.java:137
+#: src/net/i2p/desktopgui/InternalTrayManager.java:293
 msgid "Restart I2P Immediately"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:143
-#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+#: src/net/i2p/desktopgui/InternalTrayManager.java:154
+#: src/net/i2p/desktopgui/InternalTrayManager.java:310
 msgid "Stop I2P Immediately"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:157
-#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+#: src/net/i2p/desktopgui/InternalTrayManager.java:168
+#: src/net/i2p/desktopgui/InternalTrayManager.java:324
 msgid "Cancel I2P Shutdown"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#: src/net/i2p/desktopgui/InternalTrayManager.java:381
 #, java-format
 msgid "Shutdown in {0}"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+#: src/net/i2p/desktopgui/InternalTrayManager.java:383
 msgid "Shutdown imminent"
 msgstr ""
 
 #. status translations are in the console bundle
-#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+#: src/net/i2p/desktopgui/InternalTrayManager.java:388
 msgid "Network"
 msgstr ""
 
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
-#: src/net/i2p/desktopgui/TrayManager.java:63
+#: src/net/i2p/desktopgui/TrayManager.java:75
 msgid "I2P: Right-click for menu"
 msgstr ""
+
+#: src/net/i2p/desktopgui/TrayManager.java:310
+#: src/net/i2p/desktopgui/TrayManager.java:347
+msgid "Enable notifications"
+msgstr ""
+
+#: src/net/i2p/desktopgui/TrayManager.java:325
+#: src/net/i2p/desktopgui/TrayManager.java:362
+msgid "Disable notifications"
+msgstr ""

apps/desktopgui/locale/messages_es.po

@@ -6,21 +6,22 @@
 # Translators:
 # ducki2p <ducki2p@gmail.com>, 2011
 # foo <foo@bar>, 2009
-# punkibastardo <punkibastardo@gmail.com>, 2011
+# Juan Jaramillo <juanda097@protonmail.ch>, 2022
+# punkibastardo <transifex.symons@slmail.me>, 2011
 # strel, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2017-06-30 21:32+0000\n"
-"Last-Translator: strel\n"
+"POT-Creation-Date: 2022-02-09 19:13+0000\n"
+"PO-Revision-Date: 2011-02-13 12:05+0000\n"
+"Last-Translator: Juan Jaramillo <juanda097@protonmail.ch>, 2022\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/I2P/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:31
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:59
@@ -29,69 +30,81 @@ msgstr "Iniciar I2P"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "I2P is starting!"
 msgstr "I2P está iniciando!"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
 msgid "Starting"
 msgstr "Iniciando"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:55
-#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+#: src/net/i2p/desktopgui/InternalTrayManager.java:65
+#: src/net/i2p/desktopgui/InternalTrayManager.java:249
 msgid "Launch I2P Browser"
 msgstr "Lanzar navegador I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:76
-#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+#: src/net/i2p/desktopgui/InternalTrayManager.java:86
+#: src/net/i2p/desktopgui/InternalTrayManager.java:270
 msgid "Configure I2P System Tray"
 msgstr "Configurar la bandeja de sistema de I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:77
-#: src/net/i2p/desktopgui/InternalTrayManager.java:229
-msgid "Disable"
-msgstr "Deshabilitar"
+#: src/net/i2p/desktopgui/InternalTrayManager.java:87
+#: src/net/i2p/desktopgui/InternalTrayManager.java:271
+msgid "Enable notifications"
+msgstr "Activar las notificaciones"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:93
-#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+#: src/net/i2p/desktopgui/InternalTrayManager.java:101
+#: src/net/i2p/desktopgui/InternalTrayManager.java:285
+msgid "Disable notifications"
+msgstr "Desactivar las notificaciones"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:115
+#: src/net/i2p/desktopgui/InternalTrayManager.java:299
+msgid "Disable system tray"
+msgstr "Desactivar la bandeja del sistema"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:131
+#: src/net/i2p/desktopgui/InternalTrayManager.java:315
 msgid "Restart I2P"
 msgstr "Reiniciar I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:110
-#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+#: src/net/i2p/desktopgui/InternalTrayManager.java:148
+#: src/net/i2p/desktopgui/InternalTrayManager.java:332
 msgid "Stop I2P"
 msgstr "Detener I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:126
-#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+#: src/net/i2p/desktopgui/InternalTrayManager.java:164
+#: src/net/i2p/desktopgui/InternalTrayManager.java:348
 msgid "Restart I2P Immediately"
 msgstr "Reiniciar I2P inmediatamente"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:143
-#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+#: src/net/i2p/desktopgui/InternalTrayManager.java:181
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
 msgid "Stop I2P Immediately"
 msgstr "Detener I2P inmediatamente"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:157
-#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+#: src/net/i2p/desktopgui/InternalTrayManager.java:195
+#: src/net/i2p/desktopgui/InternalTrayManager.java:379
 msgid "Cancel I2P Shutdown"
 msgstr "Cancelar el cierre de I2P"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#: src/net/i2p/desktopgui/InternalTrayManager.java:437
 #, java-format
 msgid "Shutdown in {0}"
 msgstr "Cierre en {0}"
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+#: src/net/i2p/desktopgui/InternalTrayManager.java:439
 msgid "Shutdown imminent"
 msgstr "Cierre inminente"
 
 #. status translations are in the console bundle
-#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+#: src/net/i2p/desktopgui/InternalTrayManager.java:444
 msgid "Network"
 msgstr "Red"
 
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
-#: src/net/i2p/desktopgui/TrayManager.java:63
+#: src/net/i2p/desktopgui/TrayManager.java:73
 msgid "I2P: Right-click for menu"
 msgstr "I2P: Clic secundario para menú"

apps/desktopgui/locale/messages_es_AR.po

@@ -0,0 +1,106 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the desktopgui package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# kaze kaze <kaze@rlab.be>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-02-09 19:13+0000\n"
+"PO-Revision-Date: 2011-02-13 12:05+0000\n"
+"Last-Translator: kaze kaze <kaze@rlab.be>, 2017\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/I2P/language/es_AR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_AR\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:31
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:59
+msgid "Start I2P"
+msgstr "Iniciando I2P..."
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+msgid "I2P is starting!"
+msgstr "I2P esta iniciando!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+msgid "Starting"
+msgstr "Iniciando"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:65
+#: src/net/i2p/desktopgui/InternalTrayManager.java:249
+msgid "Launch I2P Browser"
+msgstr "Lanzar el Navegador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:86
+#: src/net/i2p/desktopgui/InternalTrayManager.java:270
+msgid "Configure I2P System Tray"
+msgstr "Configurar la Bandeja de Sistema de I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:87
+#: src/net/i2p/desktopgui/InternalTrayManager.java:271
+msgid "Enable notifications"
+msgstr "Activar las notificaciones"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:101
+#: src/net/i2p/desktopgui/InternalTrayManager.java:285
+msgid "Disable notifications"
+msgstr "Desactivar las notificaciones"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:115
+#: src/net/i2p/desktopgui/InternalTrayManager.java:299
+msgid "Disable system tray"
+msgstr "Desactivar la bandeja del sistema"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:131
+#: src/net/i2p/desktopgui/InternalTrayManager.java:315
+msgid "Restart I2P"
+msgstr "Riniciar I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:148
+#: src/net/i2p/desktopgui/InternalTrayManager.java:332
+msgid "Stop I2P"
+msgstr "Detener I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:164
+#: src/net/i2p/desktopgui/InternalTrayManager.java:348
+msgid "Restart I2P Immediately"
+msgstr " Reiniciar I2P inmediatamente "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:181
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Stop I2P Immediately"
+msgstr " Detener I2P inmediatamente "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:195
+#: src/net/i2p/desktopgui/InternalTrayManager.java:379
+msgid "Cancel I2P Shutdown"
+msgstr "Cancelar el Apagado de I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:437
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Apagar en {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:439
+msgid "Shutdown imminent"
+msgstr "Apagado inminente"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:444
+msgid "Network"
+msgstr "Red"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:73
+msgid "I2P: Right-click for menu"
+msgstr "I2P Clic derecho para el menú"

apps/desktopgui/locale/messages_fa.po

@@ -6,19 +6,20 @@
 # Translators:
 # Amir H. Firouzian, 2017
 # NoProfile, 2016
+# Reza Ghasemi, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2018-01-05 02:54+0000\n"
-"Last-Translator: Amir H. Firouzian\n"
+"PO-Revision-Date: 2019-07-02 14:46+0000\n"
+"Last-Translator: Reza Ghasemi\n"
 "Language-Team: Persian (http://www.transifex.com/otf/I2P/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:31
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:59
@@ -53,7 +54,7 @@ msgstr "غیرفعال کن"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:93
 #: src/net/i2p/desktopgui/InternalTrayManager.java:245
 msgid "Restart I2P"
-msgstr ""
+msgstr "راه اندازی مجدد I2P"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:110
 #: src/net/i2p/desktopgui/InternalTrayManager.java:262
@@ -63,17 +64,17 @@ msgstr "توقف I2P"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:126
 #: src/net/i2p/desktopgui/InternalTrayManager.java:278
 msgid "Restart I2P Immediately"
-msgstr ""
+msgstr "راه اندازی مجدد I2P بلافاصله"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:143
 #: src/net/i2p/desktopgui/InternalTrayManager.java:295
 msgid "Stop I2P Immediately"
-msgstr ""
+msgstr "توقف I2P بلافاصله"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:157
 #: src/net/i2p/desktopgui/InternalTrayManager.java:309
 msgid "Cancel I2P Shutdown"
-msgstr ""
+msgstr "لغو خاموش کردن I2P"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:363
 #, java-format
@@ -87,7 +88,7 @@ msgstr ""
 #. status translations are in the console bundle
 #: src/net/i2p/desktopgui/InternalTrayManager.java:370
 msgid "Network"
-msgstr ""
+msgstr "شبکه"
 
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
 #: src/net/i2p/desktopgui/TrayManager.java:63