move DecayingBloomFilter, DecayingHashSet, and xlattice filters from core to router

build.xml

@@ -420,9 +420,9 @@
             splitindex="true"
             doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
             windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
-            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org.xlattice.crypto.filters:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
+            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
             <group title="Streaming Library" packages="net.i2p.client.streaming" />
-            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject" />
+            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
             <group title="Router Console" packages="net.i2p.router.web" />
             <!-- apps and bridges starting here, alphabetical please -->
             <group title="Addressbook Application" packages="net.i2p.addressbook" />
@@ -489,8 +489,8 @@
             splitindex="true"
             doctitle="I2P Unit Test Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
             windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
-            <group title="Core SDK" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org.xlattice.crypto.filters:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
-            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject" />
+            <group title="Core SDK" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.crypto:org.bouncycastle.crypto.*:gnu.crypto.*:gnu.gettext:org:com.nettgryppa.security:net.metanotion:net.metanotion.*" />
+            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
             <sourcepath>
                 <pathelement location="core/java/test" />
                 <pathelement location="router/java/test" />

router/java/src/net/i2p/router/MessageValidator.java

@@ -1,7 +1,7 @@
 package net.i2p.router;
 
-import net.i2p.util.DecayingBloomFilter;
-import net.i2p.util.DecayingHashSet;
+import net.i2p.router.util.DecayingBloomFilter;
+import net.i2p.router.util.DecayingHashSet;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/transport/udp/InboundMessageFragments.java

@@ -4,8 +4,8 @@ import java.util.Map;
 
 import net.i2p.data.Hash;
 import net.i2p.router.RouterContext;
-import net.i2p.util.DecayingBloomFilter;
-import net.i2p.util.DecayingHashSet;
+import net.i2p.router.util.DecayingBloomFilter;
+import net.i2p.router.util.DecayingHashSet;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java

@@ -3,9 +3,9 @@ package net.i2p.router.tunnel;
 import net.i2p.data.ByteArray;
 import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
+import net.i2p.router.util.DecayingBloomFilter;
+import net.i2p.router.util.DecayingHashSet;
 import net.i2p.util.ByteCache;
-import net.i2p.util.DecayingBloomFilter;
-import net.i2p.util.DecayingHashSet;
 
 /**
  * Manage the IV validation for all of the router's tunnels by way of a big

router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java

@@ -9,8 +9,8 @@ import net.i2p.data.PrivateKey;
 import net.i2p.data.SessionKey;
 import net.i2p.data.i2np.BuildRequestRecord;
 import net.i2p.data.i2np.TunnelBuildMessage;
-import net.i2p.util.DecayingBloomFilter;
-import net.i2p.util.DecayingHashSet;
+import net.i2p.router.util.DecayingBloomFilter;
+import net.i2p.router.util.DecayingHashSet;
 import net.i2p.util.Log;
 
 /**

router/java/src/net/i2p/router/util/DecayingBloomFilter.java

@@ -1,4 +1,4 @@
-package net.i2p.util;
+package net.i2p.router.util;
 
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -6,6 +6,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
+import net.i2p.util.Log;
+import net.i2p.util.SimpleTimer;
 
 import org.xlattice.crypto.filters.BloomSHA1;
 
@@ -17,13 +19,11 @@ import org.xlattice.crypto.filters.BloomSHA1;
  * this may be refactored to allow tighter control of the size necessary for the
  * contained bloom filters.
  *
- * Deprecated for use outside of the router; to be moved to router.jar.
- *
  * See main() for an analysis of false positive rate.
  * See BloomFilterIVValidator for instantiation parameters.
  * See DecayingHashSet for a smaller and simpler version.
  * @see net.i2p.router.tunnel.BloomFilterIVValidator
- * @see net.i2p.util.DecayingHashSet
+ * @see net.i2p.router.util.DecayingHashSet
  */
 public class DecayingBloomFilter {
     protected final I2PAppContext _context;

router/java/src/net/i2p/router/util/DecayingHashSet.java

@@ -1,9 +1,11 @@
-package net.i2p.util;
+package net.i2p.router.util;
 
 import java.util.Random;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
+import net.i2p.util.ConcurrentHashSet;
+import net.i2p.util.Log;
 
 
 /**
@@ -54,8 +56,6 @@ import net.i2p.data.DataHelper;
  *
  * This performs about twice as fast as DBF in the test below.
  *
- * Deprecated for use outside of the router; to be moved to router.jar.
- *
  * @author zzz
  */
 public class DecayingHashSet extends DecayingBloomFilter {