Update of /cvsroot/freenet/freenet/src/freenet/node/http
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/node/http
Modified Files:
BookmarkManagerServlet.java DistributionServlet.java
NodeInfoServlet.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: BookmarkManagerServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/BookmarkManagerServlet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- BookmarkManagerServlet.java 30 Oct 2003 01:34:09 -0000 1.14
+++ BookmarkManagerServlet.java 31 Oct 2003 19:21:17 -0000 1.15
@@ -111,7 +111,7 @@
try {
pageTemplate =
HtmlTemplate.createTemplate("BookmarkManagerServletTmpl.html");
} catch (IOException ioe) {
- Core.logger.log(this, "Error creating template", ioe, Core.logger.ERROR);
+ Core.logger.log(this, "Error creating template", ioe, Logger.ERROR);
}
NodeConfigUpdater.addUpdateListener(BOOKMARK_PATH, this);
allowUpdatingBookmarks = !Main.publicNode;
@@ -168,7 +168,7 @@
"Bookmarks found [" + bmks.size() +
"] fieldset: " + params, Logger.DEBUG);
} catch (Exception e) {
- Core.logger.log(this, "Error loading default bookmarks: " +
e.getMessage(), e, Core.logger.ERROR);
+ Core.logger.log(this, "Error loading default bookmarks: " +
e.getMessage(), e, Logger.ERROR);
}
return bmks;
}
@@ -237,7 +237,7 @@
Bookmark bmk = (Bookmark)bookmarks.get(num);
if ( (bmk == null) || (bmk.getKey() == null) ) {
- Core.logger.log(this, "on remove: bookmarks.get("+num+") didn't have a
valid key or was null. bookmarks = " + bookmarks, Core.logger.ERROR);
+ Core.logger.log(this, "on remove: bookmarks.get("+num+") didn't have a
valid key or was null. bookmarks = " + bookmarks, Logger.ERROR);
return "Internal error removing the bookmark. No bookmarks have been
changed";
}
if (!bmk.getKey().equals(key)) {
@@ -276,7 +276,7 @@
return "Unsafe activelink file";
Bookmark bmk = (Bookmark)bookmarks.get(num);
if ( (bmk == null) || (bmk.getKey() == null) ) {
- Core.logger.log(this, "on update, bookmarks.get("+num+") didn't have a
valid key or was null. bookmarks = " + bookmarks, Core.logger.ERROR);
+ Core.logger.log(this, "on update, bookmarks.get("+num+") didn't have a
valid key or was null. bookmarks = " + bookmarks, Logger.ERROR);
return "Internal error updating the bookmark. No bookmarks have been
changed";
}
if (!bmk.getKey().equals(key)) {
@@ -299,7 +299,7 @@
private void saveChanges() {
synchronized(Main.getConfigUpdater().syncOb()) {
// write the config file, and then notify the NodeConfigUpdater
- Core.logger.log(this, "Bookmarks being saved", Core.logger.NORMAL);
+ Core.logger.log(this, "Bookmarks being saved", Logger.NORMAL);
try {
File f = Main.paramFile;
@@ -312,7 +312,7 @@
Main.getConfigUpdater().checkpoint();
} catch (Exception e) {
Core.logger.log(this, "Error saving changes: " +
- e.getMessage(), e, Core.logger.ERROR);
+ e.getMessage(), e, Logger.ERROR);
}
}
}
@@ -375,7 +375,7 @@
fos.close();
return true;
} catch (IOException ioe) {
- Core.logger.log(this, "Saving to " + f.getName() + " failed: " +
ioe.getMessage(), ioe, Core.logger.NORMAL);
+ Core.logger.log(this, "Saving to " + f.getName() + " failed: " +
ioe.getMessage(), ioe, Logger.NORMAL);
return false;
}
}
@@ -436,7 +436,7 @@
resultMessage.append(updateBookmark(num, key, newKey, newTitle,
newDesc, newAlFile));
}
} catch (Exception e) {
- Core.logger.log(this, "Error updating: " + e.getMessage(), e,
Core.logger.NORMAL);
+ Core.logger.log(this, "Error updating: " + e.getMessage(), e,
Logger.NORMAL);
resultMessage.append("Invalid update index
(").append(req.getParameter(PARAM_NUM)).append(")");
}
pendingNewBookmark = null;
@@ -453,7 +453,7 @@
resultMessage.append(removeBookmark(num, key));
}
} catch (Exception e) {
- Core.logger.log(this, "Error removing: " + e.getMessage(), e,
Core.logger.NORMAL);
+ Core.logger.log(this, "Error removing: " + e.getMessage(), e,
Logger.NORMAL);
resultMessage.append("Invalid remove index
(").append(req.getParameter(PARAM_NUM)).append(")");
}
pendingNewBookmark = null;
@@ -483,13 +483,13 @@
pageTemplate.toHtml(pw);
} catch (Throwable t) {
t.printStackTrace();
- Core.logger.log(this, "Error rendering the form: " + t.getMessage(), t,
Core.logger.ERROR);
+ Core.logger.log(this, "Error rendering the form: " + t.getMessage(), t,
Logger.ERROR);
}
try {
pw.flush();
resp.flushBuffer();
} catch (IOException ioe) {
- Core.logger.log(this, "I/O error writing the bookmark manager buffer...
probably harmless", ioe, Core.logger.MINOR);
+ Core.logger.log(this, "I/O error writing the bookmark manager buffer...
probably harmless", ioe, Logger.MINOR);
}
}
@@ -807,7 +807,7 @@
if(logDEBUG)
Core.logger.log(this, "Bookmarks now contains " + bookmarks.size() +
"/" + count + " bookmarks", Logger.DEBUG);
- Core.logger.log(this, "Bookmarks updated on request",Core.logger.NORMAL);
+ Core.logger.log(this, "Bookmarks updated on request",Logger.NORMAL);
}
// \n's would be DISASTROUS, allowing insertion of arbitrary data into config file
Index: DistributionServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/DistributionServlet.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -w -r1.61 -r1.62
--- DistributionServlet.java 27 Oct 2003 14:45:16 -0000 1.61
+++ DistributionServlet.java 31 Oct 2003 19:21:17 -0000 1.62
@@ -232,7 +232,7 @@
} catch (IOException e) {
Core.logger.log(DistributionServlet.class,
"Could not read filelist: " + res,
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
return new String[0]; // FIXME
}
}
@@ -469,7 +469,7 @@
} catch (BadAddressException e) {
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
resp.setContentType("text/plain");
- Core.logger.log(this, "BadAddressException trying to getPrefixURL in
DistributionServlet - report to [EMAIL PROTECTED]", e, Core.logger.ERROR);
+ Core.logger.log(this, "BadAddressException trying to getPrefixURL in
DistributionServlet - report to [EMAIL PROTECTED]", e, Logger.ERROR);
pw.println("INTERNAL ERROR, DISTRIBUTION URL NOT AVAILABLE");
pw.flush();
return;
@@ -481,7 +481,7 @@
} else {
if(initDistFiles()) {
byte[] bs = new byte[8];
- node.getRandSource().nextBytes(bs);
+ Core.getRandSource().nextBytes(bs);
String name = Base64.encode(bs);
dp = new DistributionPage(name,
System.currentTimeMillis());
@@ -516,7 +516,7 @@
} catch (java.net.UnknownHostException e) {
// Impossible
Core.logger.log(this, "UnknownHostException resolving address from
incoming connection!",
- Core.logger.ERROR);
+ Logger.ERROR);
throw new IllegalStateException("UnknownHostException resolving address
from incoming connection!");
}
String name = host.getHostName();
@@ -602,7 +602,7 @@
StringWriter sw = new StringWriter(200);
PrintWriter pw = new PrintWriter(sw);
byte[] bs = new byte[8];
- node.getRandSource().nextBytes(bs);
+ Core.getRandSource().nextBytes(bs);
String name = Base64.encode(bs);
pages.put(name, new DistributionPage(name,
@@ -681,7 +681,7 @@
if(f.canRead()) {
files[x] = f;
Core.logger.log(DistributionServlet.class, "Already got: "+f,
- Core.logger.MINOR);
+ Logger.MINOR);
continue mainloop;
}
}
@@ -692,7 +692,7 @@
if(context == null) {
Core.logger.log(DistributionServlet.class,
"No servlet context!",
- Core.logger.ERROR);
+ Logger.ERROR);
continue;
}
if(factory == null) {
@@ -700,7 +700,7 @@
context.getAttribute("freenet.client.ClientFactory");
if(factory == null) {
Core.logger.log(DistributionServlet.class, "No
ClientFactory!",
- Core.logger.ERROR);
+ Logger.ERROR);
continue;
}
}
@@ -712,13 +712,13 @@
Core.logger.log(DistributionServlet.class, "Uh oh...
Malformed URI "
+"hardcoded into "+
"DistributionServlet!",
- Core.logger.ERROR);
+ Logger.ERROR);
reqs[x] = null;
}
} catch (Exception e) {
Core.logger.log(DistributionServlet.class,
"Exception trying to start request",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
reqs[x] = null;
continue;
}
@@ -739,10 +739,10 @@
else
Core.logger.log(DistributionServlet.class,
"Can't read freenet.jar we just wrote",
- Core.logger.ERROR);
+ Logger.ERROR);
} catch (IOException e) {
Core.logger.log(DistributionServlet.class, "IOException writing
freenet.jar",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
}
}
}
@@ -759,11 +759,11 @@
else
Core.logger.log(DistributionServlet.class,
"Can't read freenet-ext.jar we just "+
- "wrote", Core.logger.ERROR);
+ "wrote", Logger.ERROR);
} catch (IOException e) {
Core.logger.log(DistributionServlet.class,
"IOException writing freenet-ext.jar",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
}
}
}
@@ -778,12 +778,12 @@
}
protected void sendNoZip(HttpServletRequest req, HttpServletResponse resp) throws
IOException {
- resp.setStatus(resp.SC_FORBIDDEN);
+ resp.setStatus(HttpServletResponse.SC_FORBIDDEN);
resp.setContentType("text/html");
PrintWriter rpw = resp.getWriter();
String nodeAddress = "http://"; + req.getServerName() + ":" + Node.fproxyPort;
- if(node.mainportURIOverride != null && !node.mainportURIOverride.equals(""))
- nodeAddress = node.mainportURIOverride;
+ if(Node.mainportURIOverride != null && !Node.mainportURIOverride.equals(""))
+ nodeAddress = Node.mainportURIOverride;
else
nodeAddress = "http://"; + req.getServerName() + ":"+Node.fproxyPort;
boolean needScripts = false;
@@ -1108,7 +1108,7 @@
ComparableInteger s;
for (int i = 0 ; i < Math.min(SEEDREFS, size) ; i++) {
do {
- s = new ComparableInteger(node.getRandSource().nextInt(size));
+ s = new ComparableInteger(Core.getRandSource().nextInt(size));
} while(selected.contains(s));
selected.add(s);
}
@@ -1187,7 +1187,7 @@
Core.logger.log(DistributionServlet.class,
"Could not find file " + fileList[i] +
" when making distribution.",
- Core.logger.ERROR);
+ Logger.ERROR);
throw new FileNotFoundException();
}
int read;
@@ -1299,9 +1299,9 @@
// Success?
if (dest.exists() ||
(files[x] != null && files[x].exists())) {
- if(Core.logger.shouldLog(Core.logger.NORMAL))
+ if(Core.logger.shouldLog(Logger.NORMAL))
Core.logger.log(this, "Fetched file "+names[x],
- Core.logger.NORMAL);
+ Logger.NORMAL);
synchronized(filesLock) {
files[x] = dest;
}
@@ -1310,16 +1310,16 @@
} else {
String s = "Downloaded "+names[x]+
" successfully but couldn't save!";
- Core.logger.log(this, s, Core.logger.ERROR);
+ Core.logger.log(this, s, Logger.ERROR);
return true; // not our fault, retrying won't help
}
} else {
Core.logger.log(this, "Rename of "+temp+" to "+dest+
- " failed!", Core.logger.MINOR);
+ " failed!", Logger.MINOR);
if (dest.exists() ||
(files[x] != null && files[x].exists())) {
Core.logger.log(this, "But exists, so OK ("+files[x]+
- ")", Core.logger.MINOR);
+ ")", Logger.MINOR);
synchronized(filesLock) {
if(files[x] == null && dest.exists()) {
files[x] = dest;
@@ -1331,7 +1331,7 @@
} else {
String s = "Downloaded file successfully but couldn't "+
"save!: "+names[x];
- Core.logger.log(this, s, Core.logger.ERROR);
+ Core.logger.log(this, s, Logger.ERROR);
finished = true;
return true; // not our fault, retrying won't help
}
@@ -1340,7 +1340,7 @@
protected boolean failure() {
Core.logger.log(this, "Failure for "+getCheckpointName(),
- Core.logger.MINOR);
+ Logger.MINOR);
// May as well check :)
if(dest.exists() ||
(files[x] != null && files[x].exists())) return true;
@@ -1350,7 +1350,7 @@
}
protected void redirectFollowed(RedirectFollowedEvent e) {
- Core.logger.log(this, "WTF? Redirect followed in
DistributionServlet$RequestThread", Core.logger.ERROR);
+ Core.logger.log(this, "WTF? Redirect followed in
DistributionServlet$RequestThread", Logger.ERROR);
}
}
Index: NodeInfoServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/NodeInfoServlet.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -w -r1.47 -r1.48
--- NodeInfoServlet.java 30 Oct 2003 01:34:09 -0000 1.47
+++ NodeInfoServlet.java 31 Oct 2003 19:21:17 -0000 1.48
@@ -59,7 +59,7 @@
staticInitted = true;
node = (Node) getServletContext().
getAttribute("freenet.node.Node");
- node.logger.log(this, "Initializing Infolets", Logger.DEBUG);
+ Core.logger.log(this, "Initializing Infolets", Logger.DEBUG);
path = getServletConfig().getInitParameter("servletContextPath");
@@ -70,7 +70,7 @@
pageTemplate = new HtmlTemplate(basePageTemplate);
titleBoxTemplate = new HtmlTemplate(baseTitleBoxTemplate);
} catch (IOException e) {
- node.logger.log(this, "Failed to Initialize HtmlTemplate", e,
node.logger.ERROR);
+ Core.logger.log(this, "Failed to Initialize HtmlTemplate", e,
node.logger.ERROR);
}
@@ -143,7 +143,7 @@
throws ServletException, IOException {
String path = req.getPathInfo();
- node.logger.log(this, "getPathInfo returned "+path,
+ Core.logger.log(this, "getPathInfo returned "+path,
node.logger.DEBUG);
int x = (path == null) ? -1 : path.indexOf('/');
@@ -152,7 +152,7 @@
if(x != y) {
subset = path.substring(y+1);
path = path.substring(0, y);
- node.logger.log(this, "Broken: subset="+subset+", path="+path,
+ Core.logger.log(this, "Broken: subset="+subset+", path="+path,
node.logger.DEBUG);
}
@@ -170,7 +170,7 @@
SimpleAdvanced_ModeUtils.handleRequestedParams(req,resp); //Parse a possible
requested modechange & co
- node.logger.log(this, "i is "+i, node.logger.DEBUG);
+ Core.logger.log(this, "i is "+i, node.logger.DEBUG);
if(subset != null && i instanceof MultipleFileInfolet &&
((MultipleFileInfolet)i).write(subset, req, resp)) {
} else {
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
