From edb614d970df167d81498fc6d9be38c42b2c3ac7 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Fri, 3 Apr 2015 23:40:39 +0000 Subject: [PATCH] wrapper.config: Remove old mortbay properties, unused by new Jetty --- .../resources/portable/configs/wrapper.config | 21 +++++++-------- installer/resources/small/wrapper.config | 5 +--- installer/resources/wrapper.config | 26 +++++++++---------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/installer/resources/portable/configs/wrapper.config b/installer/resources/portable/configs/wrapper.config index 594033892a..afa59ded59 100644 --- a/installer/resources/portable/configs/wrapper.config +++ b/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. diff --git a/installer/resources/small/wrapper.config b/installer/resources/small/wrapper.config index fde8e7a630..00460ae9a8 100644 --- a/installer/resources/small/wrapper.config +++ b/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 diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config index e60f14101d..8ed9410d86 100644 --- a/installer/resources/wrapper.config +++ b/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 -- GitLab