Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv13416/src/freenet/client/http
Modified Files:
SplitFileRequestContext.java StreamInsertServlet.java
FproxyServlet.java ParamParse.java BaseContext.java
NodeStatusServlet.java StreamServlet.java
ConnectionPoller.java HttpServletRunner.java
InsertServlet_.java InsertContext.java
Log Message:
No functional changes. Fix lots of warnings from Eclipse about imports. Should speed
up compilation slightly, beautify code slightly.
Index: SplitFileRequestContext.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/client/http/SplitFileRequestContext.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- SplitFileRequestContext.java 3 Jul 2003 03:33:42 -0000 1.19
+++ SplitFileRequestContext.java 30 Oct 2003 01:34:06 -0000 1.20
@@ -6,19 +6,31 @@
package freenet.client.http;
-import freenet.*;
-import freenet.node.Node;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.StringTokenizer;
-import freenet.client.*;
-import freenet.client.http.filter.*;
-import freenet.client.metadata.*;
-import freenet.support.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import freenet.Connection;
+import freenet.Core;
+import freenet.client.ClientFactory;
+import freenet.client.FECFactory;
+import freenet.client.SplitFileDownloader;
+import freenet.client.http.filter.ContentFilter;
+import freenet.client.http.filter.FilterException;
+import freenet.client.metadata.SplitFile;
+import freenet.node.Node;
+import freenet.support.BucketFactory;
+import freenet.support.BucketSequence;
+import freenet.support.HTMLEncoder;
+import freenet.support.Logger;
+import freenet.support.URLEncodedFormatException;
/**
* Stateful "sub-servlet" to provide user feedback for
Index: StreamInsertServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/StreamInsertServlet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- StreamInsertServlet.java 1 Jul 2003 18:39:17 -0000 1.18
+++ StreamInsertServlet.java 30 Oct 2003 01:34:06 -0000 1.19
@@ -9,26 +9,49 @@
package freenet.client.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.ListIterator;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.client.*;
-import freenet.client.http.*;
-import freenet.client.events.*;
-import freenet.client.listeners.*;
-import freenet.client.metadata.*;
-import freenet.thread.*;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-// FEC stuff
-import com.onionnetworks.fec.*;
-import com.onionnetworks.util.*;
+import com.onionnetworks.fec.FECCode;
+import com.onionnetworks.fec.FECCodeFactory;
+import com.onionnetworks.util.Buffer;
+
+import freenet.Core;
+import freenet.KeyException;
+import freenet.client.Client;
+import freenet.client.ClientEvent;
+import freenet.client.ClientEventListener;
+import freenet.client.ClientFactory;
+import freenet.client.ClientKey;
+import freenet.client.ClientSSK;
+import freenet.client.FreenetURI;
+import freenet.client.PutRequest;
+import freenet.client.Request;
+import freenet.client.events.GeneratedURIEvent;
+import freenet.client.listeners.DoneListener;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InfoPart;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.StreamPart;
+import freenet.node.Node;
+import freenet.support.Bucket;
+import freenet.support.Logger;
+import freenet.support.NullBucket;
public class StreamInsertServlet extends FproxyServlet
{
Index: FproxyServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/FproxyServlet.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -w -r1.109 -r1.110
--- FproxyServlet.java 22 Oct 2003 22:07:13 -0000 1.109
+++ FproxyServlet.java 30 Oct 2003 01:34:06 -0000 1.110
@@ -1,17 +1,48 @@
package freenet.client.http;
-import freenet.*;
-import freenet.client.*;
-import freenet.client.events.*;
-import freenet.client.listeners.*;
-import freenet.client.metadata.*;
-import freenet.client.http.filter.*;
-import freenet.config.*;
-import freenet.keys.*;
-import freenet.support.io.DataNotValidIOException;
-import freenet.support.mime.*;
-import freenet.support.servlet.*;
-import freenet.support.servlet.http.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Random;
+import java.util.Vector;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import freenet.Core;
+import freenet.KeyException;
+import freenet.client.AutoRequester;
+import freenet.client.ClientEvent;
+import freenet.client.ClientEventListener;
+import freenet.client.ClientFactory;
+import freenet.client.FreenetURI;
+import freenet.client.KeyNotInManifestException;
+import freenet.client.RequestSizeException;
+import freenet.client.events.DataNotFoundEvent;
+import freenet.client.events.RedirectFollowedEvent;
+import freenet.client.events.RouteNotFoundEvent;
+import freenet.client.http.filter.ContentFilter;
+import freenet.client.http.filter.ContentFilterFactory;
+import freenet.client.http.filter.FilterException;
+import freenet.client.http.filter.SaferFilter;
+import freenet.client.metadata.DateRedirect;
+import freenet.client.metadata.MetadataPart;
+import freenet.client.metadata.MimeTypeUtils;
+import freenet.client.metadata.SplitFile;
+import freenet.node.Node;
+import freenet.node.http.SimpleAdvanced_ModeUtils;
import freenet.support.Bucket;
import freenet.support.BucketFactory;
import freenet.support.Fields;
@@ -22,14 +53,9 @@
import freenet.support.LoggerHook;
import freenet.support.TempBucketFactory;
import freenet.support.URLEncoder;
-import freenet.node.Node;
-import freenet.node.http.SimpleAdvanced_ModeUtils;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import freenet.support.io.DataNotValidIOException;
+import freenet.support.servlet.HtmlTemplate;
+import freenet.support.servlet.http.HttpServletResponseImpl;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
Index: ParamParse.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/ParamParse.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ParamParse.java 30 Jan 2003 02:40:22 -0000 1.3
+++ ParamParse.java 30 Oct 2003 01:34:06 -0000 1.4
@@ -1,13 +1,9 @@
package freenet.client.http;
-import freenet.*;
-import freenet.support.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import freenet.support.Logger;
/*
* This code is part of fproxy, an HTTP proxy server for Freenet.
Index: BaseContext.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/BaseContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- BaseContext.java 27 Mar 2003 00:17:45 -0000 1.2
+++ BaseContext.java 30 Oct 2003 01:34:06 -0000 1.3
@@ -1,16 +1,7 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.client.http;
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-
-// REDFLAG: get rid of the node dependency
-import freenet.node.Node;
-
-import java.io.*;
-import freenet.support.*;
-import freenet.client.ClientFactory;
+import java.io.PrintWriter;
/**
Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -w -r1.75 -r1.76
--- NodeStatusServlet.java 29 Oct 2003 21:53:23 -0000 1.75
+++ NodeStatusServlet.java 30 Oct 2003 01:34:06 -0000 1.76
@@ -1,49 +1,57 @@
/* -*- Mode: java; c-basic-indent: 4; indent-tabs-mode: nil -*- */
package freenet.client.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.NumberFormat;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Date;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.TreeMap;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import freenet.ContactCounter;
-import freenet.support.Logger;
-import freenet.ConnectionHandlerComparator;
import freenet.Core;
-import freenet.Key;
import freenet.DSAIdentity;
import freenet.Identity;
-import freenet.node.Main;
-import freenet.node.Node;
-import freenet.node.NodeReference;
-import freenet.node.rt.RTDiagSnapshot;
-import freenet.node.rt.NGRoutingTable;
-import freenet.node.rt.CPAlgoRoutingTable;
-import freenet.node.rt.TimeEstimator;
-import freenet.node.LoadStats;
+import freenet.Key;
import freenet.diagnostics.Diagnostics;
import freenet.diagnostics.DiagnosticsFormat;
-import freenet.diagnostics.HtmlDiagnosticsFormat;
-import freenet.diagnostics.HtmlIndexFormat;
-import freenet.diagnostics.RowDiagnosticsFormat;
import freenet.diagnostics.FieldSetFormat;
+import freenet.diagnostics.GraphDiagnosticsFormat;
+import freenet.diagnostics.GraphHtmlDiagnosticsFormat;
import freenet.diagnostics.GraphRange;
import freenet.diagnostics.GraphRangeDiagnosticsFormat;
-import freenet.diagnostics.GraphHtmlDiagnosticsFormat;
-import freenet.diagnostics.GraphDiagnosticsFormat;
-import freenet.node.rt.RoutingTable;
+import freenet.diagnostics.HtmlDiagnosticsFormat;
+import freenet.diagnostics.HtmlIndexFormat;
+import freenet.diagnostics.RowDiagnosticsFormat;
+import freenet.node.LoadStats;
+import freenet.node.Main;
+import freenet.node.Node;
+import freenet.node.NodeReference;
import freenet.node.ds.FSDataStore;
-import freenet.support.servlet.http.HttpServletResponseImpl;
-import freenet.support.io.WriteOutputStream;
-import freenet.support.URLEncodedFormatException;
-import freenet.support.sort.*;
-import freenet.support.StringMap;
+import freenet.node.rt.CPAlgoRoutingTable;
+import freenet.node.rt.NGRoutingTable;
+import freenet.node.rt.RTDiagSnapshot;
+import freenet.node.rt.RoutingTable;
+import freenet.node.rt.TimeEstimator;
import freenet.support.KeyHistogram;
import freenet.support.KeySizeHistogram;
+import freenet.support.Logger;
+import freenet.support.StringMap;
+import freenet.support.URLEncodedFormatException;
import freenet.support.graph.BitmapEncoder;
+import freenet.support.io.WriteOutputStream;
+import freenet.support.servlet.http.HttpServletResponseImpl;
+import freenet.support.sort.ArraySorter;
+import freenet.support.sort.HeapSorter;
/*
This code is distributed under the GNU Public Licence (GPL)
Index: StreamServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/StreamServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- StreamServlet.java 22 Jul 2003 03:17:29 -0000 1.10
+++ StreamServlet.java 30 Oct 2003 01:34:06 -0000 1.11
@@ -8,26 +8,45 @@
package freenet.client.http;
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Random;
-import freenet.*;
-import freenet.node.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.client.*;
-import freenet.client.events.*;
-import freenet.client.listeners.*;
-import freenet.client.metadata.*;
-import freenet.client.http.*;
-import freenet.thread.*;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-// FEC stuff
-import com.onionnetworks.fec.*;
-import com.onionnetworks.util.*;
+import com.onionnetworks.fec.FECCode;
+import com.onionnetworks.fec.FECCodeFactory;
+import com.onionnetworks.util.Buffer;
+
+import freenet.FieldSet;
+import freenet.KeyException;
+import freenet.client.AutoRequester;
+import freenet.client.Client;
+import freenet.client.ClientEvent;
+import freenet.client.ClientFactory;
+import freenet.client.FreenetURI;
+import freenet.client.GetRequest;
+import freenet.client.Request;
+import freenet.client.listeners.DoneListener;
+import freenet.client.metadata.DateRedirect;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataPart;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.Redirect;
+import freenet.client.metadata.StreamPart;
+import freenet.node.Node;
+import freenet.support.Bucket;
+import freenet.support.Logger;
+import freenet.support.io.ReadInputStream;
public class StreamServlet extends FproxyServlet // FIXME!
{
@@ -39,7 +58,7 @@
class MyDoneListener extends DoneListener {
public void receive(ClientEvent ce) {
logger.log(this, "Got event "+ce.getDescription(),
- logger.DEBUG);
+ Logger.DEBUG);
if(ce instanceof freenet.client.events.ExceptionEvent) {
Exception e =
((freenet.client.events.ExceptionEvent)ce).getException();
Index: ConnectionPoller.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/ConnectionPoller.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- ConnectionPoller.java 11 Jul 2003 21:38:37 -0000 1.3
+++ ConnectionPoller.java 30 Oct 2003 01:34:06 -0000 1.4
@@ -1,11 +1,10 @@
package freenet.client.http;
-import freenet.Connection;
import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.io.InputStream;
import javax.servlet.http.HttpServletRequest;
+
+import freenet.Connection;
/**
Index: HttpServletRunner.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/HttpServletRunner.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- HttpServletRunner.java 16 Oct 2003 01:03:59 -0000 1.15
+++ HttpServletRunner.java 30 Oct 2003 01:34:06 -0000 1.16
@@ -6,25 +6,37 @@
package freenet.client.http;
-import freenet.*;
-import freenet.thread.*;
-import freenet.interfaces.*;
-import freenet.interfaces.servlet.*;
-import freenet.config.*;
-import freenet.crypt.*;
-import freenet.fs.*;
-import freenet.support.*;
-import freenet.support.io.*;
-import freenet.client.ClientFactory;
-import freenet.client.cli.*;
-import freenet.node.Node;
-
-import java.util.*;
-import java.net.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintStream;
import java.lang.reflect.InvocationTargetException;
+import java.util.Date;
+import java.util.Vector;
+
import javax.servlet.Servlet;
import javax.servlet.http.HttpServlet;
+
+import freenet.Core;
+import freenet.Version;
+import freenet.client.ClientFactory;
+import freenet.client.cli.CLIClientFactory;
+import freenet.client.cli.CLIException;
+import freenet.config.Config;
+import freenet.config.Params;
+import freenet.config.Setup;
+import freenet.interfaces.Interface;
+import freenet.interfaces.LocalInterface;
+import freenet.interfaces.Service;
+import freenet.interfaces.ServiceException;
+import freenet.interfaces.servlet.SingleHttpServletContainer;
+import freenet.node.Node;
+import freenet.support.Fields;
+import freenet.support.FileLoggerHook;
+import freenet.support.Loader;
+import freenet.support.Logger;
+import freenet.thread.FastThreadFactory;
+import freenet.thread.ThreadFactory;
/**
* App to run HttpServlets in a separate JVM from the node.
Index: InsertServlet_.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/InsertServlet_.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -r1.27 -r1.28
--- InsertServlet_.java 7 Oct 2003 21:45:14 -0000 1.27
+++ InsertServlet_.java 30 Oct 2003 01:34:06 -0000 1.28
@@ -1,21 +1,36 @@
package freenet.client.http;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
-import freenet.client.*;
-import freenet.support.*;
-import freenet.support.servlet.*;
-import freenet.support.mime.*;
-import freenet.client.http.filter.*;
-import freenet.node.Node;
-import freenet.keys.SVK;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import freenet.client.AutoRequester;
+import freenet.client.ClientEvent;
+import freenet.client.SplitFileStatus;
import freenet.client.events.SplitFileEvent;
+import freenet.keys.SVK;
import freenet.message.client.FEC.SegmentHeader;
+import freenet.node.Node;
+import freenet.support.HTMLEncoder;
+import freenet.support.Logger;
+import freenet.support.URLDecoder;
+import freenet.support.URLEncodedFormatException;
+import freenet.support.URLEncoder;
+import freenet.support.mime.MIME;
+import freenet.support.mime.MIMEFormatException;
+import freenet.support.mime.MIME_binary;
+import freenet.support.mime.MIME_multipart;
+import freenet.support.servlet.HtmlTemplate;
public class InsertServlet_ extends ServletWithContext {
Index: InsertContext.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/InsertContext.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- InsertContext.java 3 Jul 2003 03:33:42 -0000 1.14
+++ InsertContext.java 30 Oct 2003 01:34:06 -0000 1.15
@@ -6,29 +6,47 @@
package freenet.client.http;
-import freenet.keys.SVK;
-import freenet.KeyException;
-import freenet.Core;
-import freenet.support.*;
-import freenet.support.mime.*;
-import freenet.client.*;
-import freenet.client.metadata.*;
-import freenet.client.events.StateReachedEvent;
-import freenet.client.events.TransferEvent;
-import freenet.client.events.TransferCompletedEvent;
-import freenet.client.listeners.ClientCollisionListener; // hmmm build issue gone?
-
-import freenet.message.client.FEC.SegmentHeader;
-import freenet.message.client.FEC.BlockMap;
-
+import java.io.CharArrayWriter;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.io.CharArrayWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import freenet.Core;
+import freenet.KeyException;
+import freenet.client.AutoRequester;
+import freenet.client.BlockInserter;
+import freenet.client.Client;
+import freenet.client.ClientEvent;
+import freenet.client.ClientEventListener;
+import freenet.client.ClientFactory;
+import freenet.client.FECTools;
+import freenet.client.FreenetURI;
+import freenet.client.InsertSizeException;
+import freenet.client.PutRequest;
+import freenet.client.Request;
+import freenet.client.events.StateReachedEvent;
+import freenet.client.events.TransferCompletedEvent;
+import freenet.client.events.TransferEvent;
+import freenet.client.listeners.ClientCollisionListener;
+import freenet.client.metadata.DocumentCommand;
+import freenet.client.metadata.InvalidPartException;
+import freenet.client.metadata.Metadata;
+import freenet.client.metadata.MetadataSettings;
+import freenet.client.metadata.Redirect;
+import freenet.keys.SVK;
+import freenet.message.client.FEC.BlockMap;
+import freenet.message.client.FEC.SegmentHeader;
+import freenet.support.Bucket;
+import freenet.support.BucketFactory;
+import freenet.support.BucketTools;
+import freenet.support.FileBucket;
+import freenet.support.Logger;
+import freenet.support.NullBucket;
+import freenet.support.mime.MIME_binary;
// REDFLAG: Cleanly factor SplitFile inserting into a
// separate component. LATER.
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
