backport ShellService fix

which causes gettext to add a java-printf-format directive,
then the testscript fails if the translated
string doesn't have a '%' in it; strip out the directive
Bump for review

.dockerignore

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

.gitignore

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

.gitlab-ci.yml

@@ -0,0 +1,102 @@
+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
+    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:19.03.12
+    services:
+        - docker:19.03.12-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/
+        - 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,39 +1,18 @@
 language: java
-dist: trusty
+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
@@ -45,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

@@ -50,6 +50,7 @@ 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
@@ -87,6 +88,7 @@ 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
@@ -94,7 +96,9 @@ 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
@@ -122,6 +126,7 @@ 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
@@ -129,7 +134,9 @@ 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
@@ -185,11 +192,13 @@ trans.fr = apps/routerconsole/locale-news/messages_fr.po
 trans.gl = apps/routerconsole/locale-news/messages_gl.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
@@ -199,9 +208,11 @@ 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
@@ -235,6 +246,7 @@ 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
@@ -247,6 +259,7 @@ trans.sk = apps/routerconsole/locale-countries/messages_sk.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
@@ -330,6 +343,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
@@ -340,6 +354,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
@@ -352,8 +367,9 @@ trans.sk = apps/desktopgui/locale/messages_sk.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
@@ -428,6 +444,7 @@ trans.ru_RU = debian/po/ru.po
 trans.sk = debian/po/sk.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
@@ -494,6 +511,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
@@ -502,6 +520,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
@@ -535,7 +554,9 @@ 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
@@ -554,6 +575,7 @@ trans.de = installer/resources/locale-man/man_de.po
 trans.es = installer/resources/locale-man/man_es.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.ko = installer/resources/locale-man/man_ko.po
@@ -576,11 +598,15 @@ trans.zh_CN = installer/resources/locale-man/man_zh.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
@@ -592,32 +618,33 @@ 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]
 ;;
 ;; Text on /console
 ;;
 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.fr = installer/resources/readme/readme_fr.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
-trans.zh_CN = installer/resources/readme/readme_zh.html
+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.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
 
 [main]
 host = https://www.transifex.com

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,49 @@
+# I2P in Docker
+
+### 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 i2p .
+```
+
+### Running a container
+
+#### 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|Description|TCP/UDP|
+|---|---|---|
+|4444|HTTP Proxy|TCP|
+|4445|HTTPS Proxy|TCP|
+|6668|IRC Proxy|TCP|
+|7654|I2CP Protocol|TCP|
+|7656|SAM Bridge TCP|TCP|
+|7657|Router console|TCP|
+|7658|I2P Site|TCP|
+|7659|SMTP Proxy|TCP|
+|7660|POP Proxy|TCP|
+|12345|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.
+
+#### 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 run \
+    -e JVM_XMX=256m \
+    -v i2phome:/i2p/.i2p \
+    -v i2ptorrents:/i2psnark \
+    -p 4444:4444 \
+    -p 6668:6668 \
+    -p 7657:7657 \
+    -p 54321:12345 \
+    -p 54321:12345/udp \  # I2NP port needs TCP and UDP.  Change the 54321 to something random, greater than 1024.
+    i2p:latest
+```
+

Dockerfile

@@ -1,62 +1,36 @@
-FROM meeh/java8server:latest
-# Docker image based on Alpine with Java.
+FROM jlesage/baseimage:alpine-3.10-glibc 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 add-pkg --virtual build-base gettext tar bzip2 apache-ant openjdk8 \
+    && ant preppkg-linux-only \
+    && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.* \
+    && del-pkg build-base gettext tar bzip2 apache-ant openjdk8
 
-ENV GIT_BRANCH="master"
-ENV I2P_PREFIX="/opt/i2p"
-ENV PATH=${I2P_PREFIX}/bin:$PATH
-ENV JAVA_HOME=/usr/lib/jvm/default-jvm
+FROM jlesage/baseimage:alpine-3.10-glibc
+ENV APP_HOME="/i2p"
 
-ENV GOSU_VERSION=1.7
-ENV GOSU_SHASUM="34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50  /usr/local/bin/gosu"
+RUN add-pkg openjdk8-jre
+WORKDIR ${APP_HOME}
+COPY --from=builder /tmp/build/pkg-temp .
 
-RUN mkdir /user && adduser -S -h /user i2p && chown -R i2p:nobody /user
+# "install" i2p by copying over installed files
+COPY docker/rootfs/ /
 
-# Adding files first, since Docker.expt is required for installation
-ADD Docker.expt /tmp/Docker.expt
-ADD Docker.entrypoint.sh /entrypoint.sh
+# Mount home and snark
+VOLUME ["${APP_HOME}/.i2p"]
+VOLUME ["/i2psnark"]
 
-# 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
+EXPOSE 7654 7656 7657 7658 4444 6668 7659 7660 4445 12345
 
-#
-# 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.
-#
-
-# 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"
 

INSTALL-headless.txt

@@ -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
@@ -89,14 +85,21 @@ Public domain except as listed below:
    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:
@@ -125,6 +128,10 @@ Public domain except as listed below:
    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)
@@ -171,18 +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 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
 
 
@@ -192,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 / 6.1.2:
+   GMP 6.0.0 / 6.1.2 / 6.2.0:
    See licenses/LICENSE-GPLv2.txt
 
 
@@ -254,23 +261,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.29.v20191105 (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.
@@ -294,6 +300,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.
@@ -332,9 +339,9 @@ Applications:
    Systray (systray.jar):
    Public domain.
 
-   Tomcat 8.5.50 (jasper-runtime.jar):
+   Tomcat 9.0.54 (jasper-runtime.jar):
    (not included in most distribution packages)
-   Copyright 1999-2019 The Apache Software Foundation
+   Copyright 1999-2021 The Apache Software Foundation
    See licenses/LICENSE-Apache2.0.txt
    See licenses/NOTICE-Tomcat.txt
 
@@ -348,24 +355,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,19 @@ your `~/.gradle/gradle.properties`:
     systemProp.socksProxyHost=localhost
     systemProp.socksProxyPort=9150
 
+### 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/nbproject/build-impl.xml

@@ -39,8 +39,9 @@ is divided into following sections:
         <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"/>
+        <property name="default.javac.source" value="1.8"/>
+        <property name="default.javac.target" value="1.8"/>
+        <property name="javac.release" value="8"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
@@ -155,7 +156,7 @@ is divided into following sections:
             <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}">
+                <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}" release="${javac.release}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>

apps/BOB/nbproject/project.properties

