From 51a15645667efc38b03913897eda96de54053b78 Mon Sep 17 00:00:00 2001
From: sponge <sponge@mail.i2p>
Date: Sat, 13 Feb 2010 13:46:10 +0000
Subject: [PATCH] Fix addWebApplications API goofup, Bump BOB version, which I
 forgot to do.

---
 apps/BOB/src/net/i2p/BOB/DoCMDS.java          |  2 +-
 .../java/src/org/mortbay/jetty/Server.java    | 26 +++++++++++++++++++
 history.txt                                   |  4 +++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
index 2a149522b..4a037971f 100644
--- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java
+++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
@@ -50,7 +50,7 @@ public class DoCMDS implements Runnable {
 
 	// FIX ME
 	// I need a better way to do versioning, but this will do for now.
-	public static final String BMAJ = "00",  BMIN = "00",  BREV = "0A",  BEXT = "";
+	public static final String BMAJ = "00",  BMIN = "00",  BREV = "0B",  BEXT = "";
 	public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT;
 	private Socket server;
 	private Properties props;
diff --git a/apps/jetty/java/src/org/mortbay/jetty/Server.java b/apps/jetty/java/src/org/mortbay/jetty/Server.java
index 364d4ebe5..409f8a529 100644
--- a/apps/jetty/java/src/org/mortbay/jetty/Server.java
+++ b/apps/jetty/java/src/org/mortbay/jetty/Server.java
@@ -337,6 +337,32 @@ public class Server extends HttpServer
         return addWebApplications(host,webapps,defaults,extract,true,null);
     }
 
+    /* ------------------------------------------------------------ */
+    /**  Add Web Applications.
+     * Add auto webapplications to the server.  The name of the
+     * webapp directory or war is used as the context name. If the
+     * webapp matches the rootWebApp it is added as the "/" context.
+     * @param host Virtual host name or null
+     * @param webapps Directory file name or URL to look for auto
+     * webapplication.
+     * @param defaults The defaults xml filename or URL which is
+     * loaded before any in the web app. Must respect the web.dtd.
+     * If null the default defaults file is used. If the empty string, then
+     * no defaults file is used.
+     * @param extract If true, extract war files
+     * @param java2CompliantClassLoader True if java2 compliance is applied to all webapplications
+     * @exception IOException
+     */
+    public WebApplicationContext[] addWebApplications(String host,
+                                                      String webapps,
+                                                      String defaults,
+                                                      boolean extract,
+						      boolean java2CompliantClassLoader)
+                throws IOException
+    {
+        return addWebApplications(host,webapps,defaults,extract,java2CompliantClassLoader,null);
+
+    }
     /* ------------------------------------------------------------ */
     /**  Add Web Applications.
      * Add auto webapplications to the server.  The name of the
diff --git a/history.txt b/history.txt
index 880541ded..06021da40 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2010-02-13 sponge
+    * Fix addWebApplications API goofup
+    * Bump BOB version, which I forgot to do.
+
 2010-02-13 zzz
     * Floodfills: Increase max to 28 (was 15) and min to 20 (was 10)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index c46006633..353176635 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";