antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Implemented defaultServlet which lives outside of the

Browse source 
WildcardDictionary that matches URL patterns to servlets.
This commit is contained in:
hns 2001-09-10 14:06:46 +00:00
parent 619dafac6d
commit 58e0306fb8
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Acme/Serve/Serve.java
View file

@ -147,6 +147,8 @@ public class Serve implements ServletContext, Runnable
private int port; private int port;
private PrintStream logStream; private PrintStream logStream;
Acme.WildcardDictionary registry; Acme.WildcardDictionary registry;
// the servlet to use if no other matches the request
Servlet defaultServlet;
Properties props; Properties props;
/// Constructor. /// Constructor.
@ -268,6 +270,10 @@ public class Serve implements ServletContext, Runnable
registry.remove (urlPat); registry.remove (urlPat);
} }
public void setDefaultServlet (Servlet servlet) {
defaultServlet = servlet;
}
/// Register a standard set of Servlets. These will return /// Register a standard set of Servlets. These will return
// files or directory listings, and run CGI programs, much like a // files or directory listings, and run CGI programs, much like a
// standard HTTP server. // standard HTTP server.
@ -653,6 +659,8 @@ class ServeConnection implements Runnable, HttpServletRequest, HttpServletRespon
if (reqQuery != null) if (reqQuery != null)
reqQuery = decode (reqQuery); reqQuery = decode (reqQuery);
Servlet servlet = (Servlet) serve.registry.get( reqUriPath ); Servlet servlet = (Servlet) serve.registry.get( reqUriPath );
if (servlet == null)
servlet = serve.defaultServlet;
if ( servlet != null ) if ( servlet != null )
runServlet( (HttpServlet) servlet ); runServlet( (HttpServlet) servlet );
else if ( "/".equals( reqUriPath )) else if ( "/".equals( reqUriPath ))