From 59bd51a419a6de2b5bcdeb03699140ccfc5192f4 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 8 Jan 2012 14:08:14 +0000
Subject: [PATCH] move ReadConfigJob

---
 history.txt                                   | 43 +++++++++++++++----
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 .../i2p/router/startup/BootCommSystemJob.java |  1 +
 .../{startup => tasks}/ReadConfigJob.java     |  2 +-
 4 files changed, 38 insertions(+), 10 deletions(-)
 rename router/java/src/net/i2p/router/{startup => tasks}/ReadConfigJob.java (98%)

diff --git a/history.txt b/history.txt
index d3acecab0d..cf153fc660 100644
--- a/history.txt
+++ b/history.txt
@@ -1,27 +1,54 @@
+2012-01-08 zzz
+  * Plugins:
+    - Enforce min and max Jetty versions at plugin installation
+    - Enforce I2P, Java, and Jetty versions at plugin startup too
+  * Router:
+    - No longer check for updates or start any threads in the Router constructor,
+    - for ease in building multiple routers in the JVM,
+    - and also because starting threads in a constructor is bad practice.
+    - All threads now start in runRouter().
+    - Installation of updates now only happens via Router.main().
+  * RouterInfo, RouterAddress: Optimizations and integrity checks
+    - Remove synchronization
+    - Do not allow contents to change after being set, throw IllegalStateException
+    - Do not copy contents out in getters
+    - Make options final
+    - Add getOption() and getOptionsMap() methods
+  * Router shutdown:
+    - Fix failsafe shutdown hook broken in 0.8.8;
+      HUP, INT, and TERM signals should now shut down cleanly.
+    - Shutdown hook no longer prevents other hooks from running
+    - Trap HUP, if router.gracefulHUP=true, and do graceful shutdown.
+      Only under wrapper, non-Windows.
+    - i2prouter stop now uses SIGTERM
+    - Implement i2prouter graceful using SIGHUP (ticket #580)
+    - Configure wrapper to ignore SIGUSR1 and SIGUSR2 as they will shut down
+      or crash the JVM
+
 2012-01-06 kytv
- * EepGet: If transfer fails, exit with status 1 (fixes #576)
+  * EepGet: If transfer fails, exit with status 1 (fixes #576)
 
 * 2012-01-06 0.8.12 released
 
 2012-01-04 kytv
- * Update geoip.txt based on Maxmind GeoLite Country database from 2011-12-08
+  * Update geoip.txt based on Maxmind GeoLite Country database from 2011-12-08
 
 2012-01-02 kytv
- * Wrapper 3.5.13 for everything other than armv7.
+  * Wrapper 3.5.13 for everything other than armv7.
 
 2012-01-02 zzz
- * Fix webapp PortMapper lookup for SSL-only console
- * Wrapper 3.5.13 for arm v7
+  * Fix webapp PortMapper lookup for SSL-only console
+  * Wrapper 3.5.13 for arm v7
 
 2011-12-31 zzz
- * Fix log NPE when saveConfig() fails at startup, thx kytv
+  * Fix log NPE when saveConfig() fails at startup, thx kytv
    (backport from jetty6 branch)
 
 2011-12-30 zzz
- * New Estonian translation thanks ajutine
+  * New Estonian translation thanks ajutine
 
 2011-12-27 kytv
- * Spanish and Swedish translation updates from Transifex
+  * Spanish and Swedish translation updates from Transifex
 
 2011-12-23 zzz
   * Logging: Eliminate LogWriter/LogManager deadlock
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b00998..87e5bffca0 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 = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
index 52cae334af..c6bd62c762 100644
--- a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
+++ b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
@@ -12,6 +12,7 @@ import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
 import net.i2p.router.RouterContext;
 import net.i2p.router.RouterClock;
+import net.i2p.router.tasks.ReadConfigJob;
 import net.i2p.util.Log;
 
 /** This actually boots almost everything */
diff --git a/router/java/src/net/i2p/router/startup/ReadConfigJob.java b/router/java/src/net/i2p/router/tasks/ReadConfigJob.java
similarity index 98%
rename from router/java/src/net/i2p/router/startup/ReadConfigJob.java
rename to router/java/src/net/i2p/router/tasks/ReadConfigJob.java
index fdba0678d5..b11ce861f7 100644
--- a/router/java/src/net/i2p/router/startup/ReadConfigJob.java
+++ b/router/java/src/net/i2p/router/tasks/ReadConfigJob.java
@@ -1,4 +1,4 @@
-package net.i2p.router.startup;
+package net.i2p.router.tasks;
 /*
  * free (adj.): unencumbered; not under the control of others
  * Written by jrandom in 2003 and released into the public domain