Reviewers: jasvir,
Please review this at http://codereview.appspot.com/224102/show
Affected files:
M src/com/google/caja/ancillary/servlet/Main.java
Index: src/com/google/caja/ancillary/servlet/Main.java
===================================================================
--- src/com/google/caja/ancillary/servlet/Main.java (revision 3999)
+++ src/com/google/caja/ancillary/servlet/Main.java (working copy)
@@ -28,8 +28,21 @@
*
* @author [email protected]
*/
-public class Main {
+public final class Main extends CajaWebToolsServlet {
+ private static String makeCacheId() {
+ return Integer.toString(new SecureRandom().nextInt(1 << 30), 36);
+ }
+
+ private static URI makeUserAgentDbUri() {
+ return URI.create(System.getProperty(
+ "caja.webservice.useragentDb",
+ UserAgentDb.BROWSERSCOPE_WEB_SERVICE.toString()));
+ }
+
+ /** Zero argument ctor for Jetty. */
+ public Main() { super(makeCacheId(), makeUserAgentDbUri()); }
+
/** Starts a server on port 8080. */
public static void main(String[] args) throws Exception {
int port;
@@ -40,11 +53,7 @@
throw new Exception("What are these command line parameters for?");
}
Server server = new Server(port);
- String cacheId = Integer.toString(new SecureRandom().nextInt(1 << 30),
36);
- URI uadb = URI.create(System.getProperty(
- "caja.webservice.useragentDb",
- UserAgentDb.BROWSERSCOPE_WEB_SERVICE.toString()));
- final CajaWebToolsServlet servlet = new CajaWebToolsServlet(cacheId,
uadb);
+ final Main servlet = new Main();
server.setHandler(new AbstractHandler() {
public void handle(
String tgt, HttpServletRequest req, HttpServletResponse resp,
