Addressbook build changes (ticket #1966):

- Build as jar, not war
 - Put empty war in updater
 - Move Servlet starter to SusiDNS
 - Skip war in RouterConsoleRunner

apps/susidns/src/WEB-INF/web-template.xml

@@ -13,6 +13,22 @@
     </filter-mapping>
 
   <display-name>susidns</display-name>
+
+    <servlet>
+        <servlet-name>addressbook-runner</servlet-name>
+        <servlet-class>net.i2p.addressbook.servlet.Servlet</servlet-class>
+        <init-param>
+            <param-name>home</param-name>
+            <param-value>./addressbook</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping> 
+      <servlet-name>addressbook-runner</servlet-name>
+      <url-pattern>/addressbook-runner</url-pattern>
+    </servlet-mapping>
+
     <!-- precompiled servlets -->
 
     <!-- non-.jsp URLs -->

apps/susidns/src/build.xml

@@ -31,6 +31,7 @@
 		<pathelement location="${lib}/jetty-util.jar" />
 		<pathelement location="${ant.home}/lib/ant.jar" />
 		<pathelement location="../../../core/java/build/i2p.jar" />
+		<pathelement location="../../addressbook/dist/addressbook.jar" />
  	</path>
 
 	<property name="javac.compilerargs" value="" />

apps/susidns/src/java/src/net/i2p/addressbook/servlet/Servlet.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2004 Ragnarok
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.i2p.addressbook.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.i2p.addressbook.DaemonThread;
+
+/**
+ * A wrapper for addressbook to allow it to be started as a web application.
+ * 
+ * This was a GenericServlet, we make it an HttpServlet solely to provide a
+ * simple page to display status.
+ * 
+ * @since 0.9.30 moved from addressbook to SusiDNS
+ * @author Ragnarok
+ *
+ */
+public class Servlet extends HttpServlet {
+
+    private static final long serialVersionUID = 1L;
+    private transient DaemonThread thread;
+    //private String nonce;
+    //private static final String PROP_NONCE = "addressbook.nonce";
+
+    /**
+     * Simple output to verify that the addressbook servlet is running.
+     *
+     * (non-Javadoc)
+     * see javax.servlet.Servlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)
+     */
+    public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        //System.err.println("Got request nonce = " + request.getParameter("nonce"));
+        //if (this.thread != null && request.getParameter("wakeup") != null &&
+        //    this.nonce != null && this.nonce.equals(request.getParameter("nonce"))) {
+        //    //System.err.println("Sending interrupt");
+        //    this.thread.interrupt();
+        //    // no output
+        //} else {
+            PrintWriter out = response.getWriter();
+            out.write("I2P addressbook OK");
+        //}
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
+     */
+    @Override
+    public void init(ServletConfig config) {
+        try {
+            super.init(config);
+        } catch (ServletException exp) {
+            System.err.println("Addressbook init exception: " + exp);
+        }
+        //this.nonce = "" + Math.abs((new Random()).nextLong());
+        // put the nonce where susidns can get it
+        //System.setProperty(PROP_NONCE, this.nonce);
+        String[] args = new String[1];
+        args[0] = config.getInitParameter("home");
+        this.thread = new DaemonThread(args);
+        this.thread.setDaemon(true);
+        this.thread.setName("Addressbook");
+        this.thread.start();
+        //System.out.println("INFO: Starting Addressbook " + Daemon.VERSION);
+        //System.out.println("INFO: config root under " + args[0]);
+    }
+
+    @Override
+    public void destroy() {
+        this.thread.halt();
+        super.destroy();
+    }
+}

apps/susidns/src/java/src/net/i2p/addressbook/servlet/package.html

@@ -0,0 +1,8 @@
+<html>
+<body>
+<p>
+The servlet that starts the addressbook DaemonThread.
+Moved from addressbook to SusiDNS in 0.9.30.
+</p>
+</body>
+</html>