echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* news.xml:

Browse Source 
- move from base to router dir
This commit is contained in:
zzz
2009-06-14 13:00:23 +00:00
parent e8773f6a98
commit 17751ffd57
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java
View File

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

2
apps/routerconsole/jsp/index.jsp
View File

@ -19,7 +19,7 @@ if (System.getProperty("router.consoleNonce") == null) {
<div class="news" id="news"> <div class="news" id="news">
<jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" /> <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="page" value="<%=fpath.getAbsolutePath()%>" />
<jsp:setProperty name="newshelper" property="maxLines" value="300" /> <jsp:setProperty name="newshelper" property="maxLines" value="300" />
<jsp:getProperty name="newshelper" property="content" /> <jsp:getProperty name="newshelper" property="content" />

1
core/java/src/net/i2p/util/WorkingDir.java
View File

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