Author: toad
Date: 2008-02-12 14:11:19 +0000 (Tue, 12 Feb 2008)
New Revision: 17821
Modified:
trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/NinjaSpider.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/Spider.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/plugins/XMLSpider/XMLSpider.java
Log:
Move BookmarkManager into fproxy.
So we don't poll bookmarks for updates if fproxy isn't enabled.
Modified: trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
2008-02-12 14:03:50 UTC (rev 17820)
+++ trunk/freenet/src/freenet/clients/http/BookmarkEditorToadlet.java
2008-02-12 14:11:19 UTC (rev 17821)
@@ -31,10 +31,10 @@
private final BookmarkManager bookmarkManager;
private String cutedPath;
- BookmarkEditorToadlet(HighLevelSimpleClient client, NodeClientCore
core) {
+ BookmarkEditorToadlet(HighLevelSimpleClient client, NodeClientCore
core, BookmarkManager bookmarks) {
super(client);
this.core = core;
- this.bookmarkManager = core.bookmarkManager;
+ this.bookmarkManager = bookmarks;
this.cutedPath = null;
}
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-02-12
14:03:50 UTC (rev 17820)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-02-12
14:11:19 UTC (rev 17821)
@@ -13,6 +13,7 @@
import freenet.client.FetchException;
import freenet.client.FetchResult;
import freenet.client.HighLevelSimpleClient;
+import freenet.clients.http.bookmark.BookmarkManager;
import freenet.clients.http.filter.ContentFilter;
import freenet.clients.http.filter.UnsafeContentTypeException;
import freenet.clients.http.filter.ContentFilter.FilterOutput;
@@ -595,7 +596,7 @@
return f;
}
- public static void maybeCreateFProxyEtc(NodeClientCore core, Node node,
Config config, SimpleToadletServer server) throws IOException {
+ public static void maybeCreateFProxyEtc(NodeClientCore core, Node node,
Config config, SimpleToadletServer server, BookmarkManager bookmarks) throws
IOException {
// FIXME how to change these on the fly when the interface
language is changed?
@@ -610,7 +611,7 @@
PproxyToadlet pproxy = new PproxyToadlet(client, node, core);
server.register(pproxy, "/plugins/", true,
"FProxyToadlet.pluginsTitle", "FProxyToadlet.plugins", true, null);
- WelcomeToadlet welcometoadlet = new WelcomeToadlet(client,
core, node);
+ WelcomeToadlet welcometoadlet = new WelcomeToadlet(client,
core, node, bookmarks);
server.register(welcometoadlet, "/welcome/", true, false);
PluginToadlet pluginToadlet = new PluginToadlet(client,
node.pluginManager2, core);
@@ -642,7 +643,7 @@
LocalFileInsertToadlet localFileInsertToadlet = new
LocalFileInsertToadlet(core, client);
server.register(localFileInsertToadlet, "/files/", true, false);
- BookmarkEditorToadlet bookmarkEditorToadlet = new
BookmarkEditorToadlet(client, core);
+ BookmarkEditorToadlet bookmarkEditorToadlet = new
BookmarkEditorToadlet(client, core, bookmarks);
server.register(bookmarkEditorToadlet, "/bookmarkEditor/",
true, false);
BrowserTestToadlet browsertTestToadlet = new
BrowserTestToadlet(client, core);
Modified: trunk/freenet/src/freenet/clients/http/NinjaSpider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2008-02-12
14:03:50 UTC (rev 17820)
+++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2008-02-12
14:11:19 UTC (rev 17821)
@@ -698,7 +698,7 @@
* @see freenet.oldplugins.plugin.Plugin#startPlugin()
*/
public void startPlugin() {
- FreenetURI[] initialURIs =
core.bookmarkManager.getBookmarkURIs();
+ FreenetURI[] initialURIs = core.getBookmarkURIs();
for (int i = 0; i < initialURIs.length; i++)
queueURI(initialURIs[i]);
stopped = false;
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-02-12 14:03:50 UTC (rev 17820)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-02-12 14:11:19 UTC (rev 17821)
@@ -22,6 +22,7 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import freenet.clients.http.bookmark.BookmarkManager;
import freenet.config.EnumerableOptionCallback;
import freenet.config.InvalidConfigValueException;
import freenet.config.SubConfig;
@@ -29,6 +30,7 @@
import freenet.io.AllowedHosts;
import freenet.io.NetworkInterface;
import freenet.io.SSLNetworkInterface;
+import freenet.keys.FreenetURI;
import freenet.l10n.L10n;
import freenet.node.NodeClientCore;
import freenet.support.Executor;
@@ -69,6 +71,7 @@
private NodeClientCore core;
private final Executor executor;
private boolean doRobots;
+ public BookmarkManager bookmarkManager;
static boolean isPanicButtonToBeShown;
public static final int DEFAULT_FPROXY_PORT = 8888;
@@ -212,8 +215,9 @@
if(haveCalledFProxy) return;
haveCalledFProxy = true;
}
+ bookmarkManager = new BookmarkManager(core, null);
try {
- FProxyToadlet.maybeCreateFProxyEtc(core, core.node,
core.node.config, SimpleToadletServer.this);
+ FProxyToadlet.maybeCreateFProxyEtc(core, core.node,
core.node.config, this, bookmarkManager);
} catch (IOException e) {
Logger.error(this, "Could not start fproxy: "+e, e);
System.err.println("Could not start fproxy:");
@@ -593,4 +597,13 @@
return myThread != null;
}
+ public BookmarkManager getBookmarks() {
+ return bookmarkManager;
+ }
+
+ public FreenetURI[] getBookmarkURIs() {
+ if(bookmarkManager == null) return new FreenetURI[0];
+ return bookmarkManager.getBookmarkURIs();
+ }
+
}
Modified: trunk/freenet/src/freenet/clients/http/Spider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Spider.java 2008-02-12 14:03:50 UTC
(rev 17820)
+++ trunk/freenet/src/freenet/clients/http/Spider.java 2008-02-12 14:11:19 UTC
(rev 17821)
@@ -85,7 +85,7 @@
Thread.sleep(30 * 1000); // Let the node start up
} catch (InterruptedException e){}
- FreenetURI[] initialURIs =
core.bookmarkManager.getBookmarkURIs();
+ FreenetURI[] initialURIs = core.getBookmarkURIs();
for (int i = 0; i < initialURIs.length; i++)
queueURI(initialURIs[i]);
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-02-12
14:03:50 UTC (rev 17820)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2008-02-12
14:11:19 UTC (rev 17821)
@@ -43,11 +43,11 @@
final Node node;
final BookmarkManager bookmarkManager;
- WelcomeToadlet(HighLevelSimpleClient client, NodeClientCore core, Node
node) {
+ WelcomeToadlet(HighLevelSimpleClient client, NodeClientCore core, Node
node, BookmarkManager bookmarks) {
super(client);
this.node = node;
this.core = core;
- this.bookmarkManager = core.bookmarkManager;
+ this.bookmarkManager = bookmarks;
try {
manageBookmarksURI = new URI("/welcome/?managebookmarks");
} catch (URISyntaxException e) {
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2008-02-12 14:03:50 UTC
(rev 17820)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2008-02-12 14:11:19 UTC
(rev 17821)
@@ -34,6 +34,7 @@
import freenet.keys.ClientKeyBlock;
import freenet.keys.ClientSSK;
import freenet.keys.ClientSSKBlock;
+import freenet.keys.FreenetURI;
import freenet.keys.Key;
import freenet.keys.KeyBlock;
import freenet.keys.NodeCHK;
@@ -98,8 +99,6 @@
final FCPServer fcpServer;
FProxyToadlet fproxyServlet;
final SimpleToadletServer toadletContainer;
- // FIXME why isn't this just in fproxy?
- public BookmarkManager bookmarkManager;
public final BackgroundBlockEncoder backgroundBlockEncoder;
/** If true, allow extra path components at the end of URIs */
public boolean ignoreTooManyPathComponents;
@@ -350,8 +349,6 @@
throw new
NodeInitException(NodeInitException.EXIT_COULD_NOT_START_FCP, "Could not start
FCP: "+e);
}
- bookmarkManager = new BookmarkManager(this, oldConfig);
-
// FProxy
// FIXME this is a hack, the real way to do this is plugins
this.alerts.register(startingUpAlert = new
SimpleUserAlert(true, l10n("startingUpTitle"), l10n("startingUp"),
UserAlert.MINOR));
@@ -1146,4 +1143,8 @@
requestStarters.chkFetchScheduler;
sched.dequeueOfferedKey(key);
}
+
+ public FreenetURI[] getBookmarkURIs() {
+ return toadletContainer.getBookmarkURIs();
+ }
}
Modified: trunk/plugins/XMLSpider/XMLSpider.java
===================================================================
--- trunk/plugins/XMLSpider/XMLSpider.java 2008-02-12 14:03:50 UTC (rev
17820)
+++ trunk/plugins/XMLSpider/XMLSpider.java 2008-02-12 14:11:19 UTC (rev
17821)
@@ -197,7 +197,7 @@
private void startSomeRequests() {
- FreenetURI[] initialURIs =
core.bookmarkManager.getBookmarkURIs();
+ FreenetURI[] initialURIs = core.getBookmarkURIs();
for (int i = 0; i < initialURIs.length; i++)
{
queueURI(initialURIs[i]);
