propagate from branch 'i2p.i2p.zzz.test' (head 8eb14086613c349e9f2e820ca3ffdca924dbf1bd)

to branch 'i2p.i2p' (head a4b03a4320a1bf09574f0b338a89f2bd3819ca81)

apps/BOB/nbproject/project.properties

@@ -24,40 +24,23 @@ dist.dir=dist
 dist.jar=${dist.dir}/BOB.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
-file.reference.build-javadoc=../../../i2p.i2p/build/javadoc
-file.reference.core.jar=../i2p.i2p/core/dist/core.jar
-file.reference.i2p.jar=../../bob/i2p/i2p.i2p/build/i2p.jar
-file.reference.i2p.jar-1=../../build/i2p.jar
-file.reference.i2p.jar-2=../i2p.i2p/core/java/build/i2p.jar
-file.reference.i2p.jar-3=../../../i2p.i2p/build/i2p.jar
-file.reference.i2ptunnel.jar=../../../i2p.i2p/build/i2ptunnel.jar
-file.reference.java-src=../i2p.i2p/core/java/src/
-file.reference.jbigi.jar=../../bob/i2p/i2p.i2p/build/jbigi.jar
-file.reference.mstreaming.jar=../../bob/i2p/i2p.i2p/build/mstreaming.jar
-file.reference.mstreaming.jar-1=../../build/mstreaming.jar
-file.reference.mstreaming.jar-2=../../../i2p.i2p/build/mstreaming.jar
-file.reference.NetBeansProjects-i2p.i2p=../i2p.i2p/
-file.reference.router.jar=../../build/router.jar
-file.reference.streaming.jar=../../bob/i2p/i2p.i2p/build/streaming.jar
-file.reference.streaming.jar-1=../../../i2p.i2p/build/streaming.jar
-file.reference.wrapper-freebsd=../../installer/lib/wrapper/freebsd/
-file.reference.wrapper-linux=../../installer/lib/wrapper/linux/
-file.reference.wrapper-linux64=../../installer/lib/wrapper/linux64/
-file.reference.wrapper-macosx=../../installer/lib/wrapper/macosx/
-file.reference.wrapper-solaris=../../installer/lib/wrapper/solaris/
-file.reference.wrapper-win32=../../installer/lib/wrapper/win32/
+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.mstreaming.jar=../ministreaming/java/build/mstreaming.jar
+file.reference.router.jar=../../router/java/build/router.jar
+file.reference.streaming.jar=../streaming/java/build/streaming.jar
 file.reference.wrapper.jar=../../installer/lib/wrapper/linux/wrapper.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.wrapper.jar}:\
-    ${file.reference.streaming.jar-1}:\
-    ${file.reference.i2ptunnel.jar}:\
-    ${file.reference.i2p.jar-1}:\
     ${file.reference.router.jar}:\
-    ${file.reference.mstreaming.jar-1}:\
-    ${file.reference.mstreaming.jar-2}:\
-    ${file.reference.i2p.jar-3}
+    ${file.reference.i2ptunnel.jar}:\
+    ${file.reference.mstreaming.jar}:\
+    ${file.reference.streaming.jar}:\
+    ${file.reference.wrapper.jar}:\
+    ${file.reference.i2p.jar}:\
+    ${file.reference.router.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

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

@@ -278,6 +278,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
             }
         }
         sockManager.setName("Client");
+        tunnel.addSession(sockManager.getSession());
         return sockManager;
     }
 

history.txt

@@ -1,3 +1,42 @@
+2009-04-03 zzz
+    * Console:
+      - Fix bug with IE buttons not working,
+        because it sends the label instead of the value
+      - Display version of downloaded update
+    * Update:
+      - Change default to "Download and verify"
+      - Change news fetch default to 24h (was 12h)
+
+2009-04-03 sponge
+    * Fix broken dependencies for BOB.jar
+    * Router build version incremented to 5.
+
+2009-04-02 zzz
+    * Profiles:
+      - Remove unused calculators and RateStats:
+        CapacityCalculator, StrictSpeedCalculator, IsFailingCalculator;
+        sendFailureSize, processSuccessRate, processfailureRate, commErrorRate,
+        tunnelTestResponseTimeSlow
+      - Reduced number of Rates in these RateStats:
+        sendSuccessSize, receiveSize, rejectRate, failRate
+      - ~5KB/profile savings total
+      - Deflate speed calculation once an hour instead of once a day,
+        to improve fast tier selection
+      - Remove dup comment in persisted files
+    * StatisticsManager - effective in 0.7.2:
+      - Spoof uptime to 90m for all
+      - Change tunnel stats from 10m to 60m
+    * Transport:
+      - Maintain a router hash -> IP map in transport,
+        to support additional IP checks (unused for now)
+      - Catch error on pre-2.6 kernels
+      - Some concurrent conversion
+      - Fix an HTML error on peers.jsp
+
+2009-04-01 zzz
+    * I2PTunnel: Fix tunnel close
+      http://forum.i2p/viewtopic.php?t=3231
+
 2009-03-30 zzz
     * I2CP:
       - Implement BandwidthLimitsMessage

router/java/src/net/i2p/router/RouterVersion.java

@@ -17,7 +17,7 @@ import net.i2p.CoreVersion;
 public class RouterVersion {
     public final static String ID = "$Revision: 1.548 $ $Date: 2008-06-07 23:00:00 $";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 1;
+    public final static long BUILD = 6;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);