Author: nextgens
Date: 2008-08-14 17:20:20 +0000 (Thu, 14 Aug 2008)
New Revision: 21851
Removed:
trunk/freenet/src/freenet/clients/http/NinjaSpider.java
trunk/freenet/src/freenet/clients/http/PluginToadlet.java
trunk/freenet/src/freenet/clients/http/Spider.java
trunk/freenet/src/freenet/oldplugins/plugin/HttpPlugin.java
trunk/freenet/src/freenet/oldplugins/plugin/Plugin.java
trunk/freenet/src/freenet/oldplugins/plugin/PluginManager.java
trunk/freenet/src/freenet/oldplugins/plugin/TestHttpPlugin.java
trunk/freenet/src/freenet/oldplugins/plugin/TestPlugin.java
Modified:
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/config/SubConfig.java
trunk/freenet/src/freenet/node/Node.java
Log:
Remove the old plugin framework; it's about time to get rid of it!
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-08-14
17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-08-14
17:20:20 UTC (rev 21851)
@@ -94,6 +94,7 @@
return "GET";
}
+ @Override
public void handlePost(URI uri, HTTPRequest req, ToadletContext ctx)
throws ToadletContextClosedException, IOException, RedirectException {
String ks = uri.getPath();
@@ -319,9 +320,10 @@
return false;
}
+ @Override
public void handleGet(URI uri, HTTPRequest httprequest, ToadletContext
ctx)
throws ToadletContextClosedException, IOException,
RedirectException {
- //String ks = uri.toString();
+
String ks = uri.getPath();
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
@@ -663,9 +665,6 @@
WelcomeToadlet welcometoadlet = new WelcomeToadlet(client,
core, node, bookmarks);
server.register(welcometoadlet, "/welcome/", true, false);
- PluginToadlet pluginToadlet = new PluginToadlet(client,
node.pluginManager2, core);
- server.register(pluginToadlet, "/plugin/", true, true);
-
ConfigToadlet configtoadlet = new ConfigToadlet(client, config,
node, core);
server.register(configtoadlet, "/config/", true,
"FProxyToadlet.configTitle", "FProxyToadlet.config", true, null);
Deleted: trunk/freenet/src/freenet/clients/http/NinjaSpider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2008-08-14
17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2008-08-14
17:20:20 UTC (rev 21851)
@@ -1,739 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.clients.http;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-import freenet.client.ClientMetadata;
-import freenet.client.FetchException;
-import freenet.client.FetchResult;
-import freenet.client.FetchContext;
-import freenet.client.InsertException;
-import freenet.client.async.BaseClientPutter;
-import freenet.client.async.ClientCallback;
-import freenet.client.async.ClientGetter;
-import freenet.clients.http.filter.ContentFilter;
-import freenet.clients.http.filter.FoundURICallback;
-import freenet.clients.http.filter.UnsafeContentTypeException;
-import freenet.keys.FreenetURI;
-import freenet.node.NodeClientCore;
-import freenet.node.RequestStarter;
-import freenet.oldplugins.plugin.HttpPlugin;
-import freenet.oldplugins.plugin.PluginManager;
-import freenet.support.HTMLNode;
-import freenet.support.Logger;
-import freenet.support.MultiValueTable;
-import freenet.support.api.Bucket;
-import freenet.support.api.HTTPRequest;
-import freenet.support.io.NullBucketFactory;
-
-/**
- * FIXME move to a proper plugin.
- *
- * FIXME localise - and how to do that for plugins? Should they use the main
L10n?
- *
- * NinjaSpider. Produces a ninj^W err ... an XML index.
- *
- *
- * I think regarding the name, a little explanation is required:
- *
- * This name comes from my flatmate, David Anderson. It originated in the
following discussion over dinner:
- * him> I've just thought of something weird...
- * me> oO
- * him> The term "spider" for indexing software comes from the analogy "a
spider on the web", right ?
- * me> Yeeess... ?
- * him> So, if you're writing a spider for a darknet, isn't it a .... *Ninja
Spider* ? :D
- *
- * Maybe we should stop buying beers ... However, I needed a name for the
spider,
- * and NinjaSpider sounds more fun than XmlSpider, so it stuck :)
- *
- */
-public class NinjaSpider implements HttpPlugin, ClientCallback,
FoundURICallback {
-
-
- long tProducedIndex;
-
- // URIs visited, or fetching, or queued. Added once then forgotten
about.
- private final HashSet visitedURIs = new HashSet();
- private final HashSet urisWithWords = new HashSet();
- private final HashSet failedURIs = new HashSet();
- private final HashSet queuedURISet = new HashSet();
- private final LinkedList queuedURIList = new LinkedList();
- private final HashMap runningFetchesByURI = new HashMap();
- private final HashMap urisByWord = new HashMap();
- private final HashMap titlesOfURIs = new HashMap();
-
- private static final int minTimeBetweenEachIndexRewriting = 10;
-
- // Can have many; this limit only exists to save memory.
- private static final int maxParallelRequests = 20;
- private int maxShownURIs = 50;
-
- private NodeClientCore core;
- private FetchContext ctx;
- private final short PRIORITY_CLASS =
RequestStarter.PREFETCH_PRIORITY_CLASS;
- private boolean stopped = true;
-
- private static final String indexFilename = "new.index.xml";
-
- private static final String pluginName = "Ninja spider";
-
- private static final boolean htmlOnly = true;
-
-
- /* The ones below are required to genereate a correct index, see:
- * http://wiki.freenetproject.org/AnotherFreenetIndexFormat
- */
- private static final String indexTitle= "This is an index";
- private static final String indexOwner = "Another anonymous";
- private static final String indexOwnerEmail = null; /* can be null */
- private final HashMap sizeOfURIs = new HashMap(); /* String (URI) ->
Long */
- private final HashMap mimeOfURIs = new HashMap(); /* String (URI) ->
String */
- private final HashMap lastPositionByURI = new HashMap(); /* String
(URI) -> Integer */ /* Use to determine word position on each uri */
- private final HashMap positionsByWordByURI = new HashMap(); /* String
(URI) -> HashMap (String (word) -> Integer[] (Positions)) */
-
-
-
- private synchronized void queueURI(FreenetURI uri) {
- /* Currently we don't handle PDF or other contents,
- so it's not interresting to download them
- */
-
- String tmp = uri.toString().toLowerCase();
-
- if(htmlOnly
- && (tmp.indexOf(".htm") < 0)
- && (tmp.charAt(tmp.length()-1) != '/'))
- return;
-
- if ((!visitedURIs.contains(uri)) && queuedURISet.add(uri)) {
- queuedURIList.addLast(uri);
- visitedURIs.add(uri);
- }
- }
-
- private void startSomeRequests() {
- ArrayList toStart = null;
- synchronized (this) {
- if (stopped) {
- return;
- }
- int running = runningFetchesByURI.size();
- int queued = queuedURIList.size();
-
- if ((running >= maxParallelRequests) || (queued == 0))
- return;
-
- toStart = new ArrayList(Math.min(maxParallelRequests -
running, queued));
-
- for (int i = running; i < maxParallelRequests; i++) {
- if (queuedURIList.isEmpty())
- break;
- FreenetURI uri = (FreenetURI)
queuedURIList.removeFirst();
- queuedURISet.remove(uri);
- ClientGetter getter = makeGetter(uri);
- toStart.add(getter);
- }
- for (int i = 0; i < toStart.size(); i++) {
- ClientGetter g = (ClientGetter) toStart.get(i);
- try {
- runningFetchesByURI.put(g.getURI(), g);
- g.start();
- } catch (FetchException e) {
- onFailure(e, g);
- }
- }
- }
- }
-
- private ClientGetter makeGetter(FreenetURI uri) {
- ClientGetter g = new ClientGetter(this,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, ctx, PRIORITY_CLASS, this, null, null);
- return g;
- }
-
- public void onSuccess(FetchResult result, ClientGetter state) {
- FreenetURI uri = state.getURI();
- synchronized (this) {
- runningFetchesByURI.remove(uri);
- }
- startSomeRequests();
- ClientMetadata cm = result.getMetadata();
- Bucket data = result.asBucket();
- String mimeType = cm.getMIMEType();
-
- sizeOfURIs.put(uri.toString(), new Long(data.size()));
- mimeOfURIs.put(uri.toString(), mimeType);
-
- try {
- ContentFilter.filter(data, new NullBucketFactory(),
mimeType, new URI("http://127.0.0.1:8888/"; + uri.toString()), this);
- } catch (UnsafeContentTypeException e) {
- return; // Ignore
- } catch (IOException e) {
- Logger.error(this, "Bucket error?: " + e, e);
- } catch (URISyntaxException e) {
- Logger.error(this, "Internal error: " + e, e);
- } finally {
- data.free();
- }
- }
-
- public void onFailure(FetchException e, ClientGetter state) {
- FreenetURI uri = state.getURI();
- synchronized (this) {
- failedURIs.add(uri);
- runningFetchesByURI.remove(uri);
- }
- if (e.newURI != null)
- queueURI(e.newURI);
- else
- queueURI(uri);
- startSomeRequests();
- }
-
- public void onSuccess(BaseClientPutter state) {
- // Ignore
- }
-
- public void onFailure(InsertException e, BaseClientPutter state) {
- // Ignore
- }
-
- public void onGeneratedURI(FreenetURI uri, BaseClientPutter state) {
- // Ignore
- }
-
- public void foundURI(FreenetURI uri) {
- queueURI(uri);
- startSomeRequests();
- }
-
- public void foundURI(FreenetURI uri, boolean inline) {
- queueURI(uri);
- startSomeRequests();
- }
-
- public void onText(String s, String type, URI baseURI) {
-
- FreenetURI uri;
- try {
- uri = new
FreenetURI(baseURI.getPath().substring(1));/*substring(1) because we don't want
the initial '/' */
- } catch (MalformedURLException e) {
- Logger.error(this, "Caught " + e, e);
- return;
- }
-
- if((type != null) && (type.length() != 0) &&
type.toLowerCase().equals("title")
- && (s != null) && (s.length() != 0) && (s.indexOf('\n') <
0)) {
- /* We should have a correct title */
- titlesOfURIs.put(uri.toString(), s);
- type = "title";
- }
- else
- type = null;
-
-
- String[] words = s.split("[^A-Za-z0-9]");
-
- Integer lastPosition = null;
-
- lastPosition = (Integer)lastPositionByURI.get(uri.toString());
-
- if(lastPosition == null)
- lastPosition = new Integer(1); /* We start to count
from 1 */
-
- for (int i = 0; i < words.length; i++) {
- String word = words[i];
- if ((word == null) || (word.length() == 0))
- continue;
- word = word.toLowerCase();
-
- if(type == null)
- addWord(word, lastPosition.intValue() + i, uri);
- else
- addWord(word, -1 * (i+1), uri);
- }
-
- if(type == null) {
- lastPosition = new Integer(lastPosition.intValue() +
words.length);
- lastPositionByURI.put(uri.toString(), lastPosition);
- }
- }
-
- private synchronized void addWord(String word, int position, FreenetURI
uri) {
-
- /* I know that it's bad for i18n */
- /* But words separation or file filtering seems to already
killed words matching [^a-zA-Z] ... */
- if(word.length() < 3)
- return;
-
-
- FreenetURI[] uris = (FreenetURI[]) urisByWord.get(word);
-
- //Integer[] positions = (Integer[])
positionsByWordByURI.get(word);
-
- urisWithWords.add(uri);
-
-
- /* Word position indexation */
- HashMap wordPositionsForOneUri =
(HashMap)positionsByWordByURI.get(uri.toString()); /* For a given URI, take as
key a word, and gives position */
-
- if(wordPositionsForOneUri == null) {
- wordPositionsForOneUri = new HashMap();
- wordPositionsForOneUri.put(word, new Integer[] { new
Integer(position) });
- positionsByWordByURI.put(uri.toString(),
wordPositionsForOneUri);
- } else {
- Integer[] positions =
(Integer[])wordPositionsForOneUri.get(word);
-
- if(positions == null) {
- positions = new Integer[] { new
Integer(position) };
- wordPositionsForOneUri.put(word, positions);
- } else {
- Integer[] newPositions = new
Integer[positions.length + 1];
-
- System.arraycopy(positions, 0, newPositions, 0,
positions.length);
- newPositions[positions.length] = new
Integer(position);
-
- wordPositionsForOneUri.put(word, newPositions);
- }
- }
-
-
-
- /* Words indexation */
- if (uris == null) {
- urisByWord.put(word, new FreenetURI[] { uri });
- } else {
- for (int i = 0; i < uris.length; i++) {
- if (uris[i].equals(uri))
- return;
- }
-
- FreenetURI[] newURIs = new FreenetURI[uris.length + 1];
-
- System.arraycopy(uris, 0, newURIs, 0, uris.length);
- newURIs[uris.length] = uri;
- urisByWord.put(word, newURIs);
- }
-
- if (tProducedIndex + minTimeBetweenEachIndexRewriting * 1000 <
System.currentTimeMillis()) {
- try {
- produceIndex();
- } catch (IOException e) {
- Logger.error(this, "Caught " + e + " while
creating index", e);
- }
- tProducedIndex = System.currentTimeMillis();
- }
- }
-
- /**
- * Produce an XML index in new.index.xml
- */
- private synchronized void produceIndex() throws IOException {
- File outputFile;
- StreamResult resultStream;
-
- if (urisByWord.isEmpty() || urisWithWords.isEmpty()) {
- Logger.normal(this, "No URIs with words -> no index
generation");
- return;
- }
-
- outputFile = new File(indexFilename);
-
- if(outputFile.exists()
- && !outputFile.canWrite()) {
- Logger.error(this, "Spider: Unable to write '" +
indexFilename +"'. Check permissions.");
- return;
- }
-
- resultStream = new StreamResult(outputFile);
-
-
- /* Initialize xml builder */
- Document xmlDoc = null;
- DocumentBuilderFactory xmlFactory = null;
- DocumentBuilder xmlBuilder = null;
- DOMImplementation impl = null;
- Element rootElement = null;
-
- xmlFactory = DocumentBuilderFactory.newInstance();
-
-
- try {
- xmlBuilder = xmlFactory.newDocumentBuilder();
- } catch(javax.xml.parsers.ParserConfigurationException e) {
- /* Will (should ?) never happen */
- Logger.error(this, "Spider: Error while initializing
XML generator: "+e.toString());
- return;
- }
-
-
- impl = xmlBuilder.getDOMImplementation();
-
- /* Starting to generate index */
-
- xmlDoc = impl.createDocument(null, "index", null);
- rootElement = xmlDoc.getDocumentElement();
-
- /* Adding header to the index */
- Element headerElement = xmlDoc.createElement("header");
-
- /* -> title */
- Element subHeaderElement = xmlDoc.createElement("title");
- Text subHeaderText = xmlDoc.createTextNode(indexTitle);
-
- subHeaderElement.appendChild(subHeaderText);
- headerElement.appendChild(subHeaderElement);
-
- /* -> owner */
- subHeaderElement = xmlDoc.createElement("owner");
- subHeaderText = xmlDoc.createTextNode(indexOwner);
-
- subHeaderElement.appendChild(subHeaderText);
- headerElement.appendChild(subHeaderElement);
-
- /* -> owner email */
- if(indexOwnerEmail != null) {
- subHeaderElement = xmlDoc.createElement("email");
- subHeaderText = xmlDoc.createTextNode(indexOwnerEmail);
-
- subHeaderElement.appendChild(subHeaderText);
- headerElement.appendChild(subHeaderElement);
- }
-
-
-
- String[] words = (String[]) urisByWord.keySet().toArray(new
String[urisByWord.size()]);
- Arrays.sort(words);
-
- FreenetURI[] uris = (FreenetURI[]) urisWithWords.toArray(new
FreenetURI[urisWithWords.size()]);
- HashMap urisToNumbers = new HashMap();
-
- /* Adding freesite list to the index */
- Element filesElement = xmlDoc.createElement("files"); /*
filesElement != fileElement */
-
- for (int i = 0; i < uris.length; i++) {
- urisToNumbers.put(uris[i], new Integer(i));
-
- Element fileElement = xmlDoc.createElement("file");
-
- fileElement.setAttribute("id", Integer.toString(i));
- fileElement.setAttribute("key", uris[i].toString());
-
- Long size = (Long)sizeOfURIs.get(uris[i].toString());
-
- if(size == null) {
- Logger.error(this, "Spider: size is missing");
- } else {
- fileElement.setAttribute("size",
size.toString());
- }
- fileElement.setAttribute("mime",
((String)mimeOfURIs.get(uris[i].toString())));
-
- Element titleElement = xmlDoc.createElement("option");
- titleElement.setAttribute("name", "title");
- titleElement.setAttribute("value",
(String)titlesOfURIs.get(uris[i].toString()));
-
- fileElement.appendChild(titleElement);
- filesElement.appendChild(fileElement);
- }
-
-
- /* Adding word index */
- Element keywordsElement = xmlDoc.createElement("keywords");
-
- /* Word by word */
- for (int i = 0; i < words.length; i++) {
- Element wordElement = xmlDoc.createElement("word");
- wordElement.setAttribute("v", words[i]);
-
- FreenetURI[] urisForWord = (FreenetURI[])
urisByWord.get(words[i]);
-
- /* URI by URI */
- for (int j = 0; j < urisForWord.length; j++) {
- FreenetURI uri = urisForWord[j];
- Integer x = (Integer) urisToNumbers.get(uri);
-
- if (x == null) {
- Logger.error(this, "Eh?");
- continue;
- }
-
- Element uriElement =
xmlDoc.createElement("file");
- uriElement.setAttribute("id", x.toString());
-
- /* Position by position */
- HashMap positionsForGivenWord =
(HashMap)positionsByWordByURI.get(uri.toString());
- Integer[] positions =
(Integer[])positionsForGivenWord.get(words[i]);
-
- StringBuffer positionList = new StringBuffer();
-
- for(int k=0; k < positions.length ; k++) {
- if(k!=0)
- positionList.append(',');
-
-
positionList.append(positions[k].toString());
- }
-
-
uriElement.appendChild(xmlDoc.createTextNode(positionList.toString()));
-
- wordElement.appendChild(uriElement);
- }
-
- keywordsElement.appendChild(wordElement);
- }
-
- rootElement.appendChild(headerElement);
- rootElement.appendChild(filesElement);
- rootElement.appendChild(keywordsElement);
-
- /* Serialization */
- DOMSource domSource = new DOMSource(xmlDoc);
- TransformerFactory transformFactory =
TransformerFactory.newInstance();
- Transformer serializer;
-
- try {
- serializer = transformFactory.newTransformer();
- } catch(javax.xml.transform.TransformerConfigurationException
e) {
- Logger.error(this, "Spider: Error while serializing XML
(transformFactory.newTransformer()): "+e.toString());
- return;
- }
-
-
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
- serializer.setOutputProperty(OutputKeys.INDENT,"yes");
-
- /* final step */
- try {
- serializer.transform(domSource, resultStream);
- } catch(javax.xml.transform.TransformerException e) {
- Logger.error(this, "Spider: Error while serializing XML
(transform()): "+e.toString());
- return;
- }
-
- if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Spider: indexes regenerated.");
- }
-
- /**
- * @see
freenet.oldplugins.plugin.HttpPlugin#handleGet(freenet.clients.http.HTTPRequestImpl,
freenet.clients.http.ToadletContext)
- */
- public void handleGet(HTTPRequest request, ToadletContext context)
throws IOException, ToadletContextClosedException {
- String action = request.getParam("action");
- PageMaker pageMaker = context.getPageMaker();
- if ((action == null) || (action.length() == 0)) {
- MultiValueTable responseHeaders = new MultiValueTable();
- responseHeaders.put("Location", "?action=list");
- context.sendReplyHeaders(301, "Redirect",
responseHeaders, "text/html; charset=utf-8", 0);
- return;
- } else if ("list".equals(action)) {
- String listName = request.getParam("listName", null);
-
- HTMLNode pageNode = pageMaker.getPageNode(pluginName,
context);
- HTMLNode contentNode =
pageMaker.getContentNode(pageNode);
-
- /* create copies for multi-threaded use */
- if (listName == null) {
- Map runningFetches = new
HashMap(runningFetchesByURI);
- List queued = new ArrayList(queuedURIList);
- Set visited = new HashSet(visitedURIs);
- Set failed = new HashSet(failedURIs);
-
contentNode.addChild(createNavbar(runningFetches.size(), queued.size(),
visited.size(), failed.size()));
- contentNode.addChild(createAddBox());
- contentNode.addChildren(createList("Running
Fetches", "running", runningFetches.keySet(), maxShownURIs));
- contentNode.addChildren(createList("Queued
URIs", "queued", queued, maxShownURIs));
- contentNode.addChildren(createList("Visited
URIs", "visited", visited, maxShownURIs));
- contentNode.addChildren(createList("Failed
URIs", "failed", failed, maxShownURIs));
- } else {
- contentNode.addChild(createBackBox());
- if ("failed".equals(listName)) {
- Set failed = new HashSet(failedURIs);
-
contentNode.addChildren(createList("Failed URIs", "failed", failed, -1));
- } else if ("visited".equals(listName)) {
- Set visited = new HashSet(visitedURIs);
-
contentNode.addChildren(createList("Visited URIs", "visited", visited, -1));
- } else if ("queued".equals(listName)) {
- List queued = new
ArrayList(queuedURIList);
-
contentNode.addChildren(createList("Queued URIs", "queued", queued, -1));
- } else if ("running".equals(listName)) {
- Map runningFetches = new
HashMap(runningFetchesByURI);
-
contentNode.addChildren(createList("Running Fetches", "running",
runningFetches.keySet(), -1));
- }
- }
- MultiValueTable responseHeaders = new MultiValueTable();
- byte[] responseBytes =
pageNode.generate().getBytes("UTF-8");
- context.sendReplyHeaders(200, "OK", responseHeaders,
"text/html; charset=utf-8", responseBytes.length);
- context.writeData(responseBytes);
- } else if ("add".equals(action)) {
- String uriParam = request.getParam("key");
- try {
- FreenetURI uri = new FreenetURI(uriParam);
- synchronized (this) {
- failedURIs.remove(uri);
- visitedURIs.remove(uri);
- }
- queueURI(uri);
- startSomeRequests();
- } catch (MalformedURLException mue1) {
- sendSimpleResponse(context, "URL invalid", "The
given URI is not valid. Please return and try again.");
- return;
- }
- MultiValueTable responseHeaders = new MultiValueTable();
- responseHeaders.put("Location", "?action=list");
- context.sendReplyHeaders(301, "Redirect",
responseHeaders, "text/html; charset=utf-8", 0);
- return;
- }
- }
-
- /**
- * @see
freenet.oldplugins.plugin.HttpPlugin#handlePost(freenet.clients.http.HTTPRequestImpl,
freenet.clients.http.ToadletContext)
- */
- public void handlePost(HTTPRequest request, ToadletContext context)
throws IOException {
- }
-
- private void sendSimpleResponse(ToadletContext context, String title,
String message) throws ToadletContextClosedException, IOException {
- PageMaker pageMaker = context.getPageMaker();
- HTMLNode pageNode = pageMaker.getPageNode(title, context);
- HTMLNode contentNode = pageMaker.getContentNode(pageNode);
- HTMLNode infobox = contentNode.addChild("div", "class",
"infobox infobox-alert");
- infobox.addChild("div", "class", "infobox-header", title);
- infobox.addChild("div", "class", "infobox-content", message);
- byte[] responseBytes = pageNode.generate().getBytes("utf-8");
- context.sendReplyHeaders(200, "OK", new MultiValueTable(),
"text/html; charset=utf-8", responseBytes.length);
- context.writeData(responseBytes);
- }
-
- private HTMLNode createBackBox() {
- HTMLNode backBox = new HTMLNode("div", "class", "infobox");
- HTMLNode backBoxContent = backBox.addChild("div", "class",
"infobox-content");
- backBoxContent.addChild("#", "Return to the ");
- backBoxContent.addChild("a", "href", "?action=list", "list of
all URIs");
- backBoxContent.addChild("#", ".");
- return backBox;
- }
-
- private HTMLNode createAddBox() {
- HTMLNode addBox = new HTMLNode("div", "class", "infobox");
- addBox.addChild("div", "class", "infobox-header", "Add a URI");
- HTMLNode addForm = addBox.addChild("div", "class",
"infobox-content").addChild("form", new String[] { "action", "method" }, new
String[] { "", "get" });
- addForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "action", "add" });
- addForm.addChild("input", new String[] { "type", "size",
"name", "value" }, new String[] { "text", "40", "key", "" });
- addForm.addChild("input", new String[] { "type", "value" }, new
String[] { "submit", "Add URI" });
- return addBox;
- }
-
- private HTMLNode createNavbar(int running, int queued, int visited, int
failed) {
- HTMLNode infobox = new HTMLNode("div", "class", "infobox
navbar");
- infobox.addChild("div", "class", "infobox-header", "Page
navigation");
- HTMLNode links = infobox.addChild("div", "class",
"infobox-content").addChild("ul");
- links.addChild("li").addChild("a", "href", "#running", "Running
(" + running + ')');
- links.addChild("li").addChild("a", "href", "#queued", "Queued
(" + queued + ')');
- links.addChild("li").addChild("a", "href", "#visited", "Visited
(" + visited + ')');
- links.addChild("li").addChild("a", "href", "#failed", "Failed
(" + failed + ')');
- return infobox;
- }
-
- private HTMLNode[] createList(String listName, String anchorName,
Collection collection, int maxCount) {
- HTMLNode listBox = new HTMLNode("div", "class", "infobox");
- listBox.addChild("div", "class", "infobox-header", listName + "
(" + collection.size() + ')');
- HTMLNode listContent = listBox.addChild("div", "class",
"infobox-content");
- Iterator collectionItems = collection.iterator();
- int itemCount = 0;
- while (collectionItems.hasNext()) {
- FreenetURI uri = (FreenetURI) collectionItems.next();
- listContent.addChild("#", uri.toString());
- listContent.addChild("br");
- if (itemCount++ == maxCount) {
- listContent.addChild("br");
- listContent.addChild("a", "href",
"?action=list&listName=" + anchorName, "Show all\u2026");
- break;
- }
- }
- return new HTMLNode[] { new HTMLNode("a", "name", anchorName),
listBox };
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#getPluginName()
- */
- public String getPluginName() {
- return pluginName;
- }
-
- /**
- * @see
freenet.oldplugins.plugin.Plugin#setPluginManager(freenet.oldplugins.plugin.PluginManager)
- */
- public void setPluginManager(PluginManager pluginManager) {
- this.core = pluginManager.getClientCore();
- this.ctx = core.makeClient((short) 0).getFetchContext();
- ctx.maxSplitfileBlockRetries = 10;
- ctx.maxNonSplitfileRetries = 10;
- ctx.maxTempLength = 2 * 1024 * 1024;
- ctx.maxOutputLength = 2 * 1024 * 1024;
- tProducedIndex = System.currentTimeMillis();
- }
-
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#startPlugin()
- */
- public void startPlugin() {
- FreenetURI[] initialURIs = core.getBookmarkURIs();
- for (int i = 0; i < initialURIs.length; i++)
- queueURI(initialURIs[i]);
- stopped = false;
- Thread starterThread = new Thread("Spider Plugin Starter") {
- public void run() {
- startSomeRequests();
- }
- };
- starterThread.setDaemon(true);
- starterThread.start();
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#stopPlugin()
- */
- public void stopPlugin() {
- synchronized (this) {
- stopped = true;
- queuedURIList.clear();
- }
- }
-
- public void onMajorProgress() {
- // Ignore
- }
-
- public void onFetchable(BaseClientPutter state) {
- // Ignore
- }
-
-
-
-}
Deleted: trunk/freenet/src/freenet/clients/http/PluginToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2008-08-14
17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2008-08-14
17:20:20 UTC (rev 21851)
@@ -1,295 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.clients.http;
-
-import java.io.IOException;
-import java.net.URI;
-
-import freenet.client.HighLevelSimpleClient;
-import freenet.l10n.L10n;
-import freenet.node.NodeClientCore;
-import freenet.oldplugins.plugin.HttpPlugin;
-import freenet.oldplugins.plugin.Plugin;
-import freenet.oldplugins.plugin.PluginManager;
-import freenet.support.HTMLNode;
-import freenet.support.MultiValueTable;
-import freenet.support.api.HTTPRequest;
-
-/**
- * Toadlet for the plugin manager.
- *
- * @author David 'Bombe' Roden <bombe at freenetproject.org>
- * @version $Id$
- */
-public class PluginToadlet extends Toadlet {
-
- private static final int MAX_PLUGIN_NAME_LENGTH = 1024;
- /** The plugin manager backing this toadlet. */
- private final PluginManager pluginManager;
- private final NodeClientCore core;
-
- /**
- * Creates a new toadlet.
- *
- * @param client
- * The high-level client to use
- * @param pluginManager
- * The plugin manager to use
- */
- protected PluginToadlet(HighLevelSimpleClient client, PluginManager
pluginManager, NodeClientCore core) {
- super(client);
- this.pluginManager = pluginManager;
- this.core = core;
- }
-
- /**
- * This toadlet support GET and POST operations.
- *
- * @see freenet.clients.http.Toadlet#supportedMethods()
- * @return "GET,POST"
- */
- public String supportedMethods() {
- return "GET,POST";
- }
-
- /**
- * Handles a GET request.
- *
- * @see freenet.clients.http.Toadlet#handleGet(java.net.URI,
- * freenet.clients.http.ToadletContext)
- * @param uri
- * The URI that was requested
- * @param ctx
- * The context of this toadlet
- */
- public void handleGet(URI uri, HTTPRequest httpRequest, ToadletContext
ctx) throws ToadletContextClosedException, IOException, RedirectException {
- String uriPath = uri.getPath();
- String pluginName = uriPath.substring(uriPath.lastIndexOf('/')
+ 1);
-
- if (pluginName.length() > 0) {
- Plugin plugin = findPlugin(pluginName);
- if (plugin != null) {
- if (plugin instanceof HttpPlugin) {
- ((HttpPlugin)
plugin).handleGet(httpRequest, ctx);
- } else {
- writeHTMLReply(ctx, 220, "OK",
createBox(ctx, l10n("noWebInterfaceTitle"), l10n("noWebInterface")).toString());
- }
- return;
- }
- writeHTMLReply(ctx, 220, "OK", createBox(ctx,
l10n("pluginNotFoundTitle"), l10n("pluginNotFound")).toString());
- return;
- }
-
- if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
l10n("unauthorized"));
- return;
- }
-
- String action = httpRequest.getParam("action");
- if (action.length() == 0) {
- writePermanentRedirect(ctx, "Plugin list",
"?action=list");
- return;
- }
-
- StringBuffer replyBuffer = new StringBuffer();
- if ("list".equals(action)) {
- replyBuffer.append(listPlugins(ctx));
- } else {
- writeHTMLReply(ctx, 220, "OK", createBox(ctx,
l10n("unsupportedMethodTitle"), l10n("unsupportedMethod")).toString());
- return;
- }
- writeHTMLReply(ctx, 220, "OK", replyBuffer.toString());
- }
-
- private String l10n(String key) {
- return L10n.getString("PluginToadlet."+key);
- }
-
- /**
- * @see freenet.clients.http.Toadlet#handlePost(java.net.URI,
freenet.support.api.Bucket, freenet.clients.http.ToadletContext)
- */
- public void handlePost(URI uri, HTTPRequest httpRequest, ToadletContext
ctx) throws ToadletContextClosedException, IOException, RedirectException {
- String uriPath = uri.getPath();
- String pluginName = uriPath.substring(uriPath.lastIndexOf('/')
+ 1);
-
- if (pluginName.length() > 0) {
- Plugin plugin = findPlugin(pluginName);
- if (plugin != null) {
- if (plugin instanceof HttpPlugin) {
- ((HttpPlugin)
plugin).handlePost(httpRequest, ctx);
- } else {
- writeHTMLReply(ctx, 220, "OK",
createBox(ctx, l10n("noWebInterfaceTitle"), l10n("noWebInterface")).toString());
- }
- return;
- }
- writeHTMLReply(ctx, 220, "OK", createBox(ctx,
l10n("pluginNotFoundTitle") , l10n("pluginNotFound")).toString());
- return;
- }
-
- if(!ctx.isAllowedFullAccess()) {
- super.sendErrorPage(ctx, 403, "Unauthorized",
l10n("unauthorized"));
- return;
- }
-
- String pass = httpRequest.getPartAsString("formPassword", 32);
- if((pass == null) || !pass.equals(core.formPassword)) {
- MultiValueTable headers = new MultiValueTable();
- headers.put("Location", "/plugin/");
- ctx.sendReplyHeaders(302, "Found", headers, null, 0);
- return;
- }
-
- String action = httpRequest.getPartAsString("action", 32);
- if (action.length() == 0) {
- writePermanentRedirect(ctx, l10n("pluginList"),
"?action=list");
- return;
- }
-
- StringBuffer replyBuffer = new StringBuffer();
- if ("add".equals(action)) {
- pluginName = httpRequest.getPartAsString("pluginName",
MAX_PLUGIN_NAME_LENGTH);
-
- boolean added = false;
- try {
- pluginManager.addPlugin(pluginName, true);
- added = true;
- } catch (IllegalArgumentException iae1) {
- super.sendErrorPage(ctx,
l10n("failedToLoadPluginTitle"), l10n("failedToLoadPlugin"), iae1);
- return;
- }
- if (added) {
- writePermanentRedirect(ctx, l10n("pluginList"),
"?action=list");
- return;
- }
- replyBuffer.append(createBox(ctx,
l10n("failedToLoadPluginTitle"), l10n("failedToLoadPluginCheckClass")));
- } else if ("reload".equals(action)) {
- pluginName = httpRequest.getPartAsString("pluginName",
MAX_PLUGIN_NAME_LENGTH);
- Plugin plugin = findPlugin(pluginName);
- pluginManager.removePlugin(plugin, false);
- pluginManager.addPlugin(plugin.getClass().getName(),
false);
- writePermanentRedirect(ctx, l10n("pluginList"),
"?action=list");
- return;
- } else if ("unload".equals(action)) {
- pluginName = httpRequest.getPartAsString("pluginName",
MAX_PLUGIN_NAME_LENGTH);
- Plugin plugin = findPlugin(pluginName);
- pluginManager.removePlugin(plugin, true);
- writePermanentRedirect(ctx, l10n("pluginList"),
"?action=list");
- return;
- }
- writeHTMLReply(ctx, 220, "OK", replyBuffer.toString());
- }
-
- /**
- * Searches the currently installed plugins for the plugin with the
- * specified internal name.
- *
- * @param internalPluginName
- * The internal name of the wanted plugin
- * @return The wanted plugin, or <code>null</code> if no plugin could be
- * found
- */
- private Plugin findPlugin(String internalPluginName) {
- Plugin[] plugins = pluginManager.getPlugins();
- for (int pluginIndex = 0, pluginCount = plugins.length;
pluginIndex < pluginCount; pluginIndex++) {
- Plugin plugin = plugins[pluginIndex];
- String pluginName = plugin.getClass().getName() + '@' +
pluginIndex;
- if (pluginName.equals(internalPluginName)) {
- return plugin;
- }
- }
- return null;
- }
-
- /**
- * Creates a complete HTML page containing a list of all plugins.
- *
- * @param context
- * The toadlet context
- * @return A StringBuffer containing the HTML page
- */
- private String listPlugins(ToadletContext context) {
- Plugin[] plugins = pluginManager.getPlugins();
- PageMaker pageMaker = context.getPageMaker();
- HTMLNode pageNode = pageMaker.getPageNode(
l10n("pluginListTitle"), context);
- HTMLNode contentNode = pageMaker.getContentNode(pageNode);
-
- HTMLNode infobox = contentNode.addChild("div", "class",
"infobox");
- infobox.addChild("div", "class", "infobox-header",
l10n("pluginList"));
- HTMLNode table = infobox.addChild("div", "class",
"infobox-content").addChild("table", "class", "plugintable");
- HTMLNode headerRow = table.addChild("tr");
- headerRow.addChild("th", l10n("pluginNameTitle"));
- headerRow.addChild("th", l10n("internalNameTitle"));
- headerRow.addChild("th", "colspan", "3");
- for (int pluginIndex = 0, pluginCount = plugins.length;
pluginIndex < pluginCount; pluginIndex++) {
- Plugin plugin = plugins[pluginIndex];
- String internalName = plugin.getClass().getName() + '@'
+ pluginIndex;
- HTMLNode tableRow = table.addChild("tr");
- tableRow.addChild("td", plugin.getPluginName());
- tableRow.addChild("td", internalName);
- if (plugin instanceof HttpPlugin) {
- tableRow.addChild("td").addChild("form", new
String[] { "action", "method", "target" }, new String[] { internalName, "get",
"_new" }).addChild("div").addChild("input", new String[] { "type", "value" },
new String[] { "submit", l10n("visit") });
- } else {
- tableRow.addChild("td");
- }
- HTMLNode reloadForm = context.addFormChild(tableRow,
".", "pluginReloadForm");
- reloadForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "action", "reload" });
- reloadForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "pluginName", internalName });
- reloadForm.addChild("input", new String[] { "type",
"value" }, new String[] { "submit", "Reload" });
- HTMLNode unloadForm = context.addFormChild(tableRow,
".", "pluginUnloadForm");
- unloadForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "action", "unload" });
- unloadForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "pluginName", internalName });
- unloadForm.addChild("input", new String[] { "type",
"value" }, new String[] { "submit", "Unload" });
- }
-
- contentNode.addChild(createAddPluginBox(context));
-
- return pageNode.generate();
- }
-
- /**
- * Creates an alert box with the specified title and message. A link to
the
- * plugin list is added after the message.
- *
- * @param context
- * The toadlet context
- * @param title
- * The title of the box
- * @param message
- * The content of the box
- * @return A StringBuffer containing the complete page
- */
- private StringBuffer createBox(ToadletContext context, String title,
String message) {
- PageMaker pageMaker = context.getPageMaker();
- HTMLNode pageNode = pageMaker.getPageNode(title, context);
- HTMLNode contentNode = pageMaker.getContentNode(pageNode);
- HTMLNode infobox = contentNode.addChild("div", "class",
"infobox infobox-alert");
- infobox.addChild("div", "class", "infobox-header", title);
- HTMLNode infoboxContent = infobox.addChild("div", "class",
"infobox-content");
- infoboxContent.addChild("#", message);
- infoboxContent.addChild("br");
- L10n.addL10nSubstitution(infoboxContent,
"PluginToadlet.returnToPluginsWithLinks", new String[] { "link", "/link" },
- new String[] { "<a href=\"?action=list\">",
"</a>" });
- StringBuffer pageBuffer = new StringBuffer();
- pageNode.generate(pageBuffer);
- return pageBuffer;
- }
-
- /**
- * Appends the HTML code for the “add plugin” box to the
given
- * StringBuffer.
- *
- * @param outputBuffer
- * The StringBuffer to append the HTML code to
- */
- private HTMLNode createAddPluginBox(ToadletContext ctx) {
- HTMLNode addPluginBox = new HTMLNode("div", "class", "infobox");
- addPluginBox.addChild("div", "class", "infobox-header",
l10n("addPluginTitle"));
- HTMLNode addForm =
ctx.addFormChild(addPluginBox.addChild("div", "class", "infobox-content"), ".",
"addPluginBox");
- addForm.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "action", "add" });
- addForm.addChild("input", new String[] { "type", "name",
"value", "size" }, new String[] { "text", "pluginName", "", "40" });
- addForm.addChild("input", new String[] { "type", "value" }, new
String[] { "submit", l10n("loadPluginCommand")});
- return addPluginBox;
- }
-
-}
Deleted: trunk/freenet/src/freenet/clients/http/Spider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Spider.java 2008-08-14 17:05:38 UTC
(rev 21850)
+++ trunk/freenet/src/freenet/clients/http/Spider.java 2008-08-14 17:20:20 UTC
(rev 21851)
@@ -1,472 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.clients.http;
-
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import freenet.client.ClientMetadata;
-import freenet.client.FetchException;
-import freenet.client.FetchResult;
-import freenet.client.FetchContext;
-import freenet.client.InsertException;
-import freenet.client.async.BaseClientPutter;
-import freenet.client.async.ClientCallback;
-import freenet.client.async.ClientGetter;
-import freenet.clients.http.filter.ContentFilter;
-import freenet.clients.http.filter.FoundURICallback;
-import freenet.clients.http.filter.UnsafeContentTypeException;
-import freenet.keys.FreenetURI;
-import freenet.node.NodeClientCore;
-import freenet.node.RequestStarter;
-import freenet.oldplugins.plugin.HttpPlugin;
-import freenet.oldplugins.plugin.PluginManager;
-import freenet.support.HTMLNode;
-import freenet.support.Logger;
-import freenet.support.MultiValueTable;
-import freenet.support.api.Bucket;
-import freenet.support.api.HTTPRequest;
-import freenet.support.io.NullBucketFactory;
-
-/**
- * Spider. Produces an index.
- */
-public class Spider implements HttpPlugin, ClientCallback, FoundURICallback {
-
- long tProducedIndex;
-
- // URIs visited, or fetching, or queued. Added once then forgotten
about.
- private final HashSet visitedURIs = new HashSet();
- private final HashSet urisWithWords = new HashSet();
- private final HashSet failedURIs = new HashSet();
- private final HashSet queuedURISet = new HashSet();
- private final LinkedList queuedURIList = new LinkedList();
- private final HashMap runningFetchesByURI = new HashMap();
- private final HashMap urisByWord = new HashMap();
- private final HashMap titlesOfURIs = new HashMap();
-
- private static final int minTimeBetweenEachIndexRewriting = 10;
-
- // Can have many; this limit only exists to save memory.
- private static final int maxParallelRequests = 20;
- private int maxShownURIs = 50;
-
- private NodeClientCore core;
- private FetchContext ctx;
- private final short PRIORITY_CLASS =
RequestStarter.PREFETCH_PRIORITY_CLASS;
- private boolean stopped = true;
-
- private synchronized void queueURI(FreenetURI uri) {
- if ((!visitedURIs.contains(uri)) && queuedURISet.add(uri)) {
- queuedURIList.addLast(uri);
- visitedURIs.add(uri);
- }
- }
-
- private void startSomeRequests() {
- try{
- Thread.sleep(30 * 1000); // Let the node start up
- } catch (InterruptedException e){}
-
- FreenetURI[] initialURIs = core.getBookmarkURIs();
- for (int i = 0; i < initialURIs.length; i++)
- queueURI(initialURIs[i]);
-
- ArrayList toStart = null;
- synchronized (this) {
- if (stopped) {
- return;
- }
- int running = runningFetchesByURI.size();
- int queued = queuedURIList.size();
-
- if ((running >= maxParallelRequests) || (queued == 0))
- return;
-
- toStart = new ArrayList(Math.min(maxParallelRequests -
running, queued));
-
- for (int i = running; i < maxParallelRequests; i++) {
- if (queuedURIList.isEmpty())
- break;
- FreenetURI uri = (FreenetURI)
queuedURIList.removeFirst();
- queuedURISet.remove(uri);
- ClientGetter getter = makeGetter(uri);
- toStart.add(getter);
- }
- for (int i = 0; i < toStart.size(); i++) {
- ClientGetter g = (ClientGetter) toStart.get(i);
- try {
- runningFetchesByURI.put(g.getURI(), g);
- g.start();
- } catch (FetchException e) {
- onFailure(e, g);
- }
- }
- }
- }
-
- private ClientGetter makeGetter(FreenetURI uri) {
- ClientGetter g = new ClientGetter(this,
core.requestStarters.chkFetchScheduler, core.requestStarters.sskFetchScheduler,
uri, ctx, PRIORITY_CLASS, this, null, null);
- return g;
- }
-
- public void onSuccess(FetchResult result, ClientGetter state) {
- FreenetURI uri = state.getURI();
- synchronized (this) {
- runningFetchesByURI.remove(uri);
- }
- startSomeRequests();
- ClientMetadata cm = result.getMetadata();
- Bucket data = result.asBucket();
- String mimeType = cm.getMIMEType();
- try {
- ContentFilter.filter(data, new NullBucketFactory(),
mimeType, uri.toURI("http://127.0.0.1:8888/";), this);
- } catch (UnsafeContentTypeException e) {
- return; // Ignore
- } catch (IOException e) {
- Logger.error(this, "Bucket error?: " + e, e);
- } catch (URISyntaxException e) {
- Logger.error(this, "Internal error: " + e, e);
- } finally {
- data.free();
- }
- }
-
- public void onFailure(FetchException e, ClientGetter state) {
- FreenetURI uri = state.getURI();
- synchronized (this) {
- failedURIs.add(uri);
- runningFetchesByURI.remove(uri);
- }
- if (e.newURI != null)
- queueURI(e.newURI);
- else
- queueURI(uri);
- startSomeRequests();
- }
-
- public void onSuccess(BaseClientPutter state) {
- // Ignore
- }
-
- public void onFailure(InsertException e, BaseClientPutter state) {
- // Ignore
- }
-
- public void onGeneratedURI(FreenetURI uri, BaseClientPutter state) {
- // Ignore
- }
-
- public void foundURI(FreenetURI uri) {
- queueURI(uri);
- startSomeRequests();
- }
-
- public void foundURI(FreenetURI uri, boolean inline) {
- queueURI(uri);
- startSomeRequests();
- }
-
- public void onText(String s, String type, URI baseURI) {
-
- FreenetURI uri;
- try {
- uri = new FreenetURI(baseURI.getPath());
- } catch (MalformedURLException e) {
- Logger.error(this, "Caught " + e, e);
- return;
- }
-
- if((type != null) && (type.length() != 0) &&
type.toLowerCase().equals("title")
- && (s != null) && (s.length() != 0) && (s.indexOf('\n') <
0)) {
- /* We should have a correct title */
- titlesOfURIs.put(uri.toString(), s);
- }
-
-
- String[] words = s.split("[^A-Za-z0-9]");
- for (int i = 0; i < words.length; i++) {
- String word = words[i];
- if ((word == null) || (word.length() == 0))
- continue;
- word = word.toLowerCase();
- addWord(word, uri);
- }
- }
-
- private synchronized void addWord(String word, FreenetURI uri) {
- FreenetURI[] uris = (FreenetURI[]) urisByWord.get(word);
- urisWithWords.add(uri);
- if (uris == null) {
- urisByWord.put(word, new FreenetURI[] { uri });
- } else {
- for (int i = 0; i < uris.length; i++) {
- if (uris[i].equals(uri))
- return;
- }
- FreenetURI[] newURIs = new FreenetURI[uris.length + 1];
- System.arraycopy(uris, 0, newURIs, 0, uris.length);
- newURIs[uris.length] = uri;
- urisByWord.put(word, newURIs);
- }
- if (tProducedIndex + minTimeBetweenEachIndexRewriting * 1000 <
System.currentTimeMillis()) {
- try {
- produceIndex();
- } catch (IOException e) {
- Logger.error(this, "Caught " + e + " while
creating index", e);
- }
- tProducedIndex = System.currentTimeMillis();
- }
- }
-
- private synchronized void produceIndex() throws IOException {
- // Produce an index file.
- FileOutputStream fos = new FileOutputStream("index.new");
- OutputStreamWriter osw;
- try {
- osw = new OutputStreamWriter(fos, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new Error("Impossible: JVM doesn't support UTF-8:
" + e, e);
- }
-
- if (urisByWord.isEmpty() || urisWithWords.isEmpty()) {
- System.out.println("No URIs with words");
- return;
- }
- BufferedWriter bw = new BufferedWriter(osw);
- String[] words = (String[]) urisByWord.keySet().toArray(new
String[urisByWord.size()]);
- Arrays.sort(words);
- FreenetURI[] uris = (FreenetURI[]) urisWithWords.toArray(new
FreenetURI[urisWithWords.size()]);
- HashMap urisToNumbers = new HashMap();
- for (int i = 0; i < uris.length; i++) {
- urisToNumbers.put(uris[i], new Integer(i));
- bw.write('!' + uris[i].toString() + '\n');
- bw.write("+" + titlesOfURIs.get(uris[i].toString()) +
'\n');
- }
- for (int i = 0; i < words.length; i++) {
- StringBuffer s = new StringBuffer();
- s.append('?');
- s.append(words[i]);
- FreenetURI[] urisForWord = (FreenetURI[])
urisByWord.get(words[i]);
- for (int j = 0; j < urisForWord.length; j++) {
- FreenetURI uri = urisForWord[j];
- Integer x = (Integer) urisToNumbers.get(uri);
- if (x == null)
- Logger.error(this, "Eh?");
- else {
- s.append(' ');
- s.append(x.toString());
- }
- }
- s.append('\n');
- bw.write(s.toString());
- }
- bw.close();
- }
-
- /**
- * @see
freenet.oldplugins.plugin.HttpPlugin#handleGet(freenet.clients.http.HTTPRequestImpl,
freenet.clients.http.ToadletContext)
- */
- public void handleGet(HTTPRequest request, ToadletContext context)
throws IOException, ToadletContextClosedException {
- String action = request.getParam("action");
- PageMaker pageMaker = context.getPageMaker();
- if ((action == null) || (action.length() == 0)) {
- MultiValueTable responseHeaders = new MultiValueTable();
- responseHeaders.put("Location", "?action=list");
- context.sendReplyHeaders(301, "Redirect",
responseHeaders, "text/html; charset=utf-8", 0);
- return;
- } else if ("list".equals(action)) {
- String listName = request.getParam("listName", null);
- HTMLNode pageNode = pageMaker.getPageNode("The
Definitive Spider", context);
- HTMLNode contentNode =
pageMaker.getContentNode(pageNode);
- /* create copies for multi-threaded use */
- if (listName == null) {
- Map runningFetches = new
HashMap(runningFetchesByURI);
- List queued = new ArrayList(queuedURIList);
- Set visited = new HashSet(visitedURIs);
- Set failed = new HashSet(failedURIs);
- contentNode.addChild(createNavbar(pageMaker,
runningFetches.size(), queued.size(), visited.size(), failed.size()));
- contentNode.addChild(createAddBox(pageMaker,
context));
- contentNode.addChild(createList(pageMaker,
"Running Fetches", "running", runningFetches.keySet(), maxShownURIs));
- contentNode.addChild(createList(pageMaker,
"Queued URIs", "queued", queued, maxShownURIs));
- contentNode.addChild(createList(pageMaker,
"Visited URIs", "visited", visited, maxShownURIs));
- contentNode.addChild(createList(pageMaker,
"Failed URIs", "failed", failed, maxShownURIs));
- } else {
- contentNode.addChild(createBackBox(pageMaker));
- if ("failed".equals(listName)) {
- Set failed = new HashSet(failedURIs);
-
contentNode.addChild(createList(pageMaker, "Failed URIs", "failed", failed,
-1));
- } else if ("visited".equals(listName)) {
- Set visited = new HashSet(visitedURIs);
-
contentNode.addChild(createList(pageMaker, "Visited URIs", "visited", visited,
-1));
- } else if ("queued".equals(listName)) {
- List queued = new
ArrayList(queuedURIList);
-
contentNode.addChild(createList(pageMaker, "Queued URIs", "queued", queued,
-1));
- } else if ("running".equals(listName)) {
- Map runningFetches = new
HashMap(runningFetchesByURI);
-
contentNode.addChild(createList(pageMaker, "Running Fetches", "running",
runningFetches.keySet(), -1));
- }
- }
- MultiValueTable responseHeaders = new MultiValueTable();
- byte[] responseBytes =
pageNode.generate().getBytes("utf-8");
- context.sendReplyHeaders(200, "OK", responseHeaders,
"text/html; charset=utf-8", responseBytes.length);
- context.writeData(responseBytes);
- } else if ("add".equals(action)) {
- String uriParam = request.getParam("key");
- try {
- FreenetURI uri = new FreenetURI(uriParam);
- synchronized (this) {
- failedURIs.remove(uri);
- visitedURIs.remove(uri);
- }
- queueURI(uri);
- startSomeRequests();
- } catch (MalformedURLException mue1) {
- sendSimpleResponse(context, "URL invalid", "The
given URI is not valid.");
- return;
- }
- MultiValueTable responseHeaders = new MultiValueTable();
- responseHeaders.put("Location", "?action=list");
- context.sendReplyHeaders(301, "Redirect",
responseHeaders, "text/html; charset=utf-8", 0);
- return;
- }
- }
-
- /**
- * @see
freenet.oldplugins.plugin.HttpPlugin#handlePost(freenet.clients.http.HTTPRequestImpl,
freenet.clients.http.ToadletContext)
- */
- public void handlePost(HTTPRequest request, ToadletContext context)
throws IOException {
- }
-
- private void sendSimpleResponse(ToadletContext context, String title,
String message) throws ToadletContextClosedException, IOException {
- PageMaker pageMaker = context.getPageMaker();
- HTMLNode pageNode = pageMaker.getPageNode(title, context);
- HTMLNode contentNode = pageMaker.getContentNode(pageNode);
- HTMLNode infobox =
contentNode.addChild(pageMaker.getInfobox("infobox-alter", title));
- HTMLNode infoboxContent = pageMaker.getContentNode(infobox);
- infoboxContent.addChild("#", message);
- byte[] responseBytes = pageNode.generate().getBytes("utf-8");
- context.sendReplyHeaders(200, "OK", new MultiValueTable(),
"text/html; charset=utf-8", responseBytes.length);
- context.writeData(responseBytes);
- }
-
- private HTMLNode createBackBox(PageMaker pageMaker) {
- HTMLNode backbox = pageMaker.getInfobox((String) null);
- HTMLNode backContent = pageMaker.getContentNode(backbox);
- backContent.addChild("#", "Return to the ");
- backContent.addChild("a", "href", "?action=list", "list of all
URIs");
- backContent.addChild("#", ".");
- return backbox;
- }
-
- private HTMLNode createAddBox(PageMaker pageMaker, ToadletContext ctx) {
- HTMLNode addBox = pageMaker.getInfobox("Add a URI");
- HTMLNode formNode =
pageMaker.getContentNode(addBox).addChild("form", new String[] { "action",
"method" }, new String[] { "", "get" });
- formNode.addChild("input", new String[] { "type", "name",
"value" }, new String[] { "hidden", "action", "add" });
- formNode.addChild("input", new String[] { "type", "size",
"name", "value" }, new String[] { "text", "40", "key", "" });
- formNode.addChild("input", new String[] { "type", "value" },
new String[] { "submit", "Add URI" });
- return addBox;
- }
-
- private HTMLNode createNavbar(PageMaker pageMaker, int running, int
queued, int visited, int failed) {
- HTMLNode navbar = pageMaker.getInfobox("navbar", "Page
Navigation");
- HTMLNode list = pageMaker.getContentNode(navbar).addChild("ul");
- list.addChild("li").addChild("a", "href", "#running", "Running
(" + running + ')');
- list.addChild("li").addChild("a", "href", "#queued", "Queued ("
+ queued + ')');
- list.addChild("li").addChild("a", "href", "#visited", "Visited
(" + visited + ')');
- list.addChild("li").addChild("a", "href", "#failed", "Failed ("
+ failed + ')');
- return navbar;
- }
-
- private HTMLNode createList(PageMaker pageMaker, String listName,
String anchorName, Collection collection, int maxCount) {
- HTMLNode listNode = new HTMLNode("div");
- listNode.addChild("a", "name", anchorName);
- HTMLNode listBox = pageMaker.getInfobox(listName);
- HTMLNode listContent = pageMaker.getContentNode(listBox);
- listNode.addChild(listBox);
- Iterator collectionItems = collection.iterator();
- int itemCount = 0;
- while (collectionItems.hasNext()) {
- FreenetURI uri = (FreenetURI) collectionItems.next();
- listContent.addChild("#", uri.toString());
- listContent.addChild("br");
- if (itemCount++ == maxCount) {
- listContent.addChild("br");
- listContent.addChild("a", "href",
"?action=list&listName=" + anchorName, "Show all\u2026");
- break;
- }
- }
- return listNode;
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#getPluginName()
- */
- public String getPluginName() {
- return "The Definitive Spider";
- }
-
- /**
- * @see
freenet.oldplugins.plugin.Plugin#setPluginManager(freenet.oldplugins.plugin.PluginManager)
- */
- public void setPluginManager(PluginManager pluginManager) {
- this.core = pluginManager.getClientCore();
- this.ctx = core.makeClient((short) 0).getFetchContext();
- ctx.maxSplitfileBlockRetries = 10;
- ctx.maxNonSplitfileRetries = 10;
- ctx.maxTempLength = 2 * 1024 * 1024;
- ctx.maxOutputLength = 2 * 1024 * 1024;
- tProducedIndex = System.currentTimeMillis();
- }
-
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#startPlugin()
- */
- public void startPlugin() {
- stopped = false;
- Thread starterThread = new Thread("Spider Plugin Starter") {
- public void run() {
- startSomeRequests();
- }
- };
- starterThread.setDaemon(true);
- starterThread.start();
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#stopPlugin()
- */
- public void stopPlugin() {
- synchronized (this) {
- stopped = true;
- queuedURIList.clear();
- }
- }
-
- public void onMajorProgress() {
- // Ignore
- }
-
- public void onFetchable(BaseClientPutter state) {
- // Ignore
- }
-
-}
Modified: trunk/freenet/src/freenet/config/SubConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/SubConfig.java 2008-08-14 17:05:38 UTC
(rev 21850)
+++ trunk/freenet/src/freenet/config/SubConfig.java 2008-08-14 17:20:20 UTC
(rev 21851)
@@ -215,10 +215,10 @@
Logger.minor(this, "Prefix="+prefix);
for(int i=0;i<entries.length;i++) {
Map.Entry<String, Option> entry = entries[i];
- String key = (String) entry.getKey();
- Option o = (Option) entry.getValue();
-// if(logMINOR)
-// Logger.minor(this, "Key="+key+"
value="+o.getValueString()+" default="+o.isDefault());
+ String key = entry.getKey();
+ Option o = entry.getValue();
+ if(logMINOR)
+ Logger.minor(this, "Key="+key+"
value="+o.getValueString()+" default="+o.isDefault());
if (configRequestType ==
Config.RequestType.CURRENT_SETTINGS && (!withDefaults) && o.isDefault()
&& (!o.forceWrite)) {
if(logMINOR)
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-08-14 17:05:38 UTC (rev
21850)
+++ trunk/freenet/src/freenet/node/Node.java 2008-08-14 17:20:20 UTC (rev
21851)
@@ -474,7 +474,6 @@
// Things that's needed to keep track of
public final PluginManager pluginManager;
- public freenet.oldplugins.plugin.PluginManager pluginManager2;
// Helpers
public final InetAddress localhostAddress;
@@ -1691,8 +1690,7 @@
Logger.normal(this, "Initializing Plugin Manager");
System.out.println("Initializing Plugin Manager");
pluginManager = new PluginManager(this);
- pluginManager2 = new
freenet.oldplugins.plugin.PluginManager(this);
-
+
FetchContext ctx = clientCore.makeClient((short)0,
true).getFetchContext();
ctx.allowSplitfiles = false;
Deleted: trunk/freenet/src/freenet/oldplugins/plugin/HttpPlugin.java
===================================================================
--- trunk/freenet/src/freenet/oldplugins/plugin/HttpPlugin.java 2008-08-14
17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/oldplugins/plugin/HttpPlugin.java 2008-08-14
17:20:20 UTC (rev 21851)
@@ -1,48 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.oldplugins.plugin;
-
-import java.io.IOException;
-
-import freenet.clients.http.ToadletContext;
-import freenet.clients.http.ToadletContextClosedException;
-import freenet.support.api.HTTPRequest;
-
-/**
- * Interface for plugins that support HTTP interaction.
- *
- * @author David 'Bombe' Roden <bombe at freenetproject.org>
- * @version $Id$
- */
-public interface HttpPlugin extends Plugin {
-
- /**
- * Handles the GET request.
- *
- * @param request
- * The request used to interact with this plugin
- * @param context
- * The context of the HTTP request
- * @throws IOException
- * if an I/O error occurs
- * @throws ToadletContextClosedException
- * if the context has already been closed.
- */
- public void handleGet(HTTPRequest request, ToadletContext context)
throws IOException, ToadletContextClosedException;
-
- /**
- * Handles the POST request.
- *
- * @param request
- * The request used to interact with this plugin
- * @param context
- * The context of the HTTP request
- * @throws IOException
- * if an I/O error occurs
- * @throws ToadletContextClosedException
- * if the context has already been closed.
- */
- public void handlePost(HTTPRequest request, ToadletContext context)
throws IOException, ToadletContextClosedException;
-
-}
Deleted: trunk/freenet/src/freenet/oldplugins/plugin/Plugin.java
===================================================================
--- trunk/freenet/src/freenet/oldplugins/plugin/Plugin.java 2008-08-14
17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/oldplugins/plugin/Plugin.java 2008-08-14
17:20:20 UTC (rev 21851)
@@ -1,40 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.oldplugins.plugin;
-
-/**
- * Interface for Fred plugins.
- *
- * @author David 'Bombe' Roden <bombe at freenetproject.org>
- * @version $Id$
- */
-public interface Plugin {
-
- /**
- * Returns the name of the plugin.
- *
- * @return The name of the plugin
- */
- public String getPluginName();
-
- /**
- * Sets the plugin manager that manages this plugin.
- *
- * @param pluginManager
- * The plugin manager
- */
- public void setPluginManager(PluginManager pluginManager);
-
- /**
- * Starts the plugin. If the plugin needs threads they have to be
started
- * here.
- */
- public void startPlugin();
-
- /**
- * Stops the plugin.
- */
- public void stopPlugin();
-
-}
Deleted: trunk/freenet/src/freenet/oldplugins/plugin/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/oldplugins/plugin/PluginManager.java
2008-08-14 17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/oldplugins/plugin/PluginManager.java
2008-08-14 17:20:20 UTC (rev 21851)
@@ -1,242 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.oldplugins.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-
-import freenet.config.InvalidConfigValueException;
-import freenet.config.SubConfig;
-import freenet.l10n.L10n;
-import freenet.node.Node;
-import freenet.node.NodeClientCore;
-import freenet.support.Logger;
-import freenet.support.StringArray;
-import freenet.support.api.StringArrCallback;
-
-/**
- * Manages plugins.
- *
- * @author David 'Bombe' Roden <bombe at freenetproject.org>
- * @version $Id$
- */
-public class PluginManager {
-
- /** Object used for synchronization. */
- private final Object syncObject = new Object();
-
- /** The node. */
- private final Node node;
-
- /** The configuration of this plugin manager. */
- private final SubConfig config;
-
- /** Currently loaded plugins. */
- private List plugins = new ArrayList();
-
- /**
- * Creates a new plugin manager.
- *
- * @param node
- * The node
- */
- public PluginManager(Node node) {
- this.node = node;
-
- config = new SubConfig("pluginmanager2", node.config);
- config.register("loadedPlugins", new String[0], 9, true, true,
"PluginManager.loadedPlugins", "PluginManager.loadedPluginsLong", new
StringArrCallback() {
-
- /**
- * Returns the current value of this option.
- *
- * @see freenet.support.api.StringArrCallback#get()
- * @return The current value of this option
- */
- public String[] get() {
- if(plugins.size() == 0) return new String[0];
- String[] retval;
- synchronized (syncObject) {
- retval = new String[plugins.size()];
- for(int i=0;i<plugins.size();i++) {
- Plugin plugin = (Plugin)
plugins.get(i);
- retval[i] =
plugin.getClass().getName();
- }
- }
- if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Plugin list: " +
StringArray.toString(retval));
- return retval;
- };
-
- /**
- * Sets the new value of this option.
- *
- * @see
freenet.support.api.StringArrCallback#set(java.lang.String)
- * @param val
- * The new value
- * @throws InvalidConfigValueException
- * if setting the value is not allowed, or
the new value
- * is not valid
- */
- public void set(String[] val) throws
InvalidConfigValueException {
- throw new
InvalidConfigValueException(L10n.getString("PluginManager.cannotSetOnceLoaded"));
- };
-
- public boolean isReadOnly() {
- return true;
- }
- });
-
- String[] loadedPluginNames =
config.getStringArr("loadedPlugins");
- if (loadedPluginNames != null && loadedPluginNames.length > 0) {
- for (int pluginIndex = 0, pluginCount =
loadedPluginNames.length; pluginIndex < pluginCount; pluginIndex++) {
- String pluginName =
loadedPluginNames[pluginIndex];
- try {
- addPlugin(pluginName, false);
- } catch (Throwable t) {
- Logger.error(this, "Failed to load
plugin "+pluginName+" : "+t, t);
- }
- }
- }
-
- config.finishedInitialization();
- }
-
- /**
- * Returns the node that created this plugin manager.
- *
- * @return The node that created this plugin manager
- */
- public Node getNode() {
- return node;
- }
-
- /**
- * Returns all currently loaded plugins. The array is returned in no
- * particular order.
- *
- * @return All currently loaded plugins
- */
- public Plugin[] getPlugins() {
- synchronized (syncObject) {
- return (Plugin[]) plugins.toArray(new
Plugin[plugins.size()]);
- }
- }
-
- /**
- * Adds a plugin to the plugin manager. The name can contain a URL for
a jar
- * file from which the plugin is then loaded. If it does the URL and the
- * plugin name are separated by a '@', e.g.
- * 'plugin.TestPlugin at http://www.example.com/test.jar'. URLs can
contain
- * every protocol your VM understands.
- *
- * @see URL
- * @param pluginName
- * The name of the plugin
- *
- * FIXME IllegalArgumentException is not the best way to convey an
error here!
- */
- public void addPlugin(String pluginName, final boolean store) throws
IllegalArgumentException {
- if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Loading plugin
"+pluginName+(store?"" : " (don't store afterwards)"));
- final Plugin newPlugin = createPlugin(pluginName);
- if (newPlugin == null) {
- throw new IllegalArgumentException();
- }
- newPlugin.setPluginManager(this);
- synchronized (syncObject) {
- plugins.add(newPlugin);
- }
- node.executor.execute(new Runnable() {
- public void run() {
- try{
- while(!node.isHasStarted())
- Thread.sleep(1000);
- }catch (InterruptedException e) {}
- newPlugin.startPlugin();
- if(store)
- node.clientCore.storeConfig();
- }
- }, "Plugin loader");
-
- }
-
- /**
- * Remoes the plugin from the list of running plugins. The plugin is
stopped
- * before removing it.
- *
- * @param plugin
- * The plugin to remove
- */
- public void removePlugin(Plugin plugin, boolean store) {
- plugin.stopPlugin();
- synchronized (syncObject) {
- plugins.remove(plugin);
- }
- if(store)
- node.clientCore.storeConfig();
- }
-
- /**
- * Creates a plugin from a name. The name can contain a URL for a jar
file
- * from which the plugin is then loaded. If it does the URL and the
plugin
- * name are separated by a '@', e.g.
- * 'plugin.TestPlugin at http://www.example.com/test.jar'. URLs can
contain
- * every protocol your VM understands.
- * <p>
- * <b>WARNING:</b> The code to load JAR files from URLs has <b>not</b>
- * been tested.
- *
- * @see URL
- * @param pluginName
- * The name of the plugin
- * @return The created plugin, or <code>null</code> if the plugin could
- * not be created
- */
- private Plugin createPlugin(String pluginName) {
- int p = pluginName.indexOf('@');
- String pluginSource = null;
-
- /* split up */
- if (p > -1) {
- pluginSource = pluginName.substring(p + 1);
- pluginName = pluginName.substring(0, p);
- }
-
- /* load jar file */
- ClassLoader classLoader = getClass().getClassLoader();
- if (pluginSource != null) {
- try {
- URL pluginSourceUrl = new URL(pluginSource);
- classLoader = new URLClassLoader(new URL[] {
pluginSourceUrl });
- } catch (MalformedURLException mue1) {
- Logger.normal(this, "could not create class
loader", mue1);
- return null;
- }
- }
-
- /* load class from class loader */
- try {
- Class pluginClass = classLoader.loadClass(pluginName);
- if (Plugin.class.isAssignableFrom(pluginClass)) {
- Plugin plugin = (Plugin)
pluginClass.newInstance();
- return plugin;
- }
- } catch (ClassNotFoundException e) {
- Logger.normal(this, "could not find plugin class: " +
pluginName+" : "+e, e);
- } catch (InstantiationException e) {
- Logger.normal(this, "could not instantiate plugin
class: " + pluginName+" : "+e, e);
- } catch (IllegalAccessException e) {
- Logger.normal(this, "could not instantiate plugin
class: " + pluginName+" : "+e, e);
- }
- return null;
- }
-
- public NodeClientCore getClientCore() {
- return node.clientCore;
- }
-
-}
Deleted: trunk/freenet/src/freenet/oldplugins/plugin/TestHttpPlugin.java
===================================================================
--- trunk/freenet/src/freenet/oldplugins/plugin/TestHttpPlugin.java
2008-08-14 17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/oldplugins/plugin/TestHttpPlugin.java
2008-08-14 17:20:20 UTC (rev 21851)
@@ -1,62 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.oldplugins.plugin;
-
-import java.io.IOException;
-
-import freenet.clients.http.ToadletContext;
-import freenet.clients.http.ToadletContextClosedException;
-import freenet.support.MultiValueTable;
-import freenet.support.api.HTTPRequest;
-
-/**
- * Test HTTP plugin. Outputs "Plugin works" to the browser.
- *
- * @author David 'Bombe' Roden <bombe at freenetproject.org>
- * @version $Id$
- */
-public class TestHttpPlugin implements HttpPlugin {
-
- /**
- * @throws ToadletContextClosedException
- * @see
freenet.oldplugins.plugin.HttpPlugin#handleGet(freenet.clients.http.HTTPRequestImpl)
- */
- public void handleGet(HTTPRequest request, ToadletContext context)
throws IOException, ToadletContextClosedException {
- byte[] messageBytes = "Plugin works.".getBytes("UTF-8");
- context.sendReplyHeaders(200, "OK", new MultiValueTable(),
"text/html; charset=utf-8", messageBytes.length);
- context.writeData(messageBytes, 0, messageBytes.length);
- }
-
- /**
- * @see
freenet.oldplugins.plugin.HttpPlugin#handlePost(freenet.clients.http.HTTPRequestImpl)
- */
- public void handlePost(HTTPRequest request, ToadletContext context)
throws IOException, ToadletContextClosedException {
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#getPluginName()
- */
- public String getPluginName() {
- return "Simple HTTP Test Plugin";
- }
-
- /**
- * @see
freenet.oldplugins.plugin.Plugin#setPluginManager(freenet.oldplugins.plugin.PluginManager)
- */
- public void setPluginManager(PluginManager pluginManager) {
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#startPlugin()
- */
- public void startPlugin() {
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#stopPlugin()
- */
- public void stopPlugin() {
- }
-
-}
Deleted: trunk/freenet/src/freenet/oldplugins/plugin/TestPlugin.java
===================================================================
--- trunk/freenet/src/freenet/oldplugins/plugin/TestPlugin.java 2008-08-14
17:05:38 UTC (rev 21850)
+++ trunk/freenet/src/freenet/oldplugins/plugin/TestPlugin.java 2008-08-14
17:20:20 UTC (rev 21851)
@@ -1,39 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.oldplugins.plugin;
-
-/**
- * Test plugin. Does absolutely nothing.
- *
- * @author David 'Bombe' Roden <bombe at freenetproject.org>
- * @version $Id$
- */
-public class TestPlugin implements Plugin {
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#getPluginName()
- */
- public String getPluginName() {
- return "Simple Test Plugin";
- }
-
- /**
- * @see
freenet.oldplugins.plugin.Plugin#setPluginManager(freenet.oldplugins.plugin.PluginManager)
- */
- public void setPluginManager(PluginManager pluginManager) {
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#startPlugin()
- */
- public void startPlugin() {
- }
-
- /**
- * @see freenet.oldplugins.plugin.Plugin#stopPlugin()
- */
- public void stopPlugin() {
- }
-
-}
