* news.xml:

- move from base to router dir

apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java

@@ -46,7 +46,7 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
         _log = ctx.logManager().getLog(NewsFetcher.class);
         _instance = this;
         _lastFetch = 0;
-        _newsFile = new File(_context.getBaseDir(), NEWS_FILE);
+        _newsFile = new File(_context.getRouterDir(), NEWS_FILE);
         _tempFile = new File(_context.getTempDir(), TEMP_NEWS_FILE);
         updateLastFetched();
         _lastUpdated = _lastFetch;

apps/routerconsole/jsp/index.jsp

@@ -19,7 +19,7 @@ if (System.getProperty("router.consoleNonce") == null) {
 
 <div class="news" id="news">
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" />
- <% File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/news.xml"); %>
+ <% File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml"); %>
  <jsp:setProperty name="newshelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
  <jsp:setProperty name="newshelper" property="maxLines" value="300" />
  <jsp:getProperty name="newshelper" property="content" />

core/java/src/net/i2p/util/WorkingDir.java

@@ -121,6 +121,7 @@ public class WorkingDir {
         // this one must be after MIGRATE_BASE
         success &= migrateJettyXml(oldDirf, dirf);
         success &= migrateClientsConfig(oldDirf, dirf);
+        success &= copy(new File(oldDirf, "docs/news.xml"), new File(dirf, "docs"));
 
         // Report success or failure
         if (success) {