I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix addWebApplications API goofup, Bump BOB version, which I forgot to do.

Browse Source
This commit is contained in:
sponge
2010-02-13 13:46:10 +00:00
parent bd068058c3
commit 51a1564566
4 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/BOB/src/net/i2p/BOB/DoCMDS.java
View File

@ -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;

26
apps/jetty/java/src/org/mortbay/jetty/Server.java
View File

@ -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

4
history.txt
View File

@ -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)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -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 = "";