diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedGenerator.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedGenerator.java index 70d993aa5..8f382eae0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedGenerator.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedGenerator.java @@ -3,6 +3,7 @@ package net.i2p.router.web.helpers; import java.io.File; import java.io.IOException; +import net.i2p.router.networkdb.reseed.ReseedBundler; import net.i2p.router.web.HelperBase; /** diff --git a/history.txt b/history.txt index 9e53ede00..b172dc3c5 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2018-04-04 zzz + * Reseed: Move ReseedBundler from console to router (ticket #2203) + 2018-04-03 zzz * Stats: Enable per-tunnel bw stats by default (tickets #2106, #2145) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 9535f12e9..f7d70ed0a 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 23; + public final static long BUILD = 24; /** for example "-test" */ public final static String EXTRA = "-rc"; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedBundler.java b/router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java similarity index 97% rename from apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedBundler.java rename to router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java index 7e5ab857d..898a39864 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedBundler.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java @@ -1,4 +1,4 @@ -package net.i2p.router.web.helpers; +package net.i2p.router.networkdb.reseed; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -36,10 +36,11 @@ import net.i2p.router.RouterContext; * * Caller must delete file when done. * - * @since 0.9.19 modified from BundleRouterInfos in installer/tools + * @since 0.9.19 modified from BundleRouterInfos in installer/tools, + * moved from routerconsole to net.i2p.router.networkdb.reseed in 0.9.34 * */ -class ReseedBundler { +public class ReseedBundler { private final RouterContext _context; private final static String ROUTERINFO_PREFIX = "routerInfo-";