@@ -29,28 +29,19 @@ 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}
+    ${file.reference.i2p.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.version=1.7
+javac.version=1.8
 javac.source=${javac.version}
 javac.target=${javac.version}
+javac.release=8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

apps/BOB/nbproject/project.xml

@@ -4,7 +4,7 @@
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
             <name>BOB</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <minimum-ant-version>1.9.8</minimum-ant-version>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>

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

@@ -38,6 +38,7 @@ import net.i2p.I2PAppContext;
 import net.i2p.app.*;
 import net.i2p.client.I2PClient;
 import net.i2p.util.I2PAppThread;
+import net.i2p.util.Log;
 import net.i2p.util.PortMapper;
 import net.i2p.util.SimpleTimer2;
 
@@ -111,7 +112,9 @@ import net.i2p.util.SimpleTimer2;
  * BOB, main command socket listener, launches the command parser engine.
  *
  * @author sponge
+ * @deprecated Please port applications to SAMv3
  */
+@Deprecated
 public class BOB implements Runnable, ClientApp {
 
 	public final static String PROP_CONFIG_LOCATION = "BOB.config";
@@ -140,6 +143,7 @@ public class BOB implements Runnable, ClientApp {
 
 	private volatile ServerSocket listener;
 	private volatile Thread _runner;
+	private volatile boolean _warned;
 
 	/**
 	 * Stop BOB gracefully
@@ -342,6 +346,12 @@ public class BOB implements Runnable, ClientApp {
 				}
 
 				if (g) {
+					if (!_warned) {
+						_warned = true;
+						String s = "BOB is deprecated. Please port applications to SAMv3.";
+						_context.logManager().getLog(BOB.class).logAlways(Log.WARN, s);
+						_log.warn(s);
+					}
 					DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
 					Thread t = new I2PAppThread(conn_c);
 					t.setName("BOB.DoCMDS " + i);

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

@@ -1,5 +1,5 @@
 <html>
   <body>
-	  <p>BOB, the Basic Open Bridge, allows TCP applications to talk over I2P.</p>  
+	  <p>BOB, the Basic Open Bridge, allows TCP applications to talk over I2P - DEPRECATED - Please port applications to SAMv3.</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,8 @@
 	<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" />
 
 	<target name="all" depends="jar, emptyWar"/> 
 	
@@ -40,6 +41,7 @@
 
 	<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}">

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

@@ -246,19 +246,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 +275,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/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
@@ -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/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());
@@ -2062,9 +2069,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/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,7 +7,8 @@
 	<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" />
 
     <condition property="no.bundle">
@@ -27,6 +28,7 @@
 
         <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}">
@@ -52,6 +54,7 @@
                 <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}">
@@ -77,12 +80,14 @@
 		<!-- 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="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}" />

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
@@ -110,7 +111,7 @@ do
         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_cs.po

@@ -4,19 +4,20 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
+# 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"
+"PO-Revision-Date: 2021-07-08 09:41+0000\n"
+"Last-Translator: slrslr\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
@@ -41,12 +42,12 @@ msgstr "Spouštím I2P Browser"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:76
 #: src/net/i2p/desktopgui/InternalTrayManager.java:228
 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 ""
+msgstr "Zakázat"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:93
 #: src/net/i2p/desktopgui/InternalTrayManager.java:245
@@ -61,26 +62,26 @@ msgstr "Zastavit I2P"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:126
 #: src/net/i2p/desktopgui/InternalTrayManager.java:278
 msgid "Restart I2P Immediately"
-msgstr ""
+msgstr "Restartovat I2P Hned"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:143
 #: src/net/i2p/desktopgui/InternalTrayManager.java:295
 msgid "Stop I2P Immediately"
-msgstr ""
+msgstr "Zastavit I2P Hned"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:157
 #: src/net/i2p/desktopgui/InternalTrayManager.java:309
 msgid "Cancel I2P Shutdown"
-msgstr ""
+msgstr "Zrušit I2P Zastavení"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:363
 #, java-format
 msgid "Shutdown in {0}"
-msgstr ""
+msgstr "Zastavení za {0}"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:365
 msgid "Shutdown imminent"
-msgstr ""
+msgstr "Vypínání"
 
 #. status translations are in the console bundle
 #: src/net/i2p/desktopgui/InternalTrayManager.java:370
@@ -90,4 +91,4 @@ msgstr "Síť"
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
 #: src/net/i2p/desktopgui/TrayManager.java:63
 msgid "I2P: Right-click for menu"
-msgstr ""
+msgstr "I2P: Pravé-kliknutí pro menu"

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: 2021-08-11 15:33+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"
@@ -33,57 +33,57 @@ msgstr ""
 msgid "Starting"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:55
-#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+#: src/net/i2p/desktopgui/InternalTrayManager.java:54
+#: src/net/i2p/desktopgui/InternalTrayManager.java:206
 msgid "Launch I2P Browser"
 msgstr ""
 
+#: src/net/i2p/desktopgui/InternalTrayManager.java:75
+#: src/net/i2p/desktopgui/InternalTrayManager.java:227
+msgid "Configure I2P System Tray"
+msgstr ""
+
 #: src/net/i2p/desktopgui/InternalTrayManager.java:76
 #: src/net/i2p/desktopgui/InternalTrayManager.java:228
-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:93
-#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+#: src/net/i2p/desktopgui/InternalTrayManager.java:92
+#: src/net/i2p/desktopgui/InternalTrayManager.java:244
 msgid "Restart I2P"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:110
-#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+#: src/net/i2p/desktopgui/InternalTrayManager.java:109
+#: src/net/i2p/desktopgui/InternalTrayManager.java:261
 msgid "Stop I2P"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:126
-#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+#: src/net/i2p/desktopgui/InternalTrayManager.java:125
+#: src/net/i2p/desktopgui/InternalTrayManager.java:277
 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:142
+#: src/net/i2p/desktopgui/InternalTrayManager.java:294
 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:156
+#: src/net/i2p/desktopgui/InternalTrayManager.java:308
 msgid "Cancel I2P Shutdown"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#: src/net/i2p/desktopgui/InternalTrayManager.java:362
 #, java-format
 msgid "Shutdown in {0}"
 msgstr ""
 
-#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+#: src/net/i2p/desktopgui/InternalTrayManager.java:364
 msgid "Shutdown imminent"
 msgstr ""
 
 #. status translations are in the console bundle
-#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+#: src/net/i2p/desktopgui/InternalTrayManager.java:369
 msgid "Network"
 msgstr ""
 

apps/desktopgui/locale/messages_es_AR.po

@@ -0,0 +1,94 @@
+# 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: 2016-05-25 12:29+0000\n"
+"PO-Revision-Date: 2017-11-16 15:29+0000\n"
+"Last-Translator: kaze kaze <kaze@rlab.be>\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=2; plural=(n != 1);\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
+msgid "I2P is starting!"
+msgstr "I2P esta iniciando!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Iniciando"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "Lanzar el Navegador I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+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:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "Riniciar I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "Detener I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr " Reiniciar I2P inmediatamente "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr " Detener I2P inmediatamente "
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "Cancelar el Apagado de I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "Apagar en {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Apagado inminente"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Red"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P Clic derecho para el menú"

apps/desktopgui/locale/messages_hu.po

@@ -4,13 +4,14 @@
 # To contribute translations, see http://www.i2p2.de/newdevelopers
 # 
 # Translators:
+# Hunor Paksy <heds@cock.li>, 2018
 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"
+"PO-Revision-Date: 2021-06-20 09:44+0000\n"
+"Last-Translator: AdminLMH <lehetmashogy@i2pmail.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/I2P/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr "I2P Böngésző Indítása"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:76
 #: src/net/i2p/desktopgui/InternalTrayManager.java:228
 msgid "Configure I2P System Tray"
-msgstr ""
+msgstr "I2P rendszertálca beállítások"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:77
 #: src/net/i2p/desktopgui/InternalTrayManager.java:229
@@ -61,17 +62,17 @@ msgstr "I2P Leállítása"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:126
 #: src/net/i2p/desktopgui/InternalTrayManager.java:278
 msgid "Restart I2P Immediately"
-msgstr ""
+msgstr "I2P Azonnali újraindítása"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:143
 #: src/net/i2p/desktopgui/InternalTrayManager.java:295
 msgid "Stop I2P Immediately"
-msgstr ""
+msgstr "I2P Azonnali megállítása"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:157
 #: src/net/i2p/desktopgui/InternalTrayManager.java:309
 msgid "Cancel I2P Shutdown"
-msgstr ""
+msgstr "I2P leállításának visszavonása"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:363
 #, java-format
@@ -90,4 +91,4 @@ msgstr "Hálózat"
 #. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
 #: src/net/i2p/desktopgui/TrayManager.java:63
 msgid "I2P: Right-click for menu"
-msgstr ""
+msgstr "I2P: Jobb-klikk a menüért"

apps/desktopgui/locale/messages_ku.po

@@ -0,0 +1,95 @@
+# 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:
+# Zagros, 2021
+# Zagros, 2020
+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: 2021-08-30 21:05+0000\n"
+"Last-Translator: Zagros\n"
+"Language-Team: Kurdish (http://www.transifex.com/otf/I2P/language/ku/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ku\n"
+"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 "I2P بەکاربخە"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "وا I2P دەستپێدەکات!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "دەستپێکردن"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "وێبگەڕی I2P بکەوە"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "دەستکاری سیستەمی ئاگەدارکردنەوەی I2P بکە"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "ناچالاکبکە"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "I2P بەکاربخەوە"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "I2P بوەستێنە"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "دەستبەجێ I2P بەکاربخەوە"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "دەستبەجێ I2P بوەستێنە"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "دەستهەڵگرتن لە کووژاندنەوەی I2P"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "دەکووژێتەوە لە {0}"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "دەستبەجێ کووژانەوە"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "ڕایەڵە"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: کرتەی ڕاست بکە بۆ لیستەکان"

apps/desktopgui/locale/messages_sv.po

@@ -6,16 +6,16 @@
 # Translators:
 # 123hund123 <M8R-ra4r1r@mailinator.com>, 2011
 # Anders Nilsson <anders@devode.se>, 2016
-# Jonatan Nyberg, 2016-2017
-# Jonatan Nyberg, 2018
-# Jonatan Nyberg, 2017
+# Jonatan Nyberg <jonatan@autistici.org>, 2016-2017,2021
+# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2018
+# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017
 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-06-17 14:17+0000\n"
-"Last-Translator: Jonatan Nyberg\n"
+"PO-Revision-Date: 2021-10-02 16:29+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan@autistici.org>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/otf/I2P/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,7 @@ msgstr "Konfigurera I2P-meddelandefältet"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:77
 #: src/net/i2p/desktopgui/InternalTrayManager.java:229
 msgid "Disable"
-msgstr "Avaktivera"
+msgstr "Inaktivera"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:93
 #: src/net/i2p/desktopgui/InternalTrayManager.java:245
@@ -61,7 +61,7 @@ msgstr "Starta om I2P"
 #: src/net/i2p/desktopgui/InternalTrayManager.java:110
 #: src/net/i2p/desktopgui/InternalTrayManager.java:262
 msgid "Stop I2P"
-msgstr "Stoppar I2P"
+msgstr "Stoppa I2P"
 
 #: src/net/i2p/desktopgui/InternalTrayManager.java:126
 #: src/net/i2p/desktopgui/InternalTrayManager.java:278

apps/desktopgui/locale/messages_tk.po

@@ -0,0 +1,94 @@
+# 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:
+# Alperen Yavuz <mingyu@yaani.com>, 2020
+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: 2020-08-26 20:48+0000\n"
+"Last-Translator: Alperen Yavuz <mingyu@yaani.com>\n"
+"Language-Team: Turkmen (http://www.transifex.com/otf/I2P/language/tk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tk\n"
+"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 "I2P başlaň"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "I2P is starting!"
+msgstr "I2P başlaýar!"
+
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:44
+#: src/net/i2p/desktopgui/ExternalTrayManager.java:72
+msgid "Starting"
+msgstr "Başlamak"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:55
+#: src/net/i2p/desktopgui/InternalTrayManager.java:207
+msgid "Launch I2P Browser"
+msgstr "I2P brauzerini işe giriziň"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:76
+#: src/net/i2p/desktopgui/InternalTrayManager.java:228
+msgid "Configure I2P System Tray"
+msgstr "I2P ulgam lýubkasyny sazlaň"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:77
+#: src/net/i2p/desktopgui/InternalTrayManager.java:229
+msgid "Disable"
+msgstr "Öçüriň"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:93
+#: src/net/i2p/desktopgui/InternalTrayManager.java:245
+msgid "Restart I2P"
+msgstr "I2P-i täzeden açyň"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:110
+#: src/net/i2p/desktopgui/InternalTrayManager.java:262
+msgid "Stop I2P"
+msgstr "I2P bes et"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:126
+#: src/net/i2p/desktopgui/InternalTrayManager.java:278
+msgid "Restart I2P Immediately"
+msgstr "I2P derrew täzeden açyň"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:143
+#: src/net/i2p/desktopgui/InternalTrayManager.java:295
+msgid "Stop I2P Immediately"
+msgstr "Derrew I2P duruzyň"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:157
+#: src/net/i2p/desktopgui/InternalTrayManager.java:309
+msgid "Cancel I2P Shutdown"
+msgstr "I2P ýapmagy ýatyryň"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:363
+#, java-format
+msgid "Shutdown in {0}"
+msgstr "{0} in ýapmak"
+
+#: src/net/i2p/desktopgui/InternalTrayManager.java:365
+msgid "Shutdown imminent"
+msgstr "Öçürmek ýakyn"
+
+#. status translations are in the console bundle
+#: src/net/i2p/desktopgui/InternalTrayManager.java:370
+msgid "Network"
+msgstr "Tor"
+
+#. Windows typically has tooltips; Linux (at least Ubuntu) doesn't
+#: src/net/i2p/desktopgui/TrayManager.java:63
+msgid "I2P: Right-click for menu"
+msgstr "I2P: Menýu üçin sag basyň"

apps/desktopgui/locale/messages_zh.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # ducki2p <ducki2p@gmail.com>, 2011
+# Scott Rhodes <starring169@gmail.com>, 2021
 # walking <walking@i2pmail.org>, 2011
 # YFdyh000 <yfdyh000@gmail.com>, 2016
 msgid ""
@@ -12,8 +13,8 @@ msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-25 12:29+0000\n"
-"PO-Revision-Date: 2019-06-20 03:18+0000\n"
-"Last-Translator: Beta Ba <linsui555@gmail.com>\n"
+"PO-Revision-Date: 2021-03-07 07:58+0000\n"
+"Last-Translator: Scott Rhodes <starring169@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/I2P/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +30,7 @@ msgstr "启动 I2P"
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72
 msgid "I2P is starting!"
-msgstr "正在启动 I2P !"
+msgstr " I2P 正在启动!"
 
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:44
 #: src/net/i2p/desktopgui/ExternalTrayManager.java:72

apps/i2pcontrol/build.gradle

@@ -0,0 +1,26 @@
+plugins {
+    id 'war'
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'java'
+        }
+    }
+}
+
+dependencies {
+    providedCompile project(':router')
+    providedCompile project(':apps:jetty')
+    providedCompile files('../../installer/lib/wrapper/all/wrapper.jar')
+}
+
+war {
+    archiveName 'jsonrpc.war'
+    webXml = file('web.xml')
+}
+
+artifacts {
+    archives war
+}

apps/i2pcontrol/build.xml

@@ -50,7 +50,8 @@
     </target>
 
     <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" />
 
     <target name="compile" depends="builddep" >
         <mkdir dir="./build" />
@@ -58,6 +59,7 @@
         <javac 
             srcdir="./java" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+            release="${javac.release}"
             includeAntRuntime="false"
             encoding="UTF-8"
             destdir="./build/obj" 
@@ -77,6 +79,7 @@
             sourcepath=""
             srcdir="./java" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+            release="${javac.release}"
             includeAntRuntime="false"
             encoding="UTF-8"
             destdir="./build/obj" 
@@ -90,6 +93,8 @@
     </target>
 
     <target name="jar" depends="compile">
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="build/i2pcontrol.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
                 <attribute name="Implementation-Version" value="${full.version}" />
@@ -104,6 +109,8 @@
     </target>    
 
     <target name="socketJar" depends="compileSocketJar">
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <jar destfile="build/i2pcontrol.jar" basedir="./build/obj" includes="**/*.class" >
             <manifest>
                 <attribute name="Implementation-Version" value="${full.version}" />
@@ -118,6 +125,8 @@
     </target>    
 
     <target name="war" depends="compile" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
         <war destfile="build/jsonrpc.war" webxml="web.xml" >
             <classes dir="./build/obj" excludes="net/i2p/i2pcontrol/I2PControlController.class net/i2p/i2pcontrol/HostCheckHandler.class net/i2p/i2pcontrol/SocketController*.class" />
             <manifest>

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Error.java

@@ -1,7 +1,7 @@
 package com.thetransactioncompany.jsonrpc2;
 
 
-import org.json.simple.JSONObject;
+import org.json.simple.JsonObject;
 
 
 /** 
@@ -220,7 +220,7 @@ public class JSONRPC2Error extends Exception {
 	 * @see #toJSONObject
 	 */
 	@Deprecated
-	public JSONObject toJSON() {
+	public JsonObject toJSON() {
 	
 		return toJSONObject();
 	}
@@ -231,9 +231,9 @@ public class JSONRPC2Error extends Exception {
 	 *
 	 * @return A JSON object representing this error object.
 	 */
-	public JSONObject toJSONObject() {
+	public JsonObject toJSONObject() {
 	
-		JSONObject out = new JSONObject();
+		JsonObject out = new JsonObject();
 		
 		out.put("code", code);
 		out.put("message", super.getMessage());

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Message.java

@@ -5,8 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.json.simple.JSONAware;
-import org.json.simple.JSONObject;
+import org.json.simple.JsonObject;
 
 
 /**
@@ -54,7 +53,7 @@ import org.json.simple.JSONObject;
  * 
  * @author Vladimir Dzhuvinov
  */
-public abstract class JSONRPC2Message implements JSONAware {
+public abstract class JSONRPC2Message {
 
 
 	/**
@@ -220,7 +219,7 @@ public abstract class JSONRPC2Message implements JSONAware {
 	 *
 	 * @return The JSON object.
 	 */
-	public abstract JSONObject toJSONObject();
+	public abstract JsonObject toJSONObject();
 	
 	
 	/**
@@ -246,6 +245,6 @@ public abstract class JSONRPC2Message implements JSONAware {
 	@Override
 	public String toString() {
 		
-		return toJSONObject().toString();
+		return toJSONObject().toJson();
 	}
 }

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Notification.java

@@ -4,7 +4,7 @@ package com.thetransactioncompany.jsonrpc2;
 import java.util.List;
 import java.util.Map;
 
-import org.json.simple.JSONObject;
+import org.json.simple.JsonObject;
 
 
 /** 
@@ -414,9 +414,9 @@ public class JSONRPC2Notification extends JSONRPC2Message {
 	
 	
 	@Override
-	public JSONObject toJSONObject() {
+	public JsonObject toJSONObject() {
 	
-		JSONObject notf = new JSONObject();
+		JsonObject notf = new JsonObject();
 		
 		notf.put("method", method);
 		

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Parser.java

@@ -4,9 +4,8 @@ package com.thetransactioncompany.jsonrpc2;
 import java.util.List;
 import java.util.Map;
 
-import org.json.simple.parser.ContainerFactory;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+import org.json.simple.Jsoner;
+import org.json.simple.DeserializationException;
 
 
 /**
@@ -56,12 +55,6 @@ import org.json.simple.parser.ParseException;
 public class JSONRPC2Parser {
 
 
-	/**
-	 * Reusable JSON parser. Not thread-safe!
-	 */
-	private final JSONParser parser;
-	
-	
 	/**
 	 * If {@code true} the order of the parsed JSON object members must be
 	 * preserved.
@@ -153,10 +146,7 @@ public class JSONRPC2Parser {
 	public JSONRPC2Parser(final boolean preserveOrder, 
 		              final boolean ignoreVersion, 
 		              final boolean parseNonStdAttributes) {
-	
-		// Numbers parsed as long/double, requires JSON Smart 1.0.9+
-		parser = new JSONParser();
-		
+
 		this.preserveOrder = preserveOrder;
 		this.ignoreVersion = ignoreVersion;
 		this.parseNonStdAttributes = parseNonStdAttributes;
@@ -189,13 +179,9 @@ public class JSONRPC2Parser {
 		
 		// Parse the JSON string
 		try {
-			//if (preserveOrder)
-			//	json = parser.parse(jsonString, ContainerFactory.FACTORY_ORDERED);
-
-			//else
-				json = parser.parse(jsonString);
+			json = Jsoner.deserialize(jsonString);
 				
-		} catch (ParseException e) {
+		} catch (DeserializationException e) {
 
 			// Terse message, do not include full parse exception message
 			throw new JSONRPC2ParseException("Invalid JSON", 

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Request.java

@@ -4,7 +4,7 @@ package com.thetransactioncompany.jsonrpc2;
 import java.util.List;
 import java.util.Map;
 
-import org.json.simple.JSONObject;
+import org.json.simple.JsonObject;
 
 
 /** 
@@ -472,9 +472,9 @@ public class JSONRPC2Request extends JSONRPC2Message {
 	
 	
 	@Override
-	public JSONObject toJSONObject() {
+	public JsonObject toJSONObject() {
 	
-		JSONObject req = new JSONObject();
+		JsonObject req = new JsonObject();
 		
 		req.put("method", method);
 		

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Response.java

@@ -3,7 +3,7 @@ package com.thetransactioncompany.jsonrpc2;
 
 import java.util.Map;
 
-import org.json.simple.JSONObject;
+import org.json.simple.JsonObject;
 
 
 /** 
@@ -384,9 +384,9 @@ public class JSONRPC2Response extends JSONRPC2Message {
 	
 	
 	@Override
-	public JSONObject toJSONObject() {
+	public JsonObject toJSONObject() {
 		
-		JSONObject out = new JSONObject();
+		JsonObject out = new JsonObject();
 		
 		// Result and error are mutually exclusive
 		if (error != null) {

apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/server/MessageContext.java

@@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletRequest;
  * This class is immutable.
  *
  * <ul>
- *     <li>The client's host name.
+ *     <li>The client's hostname.
  *     <li>The client's IP address.
  *     <li>Whether the request / notification was transmitted securely (e.g. 
  *         via HTTPS).
@@ -122,7 +122,7 @@ public class MessageContext {
 	/**
 	 * Creates a new JSON-RPC 2.0 request / notification context.
 	 *
-	 * @param clientHostName    The client host name, {@code null} if 
+	 * @param clientHostName    The client hostname, {@code null} if 
 	 *                          unknown.
 	 * @param clientInetAddress The client IP address, {@code null} if 
 	 *                          unknown.
@@ -150,7 +150,7 @@ public class MessageContext {
 	/**
 	 * Creates a new JSON-RPC 2.0 request / notification context.
 	 *
-	 * @param clientHostName    The client host name, {@code null} if 
+	 * @param clientHostName    The client hostname, {@code null} if 
 	 *                          unknown.
 	 * @param clientInetAddress The client IP address, {@code null} if 
 	 *                          unknown.
@@ -181,7 +181,7 @@ public class MessageContext {
 	 * Creates a new JSON-RPC 2.0 request / notification context. No 
 	 * authenticated client principal is specified.
 	 *
-	 * @param clientHostName    The client host name, {@code null} if 
+	 * @param clientHostName    The client hostname, {@code null} if 
 	 *                          unknown.
 	 * @param clientInetAddress The client IP address, {@code null} if 
 	 *                          unknown.
@@ -202,7 +202,7 @@ public class MessageContext {
 	 * an insecure transport (plain HTTP) and no authenticated client 
 	 * principal.
 	 *
-	 * @param clientHostName    The client host name, {@code null} if 
+	 * @param clientHostName    The client hostname, {@code null} if 
 	 *                          unknown.
 	 * @param clientInetAddress The client IP address, {@code null} if 
 	 *                          unknown.
@@ -219,7 +219,7 @@ public class MessageContext {
 	/**
 	 * Creates a new JSON-RPC 2.0 request / notification context. Indicates 
 	 * an insecure transport (plain HTTP) and no authenticated client 
-	 * principal. Not client host name / IP is specified.
+	 * principal. Not client hostname / IP is specified.
 	 */
 	public MessageContext() {
 	
@@ -315,10 +315,10 @@ public class MessageContext {
 	
 	
 	/**
-	 * Gets the host name of the client that sent the request / 
+	 * Gets the hostname of the client that sent the request / 
 	 * notification.
 	 *
-	 * @return The client host name, {@code null} if unknown.
+	 * @return The client hostname, {@code null} if unknown.
 	 */
 	public String getClientHostName() {
 	

apps/i2pcontrol/java/net/i2p/i2pcontrol/I2PControlController.java

@@ -55,7 +55,7 @@ import java.util.StringTokenizer;
  * This handles the starting and stopping of Jetty
  * from a single static class so it can be called via clients.config.
  *
- * This makes installation of a new eepsite a turnkey operation.
+ * This makes installation of a new I2P Site a turnkey operation.
  *
  * Usage: I2PControlController -d $PLUGIN [start|stop]
  *

apps/i2pcontrol/java/net/i2p/i2pcontrol/SocketController.java

@@ -37,8 +37,8 @@ import net.i2p.util.I2PSSLSocketFactory;
 import net.i2p.util.Log;
 import net.i2p.util.PortMapper;
 
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
+import org.json.simple.Jsoner;
+import org.json.simple.DeserializationException;
 
 import net.i2p.i2pcontrol.security.KeyStoreProvider;
 import net.i2p.i2pcontrol.security.SecurityManager;
@@ -194,13 +194,12 @@ public class SocketController implements RouterApp {
         public void run() {
             try {
                 final BufferedReader reader = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8"));
-                final JSONParser parser = new JSONParser();
                 while (true) {
-                    Object o = parser.parse(reader);
+                    Object o = Jsoner.deserialize(reader);
                     // TODO
                     System.out.println("i2pcontrol got: " + o);
                 }
-            } catch (ParseException pe) {
+            } catch (DeserializationException pe) {
                 _log.error("i2pcontrol handler", pe);
                 return;
             } catch (IOException ioe) {

apps/i2pcontrol/java/net/i2p/i2pcontrol/security/KeyStoreProvider.java

@@ -186,17 +186,18 @@ public class KeyStoreProvider {
         if (_keystore == null) {
             File keyStoreFile = new File(getKeyStoreLocation());
 
+            InputStream is = null;
             try {
                 _keystore = KeyStore.getInstance(KeyStore.getDefaultType());
                 if (keyStoreFile.exists()) {
-                    InputStream is = new FileInputStream(keyStoreFile);
+                    is = new FileInputStream(keyStoreFile);
                     _keystore.load(is, DEFAULT_KEYSTORE_PASSWORD.toCharArray());
                     return _keystore;
                 }
 
                 initialize();
                 if (keyStoreFile.exists()) {
-                    InputStream is = new FileInputStream(keyStoreFile);
+                    is = new FileInputStream(keyStoreFile);
                     _keystore.load(is, DEFAULT_KEYSTORE_PASSWORD.toCharArray());
                     return _keystore;
                 } else {
@@ -204,6 +205,8 @@ public class KeyStoreProvider {
                 }
             } catch (Exception e) {
                 // Ignore. Not an issue. Let's just create a new keystore instead.
+            } finally {
+                if (is != null) try { is.close(); } catch (IOException ioe) {}
             }
             return null;
         } else {

apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/JSONRPC2Servlet.java

@@ -145,8 +145,9 @@ public class JSONRPC2Servlet extends HttpServlet {
 
     @Override
     protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException {
-        httpServletResponse.setContentType("text/html");
+        setHeaders(httpServletResponse);
         PrintWriter out = httpServletResponse.getWriter();
+        out.println("<html><head></head><body>");
         out.println("<p>I2PControl RPC Service version " + I2PControlVersion.VERSION + " : Running");
 	if ("/password".equals(httpServletRequest.getServletPath())) {
             out.println("<form method=\"POST\" action=\"password\">");
@@ -160,16 +161,19 @@ public class JSONRPC2Servlet extends HttpServlet {
                         "<input name=\"save\" type=\"submit\" value=\"Change API Password\">" +
                         "<p>If you forget the API password, stop i2pcontrol, delete the file <tt>" + _conf.getConfFile() +
                         "</tt>, and restart i2pcontrol.");
+            out.println("</form>");
         } else {	
             out.println("<p><a href=\"password\">Change API Password</a>");
         }
+        out.println("</body></html>");
         out.close();
     }
 
     /** @since 0.12 */
     private void doPasswordChange(HttpServletRequest req, HttpServletResponse httpServletResponse) throws ServletException, IOException {
-        httpServletResponse.setContentType("text/html");
+        setHeaders(httpServletResponse);
         PrintWriter out = httpServletResponse.getWriter();
+        out.println("<html><head></head><body>");
         String pw = req.getParameter("password");
         if (pw == null)
             pw = _secMan.DEFAULT_AUTH_PASSWORD;
@@ -194,6 +198,21 @@ public class JSONRPC2Servlet extends HttpServlet {
             }
         }
         out.println("<p><a href=\"password\">Change API Password</a>");
+        out.println("</body></html>");
+        out.close();
+    }
+
+    /**
+     *  @since 0.9.48
+     */
+    private static void setHeaders(HttpServletResponse resp) {
+        resp.setContentType("text/html");
+        resp.setHeader("X-Frame-Options", "SAMEORIGIN");
+        resp.setHeader("Content-Security-Policy", "default-src 'self'; style-src 'self'; script-src 'self'; form-action 'self'; frame-ancestors 'self'; object-src 'none'; media-src 'none'");
+        resp.setHeader("X-XSS-Protection", "1; mode=block");
+        resp.setHeader("X-Content-Type-Options", "nosniff");
+        resp.setHeader("Pragma", "no-cache");
+        resp.setHeader("Cache-Control","no-cache");
     }
 
     @Override

apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/AuthenticateHandler.java

@@ -86,7 +86,7 @@ public class AuthenticateHandler implements RequestHandler {
 
         Integer apiVersion;
         try {
-            apiVersion = ((Long) api).intValue();
+            apiVersion = ((Number) api).intValue();
         } catch (ClassCastException e) {
             e.printStackTrace();
             return JSONRPC2ExtendedError.UNSPECIFIED_API_VERSION;

apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/GetRateHandler.java

@@ -56,12 +56,10 @@ public class GetRateHandler implements RequestHandler {
             if (input == null) {
                 return new JSONRPC2Response(JSONRPC2Error.INVALID_PARAMS, req.getID());
             }
-            long period;
-            try {
-                period = (Long) inParams.get("Period");
-            } catch (NumberFormatException e) {
+            Number p = (Number) inParams.get("Period");
+            if (p == null)
                 return new JSONRPC2Response(JSONRPC2Error.INVALID_PARAMS, req.getID());
-            }
+            long period = p.longValue();
 
             RateStat rateStat = I2PAppContext.getGlobalContext().statManager().getRate(input);
 

apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/JSONRPC2ExtendedError.java

@@ -1,7 +1,6 @@
 package net.i2p.i2pcontrol.servlets.jsonrpc2handlers;
 
 import com.thetransactioncompany.jsonrpc2.JSONRPC2Error;
-import org.json.simple.JSONObject;
 
 /*
  *  Copyright 2011 hottuna (dev@robertfoss.se)

apps/i2psnark/build.gradle

@@ -6,13 +6,14 @@ sourceSets {
     main {
         java {
             srcDir 'java/src'
+            srcDir 'java/build/messages-src'
         }
     }
 }
 
 dependencies {
     compile project(':core')
-    compile project(':apps:systray')
+    providedCompile project(':apps:systray')
     compile 'gnu.getopt:java-getopt:1.0.13'
     providedCompile project(':apps:ministreaming')
     providedCompile project(':apps:jetty')
@@ -31,13 +32,29 @@ task i2psnarkJar(type: Jar) {
 // TODO: standalone jar.  This is rather involved!
 
 artifacts {
-    archives i2psnarkJar
+    archives i2psnarkJar,war
 }
 
-war {
-    into '.icons', {
-        from 'icons'
+// 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/org/klomp/snark/web/messages_de.class")).exists())
+            println "apps/i2psnark/java/bundle-messages.sh".execute().text
     }
+}
+war.dependsOn bundle
+
+war {
+    rootSpec.exclude('/org/klomp/snark/*.class')
+    rootSpec.exclude('/org/klomp/snark/bencode/**')
+    rootSpec.exclude('/org/klomp/snark/comments/**')
+    rootSpec.exclude('/org/klomp/snark/dht/**')
+    rootSpec.exclude('/org/klomp/snark/standalone/**')
+    from ('resources', {
+        into ".resources"
+    })
     webInf {
         into 'classes/org/klomp/snark/web'
         from 'mime.properties'

apps/i2psnark/java/build.xml

@@ -27,7 +27,8 @@
 
     <!-- only used if not set by a higher build.xml -->
     <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" />
 
@@ -41,6 +42,7 @@
         <javac 
             srcdir="./src" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+            release="${javac.release}"
             destdir="./build/obj" 
             encoding="UTF-8"
             includeAntRuntime="false" >
@@ -145,6 +147,7 @@
     <target name="warUpToDate">
         <uptodate property="war.uptodate" targetfile="../i2psnark.war" >
             <srcfiles dir= "." includes="build/obj/org/klomp/snark/web/*.class ../resources/**/* ../web.xml" />
+            <srcfiles dir= "../resources" />
         </uptodate>
     </target>
 
@@ -164,6 +167,7 @@
             <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/obj">
@@ -247,53 +251,51 @@
 
     <!-- add css, image, and js files for standalone snark to the war -->
     <target name="standalone_war" depends="war">
-        <mkdir dir="build/standalone-resources/.resources/themes/snark" />
-        <copy todir="build/standalone-resources/.resources/themes/snark" >
-            <fileset dir="../../../installer/resources/themes/snark/" />
+        <mkdir dir="build/standalone-resources/.resources/themes/" />
+        <copy todir="build/standalone-resources/.resources/themes/" >
+            <fileset dir="../resources/themes/" />
         </copy>
 
-        <replace dir="build/standalone-resources/.resources/themes/snark"
+        <replace dir="build/standalone-resources/.resources/themes"
             summary="true"
             token="url(/themes/console/dark/images/"
-            value="url(/i2psnark/.resources/themes/snark/dark/images/" >
+            value="url(/i2psnark/.resources/themes/dark/images/" >
             <include name="**/*.css" />
         </replace>
-        <replace dir="build/standalone-resources/.resources/themes/snark"
+        <replace dir="build/standalone-resources/.resources/themes"
             summary="true"
             token="url(../../console/light/images/"
-            value="url(/i2psnark/.resources/themes/snark/light/images/" >
+            value="url(/i2psnark/.resources/themes/light/images/" >
             <include name="**/*.css" />
         </replace>
-        <replace dir="build/standalone-resources/.resources/themes/snark"
+        <replace dir="build/standalone-resources/.resources/themes"
             summary="true"
             token="url(/themes/console/light/images/"
-            value="url(/i2psnark/.resources/themes/snark/light/images/" >
+            value="url(/i2psnark/.resources/themes/light/images/" >
             <include name="**/*.css" />
         </replace>
-        <replace dir="build/standalone-resources/.resources/themes/snark"
+        <replace dir="build/standalone-resources/.resources/themes"
             summary="true"
             token="url(/themes/console/images/transparent.gif"
-            value="url(/i2psnark/.resources/themes/snark/ubergine/images/transparent.gif" >
+            value="url(/i2psnark/.resources/themes/ubergine/images/transparent.gif" >
             <include name="**/*.css" />
         </replace>
-        <replace dir="build/standalone-resources/.resources/themes/snark"
+        <replace dir="build/standalone-resources/.resources/themes"
             summary="true"
             token="url(/themes/console/images/info/"
-            value="url(/i2psnark/.resources/themes/snark/ubergine/images/" >
+            value="url(/i2psnark/.resources/themes/ubergine/images/" >
             <include name="**/*.css" />
         </replace>
 
         <!-- Rather than pulling in all the console theme images, let's just specify the ones we need -->
-        <copy file="../../../installer/resources/themes/console/images/transparent.gif"
-              todir="build/standalone-resources/.resources/themes/snark/ubergine/images" />
-        <copy file="../../../installer/resources/themes/console/dark/images/header.png"
-              todir="build/standalone-resources/.resources/themes/snark/dark/images" />
-        <copy file="../../../installer/resources/themes/console/light/images/header.png"
-              todir="build/standalone-resources/.resources/themes/snark/light/images" />
-        <copy file="../../../installer/resources/themes/console/dark/images/camotile2.png"
-              todir="build/standalone-resources/.resources/themes/snark/dark/images" />
-        <copy file="../../../installer/resources/themes/console/images/info/errortriangle.png"
-              todir="build/standalone-resources/.resources/themes/snark/ubergine/images" />
+        <copy file="../../routerconsole/jsp/themes/console/images/transparent.gif"
+              todir="build/standalone-resources/.resources/themes/ubergine/images" />
+        <copy file="../../routerconsole/jsp/themes/console/dark/images/header.png"
+              todir="build/standalone-resources/.resources/themes/dark/images" />
+        <copy file="../../routerconsole/jsp/themes/console/light/images/header.png"
+              todir="build/standalone-resources/.resources/themes/light/images" />
+        <copy file="../../routerconsole/jsp/themes/console/images/info/errortriangle.png"
+              todir="build/standalone-resources/.resources/themes/ubergine/images" />
 
         <mkdir dir="build/standalone-resources/.resources/js" />
         <copy file="../../routerconsole/jsp/js/ajax.js" todir="build/standalone-resources/.resources/js" />

apps/i2psnark/java/bundle-messages.sh

@@ -10,6 +10,7 @@
 #
 # zzz - public domain
 #
+cd `dirname $0`
 CLASS=org.klomp.snark.web.messages
 TMPFILE=build/javafiles.txt
 export TZ=UTC
@@ -101,7 +102,7 @@ do
         then
             # slow way
             # convert to class files in build/obj
-            msgfmt --java --statistics -r $CLASS -l $LG -d build/obj $i
+            msgfmt --java2 --statistics -r $CLASS -l $LG -d build/obj $i
             if [ $? -ne 0 ]
             then
                 echo "ERROR - msgfmt failed on ${i}, not updating translations"
@@ -119,7 +120,7 @@ do
             TDY=$TD2/org/klomp/snark/web
             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/i2psnark/java/src/org/klomp/snark/CoordinatorListener.java

@@ -43,12 +43,12 @@ interface CoordinatorListener
   public boolean overUploadLimit(int uploaders);
 
   /**
-   * Are we currently over the upstream bandwidth limit?
+   *  Is i2psnark as a whole over its limit?
    */
   public boolean overUpBWLimit();
 
   /**
-   * Is the total (in Bps) over the upstream bandwidth limit?
+   * Is a particular peer who has this recent download rate (in Bps) over our upstream bandwidth limit?
    */
   public boolean overUpBWLimit(long total);
 

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

@@ -68,7 +68,7 @@ abstract class ExtensionHandler {
         handshake.put("m", m);
         handshake.put("p", Integer.valueOf(TrackerClient.PORT));
         handshake.put("v", "I2PSnark");
-        handshake.put("reqq", Integer.valueOf(5));
+        handshake.put("reqq", Integer.valueOf(PeerState.MAX_PIPELINE));
         // BEP 21
         if (uploadOnly)
             handshake.put("upload_only", Integer.valueOf(1));

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

@@ -5,8 +5,10 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -57,7 +59,6 @@ public class I2PSnarkUtil {
     private int _i2cpPort;
     private final Map<String, String> _opts;
     private volatile I2PSocketManager _manager;
-    private boolean _configured;
     private volatile boolean _connecting;
     private final Set<Hash> _banlist;
     private int _maxUploaders;
@@ -84,6 +85,10 @@ public class I2PSnarkUtil {
     public static final String PROP_MAX_BW = "i2cp.outboundBytesPerSecond";
     public static final boolean DEFAULT_USE_DHT = true;
     public static final String EEPGET_USER_AGENT = "I2PSnark";
+    private static final List<String> HIDDEN_I2CP_OPTS = Arrays.asList(new String[] {
+        PROP_MAX_BW, "inbound.length", "outbound.length", "inbound.quantity", "outbound.quantity"
+    });
+
 
     public I2PSnarkUtil(I2PAppContext ctx) {
         this(ctx, "i2psnark");
@@ -142,25 +147,34 @@ public class I2PSnarkUtil {
     /** @since 0.9.1 */
     public I2PAppContext getContext() { return _context; }
     
-    public boolean configured() { return _configured; }
-    
+    /**
+     *  @param i2cpHost may be null for no change
+     *  @param i2cpPort may be 0 for no change
+     *  @param opts may be null for no change
+     */
     @SuppressWarnings({"unchecked", "rawtypes"})
     public void setI2CPConfig(String i2cpHost, int i2cpPort, Map opts) {
         if (i2cpHost != null)
             _i2cpHost = i2cpHost;
         if (i2cpPort > 0)
             _i2cpPort = i2cpPort;
-        // can't remove any options this way...
-        if (opts != null)
-            _opts.putAll(opts);
+        if (opts != null) {
+            synchronized(_opts) {
+                // removed options...
+                for (Iterator<String> iter = _opts.keySet().iterator(); iter.hasNext(); ) {
+                    String k = iter.next();
+                    if (!HIDDEN_I2CP_OPTS.contains(k) && !opts.containsKey(k))
+                        iter.remove();
+                }
+                _opts.putAll(opts);
+            }
+        }
         // this updates the session options and tells the router
         setMaxUpBW(_maxUpBW);
-        _configured = true;
     }
     
     public void setMaxUploaders(int limit) {
         _maxUploaders = limit;
-        _configured = true;
     }
     
     /**
@@ -169,13 +183,16 @@ public class I2PSnarkUtil {
      */
     public void setMaxUpBW(int limit) {
         _maxUpBW = limit;
-        _opts.put(PROP_MAX_BW, Integer.toString(limit * (1024 * 6 / 5)));   // add a little for overhead
-        _configured = true;
+        synchronized(_opts) {
+            _opts.put(PROP_MAX_BW, Integer.toString(limit * (1024 * 6 / 5)));   // add a little for overhead
+        }
         if (_manager != null) {
             I2PSession sess = _manager.getSession();
             if (sess != null) {
                 Properties newProps = new Properties();
-                newProps.putAll(_opts);
+                synchronized(_opts) {
+                    newProps.putAll(_opts);
+                }
                 sess.updateOptions(newProps);
             }
         }
@@ -183,17 +200,24 @@ public class I2PSnarkUtil {
     
     public void setMaxConnections(int limit) {
         _maxConnections = limit;
-        _configured = true;
     }
 
     public void setStartupDelay(int minutes) {
 	_startupDelay = minutes;
-	_configured = true;
     }
     
     public String getI2CPHost() { return _i2cpHost; }
     public int getI2CPPort() { return _i2cpPort; }
-    public Map<String, String> getI2CPOptions() { return _opts; }
+
+    /**
+     *  @return a copy
+     */
+    public Map<String, String> getI2CPOptions() {
+        synchronized(_opts) {
+            return new HashMap<String, String>(_opts);
+        }
+    }
+
     public String getEepProxyHost() { return _proxyHost; }
     public int getEepProxyPort() { return _proxyPort; }
     public boolean getEepProxySet() { return _shouldProxy; }
@@ -225,9 +249,8 @@ public class I2PSnarkUtil {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Connecting to I2P", new Exception("I did it"));
             Properties opts = _context.getProperties();
-            if (_opts != null) {
-                for (Map.Entry<String, String> entry : _opts.entrySet() )
-                    opts.setProperty(entry.getKey(), entry.getValue());
+            synchronized(_opts) {
+                opts.putAll(_opts);
             }
             // override preference and start with two tunnels. IdleChecker will ramp up/down as necessary
             String sin = opts.getProperty("inbound.quantity");
@@ -295,6 +318,11 @@ public class I2PSnarkUtil {
                 opts.setProperty("i2p.streaming.answerPings", "false");
             if (opts.getProperty(I2PClient.PROP_SIGTYPE) == null)
                 opts.setProperty(I2PClient.PROP_SIGTYPE, "EdDSA_SHA512_Ed25519");
+            if (opts.getProperty("i2cp.leaseSetEncType") == null)
+                opts.setProperty("i2cp.leaseSetEncType", "4,0");
+            // assume compressed content
+            if (opts.getProperty(I2PClient.PROP_GZIP) == null)
+                opts.setProperty(I2PClient.PROP_GZIP, "false");
             _manager = I2PSocketManagerFactory.createManager(_i2cpHost, _i2cpPort, opts);
             if (_manager != null)
                 _startedTime = _context.clock().now();