Author: toad
Date: 2007-05-10 11:26:01 +0000 (Thu, 10 May 2007)
New Revision: 13195
Modified:
trunk/freenet/src/freenet/client/async/USKManager.java
trunk/freenet/src/freenet/clients/http/NinjaSpider.java
trunk/freenet/src/freenet/clients/http/Spider.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeARKInserter.java
trunk/freenet/src/freenet/node/fcp/FCPClient.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/updater/RevocationChecker.java
Log:
Un-break the build. :)
Modified: trunk/freenet/src/freenet/client/async/USKManager.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKManager.java 2007-05-10
11:18:36 UTC (rev 13194)
+++ trunk/freenet/src/freenet/client/async/USKManager.java 2007-05-10
11:26:01 UTC (rev 13195)
@@ -45,7 +45,7 @@
public USKManager(NodeClientCore core) {
- backgroundFetchContext =
core.makeClient(RequestStarter.UPDATE_PRIORITY_CLASS).getFetcherContext();
+ backgroundFetchContext =
core.makeClient(RequestStarter.UPDATE_PRIORITY_CLASS).getFetchContext();
backgroundFetchContext.followRedirects = false;
backgroundFetchContext.uskManager = this;
this.chkRequestScheduler =
core.requestStarters.chkFetchScheduler;
Modified: trunk/freenet/src/freenet/clients/http/NinjaSpider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2007-05-10
11:18:36 UTC (rev 13194)
+++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2007-05-10
11:26:01 UTC (rev 13195)
@@ -684,7 +684,7 @@
*/
public void setPluginManager(PluginManager pluginManager) {
this.core = pluginManager.getClientCore();
- this.ctx = core.makeClient((short) 0).getFetcherContext();
+ this.ctx = core.makeClient((short) 0).getFetchContext();
ctx.maxSplitfileBlockRetries = 10;
ctx.maxNonSplitfileRetries = 10;
ctx.maxTempLength = 2 * 1024 * 1024;
Modified: trunk/freenet/src/freenet/clients/http/Spider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Spider.java 2007-05-10 11:18:36 UTC
(rev 13194)
+++ trunk/freenet/src/freenet/clients/http/Spider.java 2007-05-10 11:26:01 UTC
(rev 13195)
@@ -422,7 +422,7 @@
*/
public void setPluginManager(PluginManager pluginManager) {
this.core = pluginManager.getClientCore();
- this.ctx = core.makeClient((short) 0).getFetcherContext();
+ this.ctx = core.makeClient((short) 0).getFetchContext();
ctx.maxSplitfileBlockRetries = 10;
ctx.maxNonSplitfileRetries = 10;
ctx.maxTempLength = 2 * 1024 * 1024;
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-05-10 11:18:36 UTC (rev
13194)
+++ trunk/freenet/src/freenet/node/Node.java 2007-05-10 11:26:01 UTC (rev
13195)
@@ -1355,7 +1355,7 @@
pluginManager = new PluginManager(this);
pluginManager2 = new
freenet.oldplugins.plugin.PluginManager(this);
- FetchContext ctx = clientCore.makeClient((short)0,
true).getFetcherContext();
+ FetchContext ctx = clientCore.makeClient((short)0,
true).getFetchContext();
ctx.allowSplitfiles = false;
ctx.dontEnterImplicitArchives = true;
Modified: trunk/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeARKInserter.java 2007-05-10 11:18:36 UTC
(rev 13194)
+++ trunk/freenet/src/freenet/node/NodeARKInserter.java 2007-05-10 11:26:01 UTC
(rev 13195)
@@ -139,7 +139,7 @@
inserter = new ClientPutter(this, b, uri,
new ClientMetadata("text/plain") /* it
won't quite fit in an SSK anyway */,
- node.clientCore.makeClient((short)0,
true).getInserterContext(true),
+ node.clientCore.makeClient((short)0,
true).getInsertContext(true),
node.clientCore.requestStarters.chkPutScheduler,
node.clientCore.requestStarters.sskPutScheduler,
RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, false, this, null, null);
try {
Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java 2007-05-10 11:18:36 UTC
(rev 13194)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java 2007-05-10 11:26:01 UTC
(rev 13195)
@@ -36,8 +36,8 @@
this.core = server.core;
this.client = core.makeClient((short)0);
this.isGlobalQueue = isGlobalQueue;
- defaultFetchContext = client.getFetcherContext();
- defaultInsertContext = client.getInserterContext(false);
+ defaultFetchContext = client.getFetchContext();
+ defaultInsertContext = client.getInsertContext(false);
clientsWatching = new LinkedList();
watchGlobalVerbosityMask = Integer.MAX_VALUE;
toStart = new LinkedList();
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-05-10 11:18:36 UTC
(rev 13194)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-05-10 11:26:01 UTC
(rev 13195)
@@ -109,8 +109,8 @@
// This one is only used to get the default settings.
Individual FCP conns
// will make their own.
HighLevelSimpleClient client = core.makeClient((short)0);
- defaultFetchContext = client.getFetcherContext();
- defaultInsertContext = client.getInserterContext(false);
+ defaultFetchContext = client.getFetchContext();
+ defaultInsertContext = client.getInsertContext(false);
globalClient = new FCPClient("Global Queue", this, null, true);
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2007-05-10
11:18:36 UTC (rev 13194)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2007-05-10
11:26:01 UTC (rev 13195)
@@ -60,7 +60,7 @@
this.isFetching = false;
this.extUpdate = extUpdate;
- FetchContext tempContext = core.makeClient((short)0,
true).getFetcherContext();
+ FetchContext tempContext = core.makeClient((short)0,
true).getFetchContext();
tempContext.allowSplitfiles = true;
tempContext.dontEnterImplicitArchives = false;
this.ctx = tempContext;
Modified: trunk/freenet/src/freenet/node/updater/RevocationChecker.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/RevocationChecker.java
2007-05-10 11:18:36 UTC (rev 13194)
+++ trunk/freenet/src/freenet/node/updater/RevocationChecker.java
2007-05-10 11:26:01 UTC (rev 13195)
@@ -36,7 +36,7 @@
core = manager.node.clientCore;
this.revocationDNFCounter = 0;
this.logMINOR = Logger.shouldLog(Logger.MINOR, this);
- ctxRevocation = core.makeClient((short)0,
true).getFetcherContext();
+ ctxRevocation = core.makeClient((short)0,
true).getFetchContext();
ctxRevocation.allowSplitfiles = false;
ctxRevocation.cacheLocalRequests = false;
ctxRevocation.maxArchiveLevels = 1;
