Update of /cvsroot/freenet/freenet/src/freenet/node/http
In directory sc8-pr-cvs1:/tmp/cvs-serv18640/src/freenet/node/http
Modified Files:
DistributionServlet.java DiagnosticsServlet.java
NodeInfoServlet.java
Removed Files:
DistributionTest.java
Log Message:
get rid of some yellowies
Index: DistributionServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/DistributionServlet.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -w -r1.62 -r1.63
--- DistributionServlet.java 31 Oct 2003 19:21:17 -0000 1.62
+++ DistributionServlet.java 31 Oct 2003 19:40:50 -0000 1.63
@@ -241,7 +241,7 @@
throws ServletException, IOException {
if(node.isTransient()) {
- resp.setStatus(resp.SC_SERVICE_UNAVAILABLE);
+ resp.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
resp.getWriter().print("ERROR: Distribution Servlet not available to
transient nodes!");
return;
}
@@ -918,7 +918,7 @@
}
}
if (dp.hits >= MAXHITS) {
- resp.setStatus(resp.SC_FORBIDDEN);
+ resp.setStatus(HttpServletResponse.SC_FORBIDDEN);
resp.setContentType("text/plain");
PrintWriter pw = resp.getWriter();
pw.println("Hits on this distribution above limit, ask operator to open
another.");
@@ -1003,7 +1003,7 @@
dp.hits++;
if (dp.hits > MAXHITS) {
- resp.setStatus(resp.SC_FORBIDDEN);
+ resp.setStatus(HttpServletResponse.SC_FORBIDDEN);
resp.setContentType("text/plain");
PrintWriter pw = resp.getWriter();
pw.println("Hits on this distribution above limit, ask operator to open
another.");
Index: DiagnosticsServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/DiagnosticsServlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -r1.8 -r1.9
--- DiagnosticsServlet.java 31 Oct 2003 18:13:14 -0000 1.8
+++ DiagnosticsServlet.java 31 Oct 2003 19:40:52 -0000 1.9
@@ -40,7 +40,7 @@
String pi = req.getPathInfo();
uri = pi == null ? "" : URLDecoder.decode(pi);
} catch (URLEncodedFormatException e) {
- resp.sendError(resp.SC_BAD_REQUEST, "Could not decode url.");
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Could not decode
url.");
return;
}
@@ -55,7 +55,7 @@
if (uri.equals("graphs")) {
sendGraphData(req, resp);
} else {
- resp.sendError(resp.SC_NOT_FOUND, "Unrecognized URL.");
+ resp.sendError(HttpServletResponse.SC_NOT_FOUND, "Unrecognized
URL.");
}
} else {
String varName = uri.substring(0, sep);
@@ -136,7 +136,7 @@
format =
new HtmlDiagnosticsFormat(Diagnostics.getPeriod(period));
} catch (IllegalArgumentException e) {
- resp.sendError(resp.SC_NOT_FOUND,
+ resp.sendError(HttpServletResponse.SC_NOT_FOUND,
"Unknown period type given.");
return;
}
@@ -163,7 +163,7 @@
String varName = req.getParameter("var");
if (varName == null) {
- resp.sendError(resp.SC_NOT_FOUND,
+ resp.sendError(HttpServletResponse.SC_NOT_FOUND,
"Unknown diagnostics variable.");
return;
}
Index: NodeInfoServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/http/NodeInfoServlet.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -w -r1.48 -r1.49
--- NodeInfoServlet.java 31 Oct 2003 19:21:17 -0000 1.48
+++ NodeInfoServlet.java 31 Oct 2003 19:40:52 -0000 1.49
@@ -70,7 +70,7 @@
pageTemplate = new HtmlTemplate(basePageTemplate);
titleBoxTemplate = new HtmlTemplate(baseTitleBoxTemplate);
} catch (IOException e) {
- Core.logger.log(this, "Failed to Initialize HtmlTemplate", e,
node.logger.ERROR);
+ Core.logger.log(this, "Failed to Initialize HtmlTemplate", e,
Core.logger.ERROR);
}
@@ -144,7 +144,7 @@
String path = req.getPathInfo();
Core.logger.log(this, "getPathInfo returned "+path,
- node.logger.DEBUG);
+ Core.logger.DEBUG);
int x = (path == null) ? -1 : path.indexOf('/');
int y = (path == null) ? -1 : path.lastIndexOf('/');
@@ -153,7 +153,7 @@
subset = path.substring(y+1);
path = path.substring(0, y);
Core.logger.log(this, "Broken: subset="+subset+", path="+path,
- node.logger.DEBUG);
+ Core.logger.DEBUG);
}
// Obtain Infolet
@@ -170,7 +170,7 @@
SimpleAdvanced_ModeUtils.handleRequestedParams(req,resp); //Parse a possible
requested modechange & co
- Core.logger.log(this, "i is "+i, node.logger.DEBUG);
+ Core.logger.log(this, "i is "+i, Core.logger.DEBUG);
if(subset != null && i instanceof MultipleFileInfolet &&
((MultipleFileInfolet)i).write(subset, req, resp)) {
} else {
--- DistributionTest.java DELETED ---
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
