merge of '18f97452ba9fd5a7274ca689084ffe49b55c2cf3'

and 'c9caed8c48615dc740061fd28315ee659e1afe20'

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -580,7 +580,7 @@ public class TunnelController implements Logging {
      */
     public void stopTunnel() {
         synchronized (this) {
-            if (_state != TunnelState.RUNNING)
+            if (_state != TunnelState.STARTING && _state != TunnelState.RUNNING)
                 return;
             changeState(TunnelState.STOPPING);
         }

history.txt

@@ -1,3 +1,7 @@
+2015-04-03 zzz
+ * i2ptunnel: Fix stopping tunnel on bad args when starting
+ * wrapper.config: Remove old mortbay Jetty parameters
+
 2015-04-01 zzz
  * I2CP: Allow larger client clock skew (ticket #1503)
  * i2psnark: Fix changing data directory on Windows (ticket #1503)

installer/resources/portable/configs/wrapper.config

@@ -13,25 +13,22 @@ wrapper.java.library.path.1=lib
 # Java Additional Parameters
 # Numbers must be consecutive (except for stripquotes)
 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
-wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
-wrapper.java.additional.3=-Dorg.mortbay.util.FileResource.checkAliases=false
-wrapper.java.additional.4=-Dorg.mortbay.xml.XmlParser.NotValidating=true
-wrapper.java.additional.5=-Di2p.dir.base=.
-wrapper.java.additional.5.stripquotes=TRUE
+wrapper.java.additional.2=-Di2p.dir.base=.
+wrapper.java.additional.2.stripquotes=TRUE
 
 # Prevent the JVM from exporting stats (and thereby causing hundreds of
 # ms long pauses during GC)
 # http://www.evanjones.ca/jvm-mmap-pause.html
-# wrapper.java.additional.6=-XX:+PerfDisableSharedMem
+#wrapper.java.additional.3=-XX:+PerfDisableSharedMem
 
 # PORTABLE installation:
 # uncomment the following
-wrapper.java.additional.7=-Di2p.dir.pid=logs
-wrapper.java.additional.7.stripquotes=TRUE
-wrapper.java.additional.8=-Di2p.dir.temp=tmp
-wrapper.java.additional.8.stripquotes=TRUE
-wrapper.java.additional.9=-Di2p.dir.config=.
-wrapper.java.additional.9.stripquotes=TRUE
+wrapper.java.additional.3=-Di2p.dir.pid=logs
+wrapper.java.additional.3.stripquotes=TRUE
+wrapper.java.additional.4=-Di2p.dir.temp=tmp
+wrapper.java.additional.4.stripquotes=TRUE
+wrapper.java.additional.5=-Di2p.dir.config=.
+wrapper.java.additional.5.stripquotes=TRUE
 
 # Uncomment this for better performance.
 # If it doesn't work, server mode is not available in your JVM.

installer/resources/small/wrapper.config

@@ -55,14 +55,11 @@ wrapper.java.library.path.2=lib
 
 # Java Additional Parameters
 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
-wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
-wrapper.java.additional.3=-Dorg.mortbay.util.FileResource.checkAliases=false
-wrapper.java.additional.4=-Dorg.mortbay.xml.XmlParser.NotValidating=true
 
 # Prevent the JVM from exporting stats (and thereby causing hundreds of
 # ms long pauses during GC)
 # http://www.evanjones.ca/jvm-mmap-pause.html
-# wrapper.java.additional.5=-XX:+PerfDisableSharedMem
+#wrapper.java.additional.2=-XX:+PerfDisableSharedMem
 
 # Initial Java Heap Size (in MB)
 #wrapper.java.initmemory=4

installer/resources/wrapper.config

@@ -74,15 +74,13 @@ wrapper.java.additional.auto_bits=TRUE
 # Java Additional Parameters
 # Numbers must be consecutive (except for stripquotes)
 wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
-wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
-wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
-wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
-wrapper.java.additional.4.stripquotes=TRUE
+wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH"
+wrapper.java.additional.2.stripquotes=TRUE
 
 # Prevent the JVM from exporting stats (and thereby causing hundreds of
 # ms long pauses during GC)
 # http://www.evanjones.ca/jvm-mmap-pause.html
-# wrapper.java.additional.5=-XX:+PerfDisableSharedMem
+#wrapper.java.additional.3=-XX:+PerfDisableSharedMem
 
 # On some IPv6 enabled systems, I2P and other network-enabled java applications
 # may fail to start. For examples see
@@ -90,8 +88,8 @@ wrapper.java.additional.4.stripquotes=TRUE
 # Two things that may help if you experience this issue
 # 1) "echo 0 > /proc/sys/net/ipv6/bindv6only" as root; or
 # 2) uncomment the next two lines:
-#wrapper.java.additional.6=-Djava.net.preferIPv4Stack=true
-#wrapper.java.additional.7=-Djava.net.preferIPv6Addresses=false
+#wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
+#wrapper.java.additional.4=-Djava.net.preferIPv6Addresses=false
 
 # Jetty says this is a security risk
 # Uncommenting this won't help as the router forces it to true
@@ -101,18 +99,18 @@ wrapper.java.additional.4.stripquotes=TRUE
 # wrapper.java.additional.8=-Dorg.mortbay.util.FileResource.checkAliases=false
 # PORTABLE installation:
 # uncomment the following
-#wrapper.java.additional.8=-Di2p.dir.pid="$INSTALL_PATH"
-#wrapper.java.additional.8.stripquotes=TRUE
-#wrapper.java.additional.9=-Di2p.dir.temp="$INSTALL_PATH"
-#wrapper.java.additional.9.stripquotes=TRUE
-#wrapper.java.additional.10=-Di2p.dir.config="$INSTALL_PATH"
-#wrapper.java.additional.10.stripquotes=TRUE
+#wrapper.java.additional.3=-Di2p.dir.pid="$INSTALL_PATH"
+#wrapper.java.additional.3.stripquotes=TRUE
+#wrapper.java.additional.4=-Di2p.dir.temp="$INSTALL_PATH"
+#wrapper.java.additional.4.stripquotes=TRUE
+#wrapper.java.additional.5=-Di2p.dir.config="$INSTALL_PATH"
+#wrapper.java.additional.5.stripquotes=TRUE
 #
 # Uncomment this for better performance.
 # If it doesn't work, server mode is not available in your JVM.
 # This may not be required if your machine is already "server-class".
 # See http://java.sun.com/j2se/1.5.0/docs/guide/vm/server-class.html
-#wrapper.java.additional.7=-server
+#wrapper.java.additional.5=-server
 
 # Initial Java Heap Size (in MB)
 #wrapper.java.initmemory=4

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 = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";