Update of /cvsroot/freenet/freenet/src/freenet/interfaces/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/interfaces/servlet
Modified Files:
ServletContainer.java SingleHttpServletContainer.java
HttpServletContainer.java MultipleHttpServletContainer.java
Log Message:
6290: don't show the request box either when in simple mode.
Index: ServletContainer.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/servlet/ServletContainer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- ServletContainer.java 30 Oct 2003 15:27:38 -0000 1.19
+++ ServletContainer.java 31 Oct 2003 19:21:16 -0000 1.20
@@ -151,7 +151,7 @@
context.setAttribute("freenet.serviceName", getServiceName());
Core.logger.log(ServletContainer.class,
"Creating servlet context w/ service name [" + getServiceName() + "]",
- Core.logger.DEBUG);
+ Logger.DEBUG);
return context;
}
Index: SingleHttpServletContainer.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/servlet/SingleHttpServletContainer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- SingleHttpServletContainer.java 4 Jul 2003 19:08:11 -0000 1.9
+++ SingleHttpServletContainer.java 31 Oct 2003 19:21:16 -0000 1.10
@@ -53,14 +53,14 @@
ServletContext context = createServletContext(params);
String servletContextPath = getServiceName() + ".params.servlet";
context.setAttribute("freenet.servlet.servletContextPath",
servletContextPath);
- Core.logger.log(SingleHttpServletContainer.class, "Loading the single servlet
" + servletContextPath, Core.logger.NORMAL);
+ Core.logger.log(SingleHttpServletContainer.class, "Loading the single servlet
" + servletContextPath, Logger.NORMAL);
ServletConfig config = createServletConfig(context, cls.getName(), params);
try {
servletPool = new SimpleServletPool(cls, context, config);
} catch (ServletException s) {
Core.logger.log(this, "Failed to init a servlet", s,
- Core.logger.ERROR);
+ Logger.ERROR);
throw new ServiceException("Failed to init a servlet"+s.toString());
}
}
@@ -96,10 +96,10 @@
servletPool.returnServlet(servletPool.getServlet());
} catch (UnavailableException e) {
Core.logger.log(this, "UnavailableException preinitializing",
- e, Core.logger.DEBUG);
+ e, Logger.DEBUG);
} catch (ServletException e) {
Core.logger.log(this, "ServletException preinitializing",
- e, Core.logger.DEBUG);
+ e, Logger.DEBUG);
}
}
}
Index: HttpServletContainer.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/servlet/HttpServletContainer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- HttpServletContainer.java 5 Sep 2003 03:32:43 -0000 1.9
+++ HttpServletContainer.java 31 Oct 2003 19:21:16 -0000 1.10
@@ -121,20 +121,20 @@
String uri = req.getRequestPath();
String method = req.getMethod();
Core.logger.log(this, "Getting servlet for "+method+" "+uri,
- new Exception("debug"), Core.logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
ServletPool pool = getServletPool(uri, method);
if (pool == null) {
Core.logger.log(this, "Null pool for "+method+" "+uri,
- Core.logger.DEBUG);
+ Logger.DEBUG);
// directory servlet check for URIs missing the terminal slash
if (!uri.endsWith("/") && getServletPool(uri + "/", method) != null) {
Core.logger.log(this, "Missing slash, redirecting: "+method+" "
- +uri, Core.logger.DEBUG);
+ +uri, Logger.DEBUG);
return new MovedServlet(uri + "/");
}
Core.logger.log(this, "404ing "+method+" "+uri,
- Core.logger.DEBUG);
+ Logger.DEBUG);
return new DumbServlet(HttpServletResponse.SC_NOT_FOUND);
}
Index: MultipleHttpServletContainer.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/servlet/MultipleHttpServletContainer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- MultipleHttpServletContainer.java 29 Jul 2003 07:10:56 -0000 1.14
+++ MultipleHttpServletContainer.java 31 Oct 2003 19:21:16 -0000 1.15
@@ -192,11 +192,11 @@
servletContext.setAttribute("freenet.servlet.servletContextPath",
servletContextPath);
Core.logger.log(MultipleHttpServletContainer.class,
"Loading the servlet " + servletContextPath + " with params " +
nxt,
- Core.logger.DEBUG);
+ Logger.DEBUG);
servletData[i] = loadServlet(servletContext, nxt);
} catch (ServletException e) {
Core.logger.log(this, "loadServlet threw ServletException",
- e, Core.logger.ERROR);
+ e, Logger.ERROR);
throw new ServiceException ("loadServlet failed with "+
"ServletException: "+e.toString());
}
@@ -284,20 +284,20 @@
protected final ServletPool getServletPool(String uripath, String method) {
Core.logger.log(this, "getServletPool for "+method+" "+uripath,
- new Exception("debug"), Core.logger.DEBUG);
+ new Exception("debug"), Logger.DEBUG);
ContextData contextData = findContext(uripath, method);
if (contextData != null) {
// Core.logger.log(this, "contextData available for "+method+" "+
-// uripath, Core.logger.DEBUG);
+// uripath, Logger.DEBUG);
ServletData servletData = findServlet(contextData, uripath, method);
if (servletData != null) {
// Core.logger.log(this, "servletData available for "+method+" "+
-// uripath, Core.logger.DEBUG);
+// uripath, Logger.DEBUG);
return servletData.pool;
}
}
// Core.logger.log(this, "Cannot find ServletPool for "+method+" "+uripath,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
return null;
}
@@ -305,12 +305,12 @@
//System.err.println("uripath: [" + uripath +"]");
//System.err.println("findContext:- uripath: [" + uripath + "] method: [" +
method + "] len: " + contextData.length);
// Core.logger.log(this, "Trying to findContext for "+method+" "+uripath,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
if ((defaultContext != null) &&
(uripath.equals("") || uripath.equals("/"))) {
// Special case Servlet handles no URL
// Core.logger.log(this, "Returning defaultContext",
-// Core.logger.DEBUG);
+// Logger.DEBUG);
return defaultContext;
}
@@ -322,34 +322,34 @@
System.err.println(" equalsIgnoreCase(BOTH): " +
contextData[i].method.equalsIgnoreCase("BOTH")); */
// Core.logger.log(this, "Trying "+contextData[i].path+"("+i+
// ") against "+method+" "+uripath,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
if (uripath.startsWith(contextData[i].path) /*&&
(contextData[i].method.equalsIgnoreCase(method) ||
contextData[i].method.equalsIgnoreCase("BOTH"))*/) {
// Core.logger.log(this, "Returning "+contextData[i].path,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
return contextData[i];
}
}
// Core.logger.log(this, "Returning null from findContext",
-// Core.logger.DEBUG);
+// Logger.DEBUG);
return null;
}
private ServletData findServlet(ContextData contextData, String uripath, String
method) {
//System.err.println("findServlet:- uripath: [" + uripath + "] method: [" +
method + "] len: " + contextData.servletData.length);
// Core.logger.log(this, "findServlet("+method+","+uripath+") with "+
-// contextData, Core.logger.DEBUG);
+// contextData, Logger.DEBUG);
if (contextData == defaultContext) {
// Core.logger.log(this, "Returning defaultContext",
-// Core.logger.DEBUG);
+// Logger.DEBUG);
return defaultContext.servletData[0];
}
uripath = uripath.substring(contextData.path.length(),
uripath.length());
// Core.logger.log(this, "uripath now: "+uripath,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
ServletData[] servletData = contextData.servletData;
String uripath2 = uripath;
if(!uripath2.endsWith("/"))
@@ -361,16 +361,16 @@
System.err.println(" equalsIgnoreCase(method): " +
servletData[i].method.equalsIgnoreCase(method));
System.err.println(" equalsIgnoreCase(BOTH): " +
servletData[i].method.equalsIgnoreCase("BOTH")); */
// Core.logger.log(this, "Trying "+i+": "+servletData[i].path,
-// Core.logger.DEBUG);
+// Logger.DEBUG);
if ((uripath.startsWith(servletData[i].path) ||
(uripath2.startsWith(servletData[i].path))) &&
(servletData[i].method.equalsIgnoreCase(method) ||
servletData[i].method.equalsIgnoreCase("BOTH"))) {
- Core.logger.log(this, "Returning "+i, Core.logger.DEBUG);
+ Core.logger.log(this, "Returning "+i, Logger.DEBUG);
return servletData[i];
}
}
-// Core.logger.log(this, "Returning null", Core.logger.DEBUG);
+// Core.logger.log(this, "Returning null", Logger.DEBUG);
return null;
}
@@ -384,19 +384,19 @@
protected void starting(ContextData c) {
for(int x=0;x<c.servletData.length;x++) {
- if(Core.logger.shouldLog(Core.logger.DEBUG))
+ if(Core.logger.shouldLog(Logger.DEBUG))
Core.logger.log(this, x+": "+c.servletData[x],
- Core.logger.DEBUG);
+ Logger.DEBUG);
// A really nasty bug once showed up around here
try {
ServletPool servletPool = c.servletData[x].pool;
servletPool.returnServlet(servletPool.getServlet());
} catch (UnavailableException e) {
Core.logger.log(this, "UnavailableException preinitializing",
- e, Core.logger.DEBUG);
+ e, Logger.DEBUG);
} catch (ServletException e) {
Core.logger.log(this, "ServletException preinitializing",
- e, Core.logger.DEBUG);
+ e, Logger.DEBUG);
}
//Try to reclaim memory after each servlet has initialized.
//Building HTML templates and similar consumes quite a bit of temporary
memory
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
