Changeset edb614d for installer


Ignore:
Timestamp:
Apr 3, 2015 11:40:39 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
fcec43b
Parents:
820b99e
Message:

wrapper.config: Remove old mortbay properties, unused by new Jetty

Location:
installer/resources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/portable/configs/wrapper.config

    r820b99e redb614d  
    1414# Numbers must be consecutive (except for stripquotes)
    1515wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    16 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
    17 wrapper.java.additional.3=-Dorg.mortbay.util.FileResource.checkAliases=false
    18 wrapper.java.additional.4=-Dorg.mortbay.xml.XmlParser.NotValidating=true
    19 wrapper.java.additional.5=-Di2p.dir.base=.
    20 wrapper.java.additional.5.stripquotes=TRUE
     16wrapper.java.additional.2=-Di2p.dir.base=.
     17wrapper.java.additional.2.stripquotes=TRUE
    2118
    2219# Prevent the JVM from exporting stats (and thereby causing hundreds of
    2320# ms long pauses during GC)
    2421# http://www.evanjones.ca/jvm-mmap-pause.html
    25 # wrapper.java.additional.6=-XX:+PerfDisableSharedMem
     22#wrapper.java.additional.3=-XX:+PerfDisableSharedMem
    2623
    2724# PORTABLE installation:
    2825# uncomment the following
    29 wrapper.java.additional.7=-Di2p.dir.pid=logs
    30 wrapper.java.additional.7.stripquotes=TRUE
    31 wrapper.java.additional.8=-Di2p.dir.temp=tmp
    32 wrapper.java.additional.8.stripquotes=TRUE
    33 wrapper.java.additional.9=-Di2p.dir.config=.
    34 wrapper.java.additional.9.stripquotes=TRUE
     26wrapper.java.additional.3=-Di2p.dir.pid=logs
     27wrapper.java.additional.3.stripquotes=TRUE
     28wrapper.java.additional.4=-Di2p.dir.temp=tmp
     29wrapper.java.additional.4.stripquotes=TRUE
     30wrapper.java.additional.5=-Di2p.dir.config=.
     31wrapper.java.additional.5.stripquotes=TRUE
    3532
    3633# Uncomment this for better performance.
  • installer/resources/small/wrapper.config

    r820b99e redb614d  
    5656# Java Additional Parameters
    5757wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    58 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
    59 wrapper.java.additional.3=-Dorg.mortbay.util.FileResource.checkAliases=false
    60 wrapper.java.additional.4=-Dorg.mortbay.xml.XmlParser.NotValidating=true
    6158
    6259# Prevent the JVM from exporting stats (and thereby causing hundreds of
    6360# ms long pauses during GC)
    6461# http://www.evanjones.ca/jvm-mmap-pause.html
    65 # wrapper.java.additional.5=-XX:+PerfDisableSharedMem
     62#wrapper.java.additional.2=-XX:+PerfDisableSharedMem
    6663
    6764# Initial Java Heap Size (in MB)
  • installer/resources/wrapper.config

    r820b99e redb614d  
    7575# Numbers must be consecutive (except for stripquotes)
    7676wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
    77 wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
    78 wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
    79 wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
    80 wrapper.java.additional.4.stripquotes=TRUE
     77wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH"
     78wrapper.java.additional.2.stripquotes=TRUE
    8179
    8280# Prevent the JVM from exporting stats (and thereby causing hundreds of
    8381# ms long pauses during GC)
    8482# http://www.evanjones.ca/jvm-mmap-pause.html
    85 # wrapper.java.additional.5=-XX:+PerfDisableSharedMem
     83#wrapper.java.additional.3=-XX:+PerfDisableSharedMem
    8684
    8785# On some IPv6 enabled systems, I2P and other network-enabled java applications
     
    9189# 1) "echo 0 > /proc/sys/net/ipv6/bindv6only" as root; or
    9290# 2) uncomment the next two lines:
    93 #wrapper.java.additional.6=-Djava.net.preferIPv4Stack=true
    94 #wrapper.java.additional.7=-Djava.net.preferIPv6Addresses=false
     91#wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
     92#wrapper.java.additional.4=-Djava.net.preferIPv6Addresses=false
    9593
    9694# Jetty says this is a security risk
     
    102100# PORTABLE installation:
    103101# uncomment the following
    104 #wrapper.java.additional.8=-Di2p.dir.pid="$INSTALL_PATH"
    105 #wrapper.java.additional.8.stripquotes=TRUE
    106 #wrapper.java.additional.9=-Di2p.dir.temp="$INSTALL_PATH"
    107 #wrapper.java.additional.9.stripquotes=TRUE
    108 #wrapper.java.additional.10=-Di2p.dir.config="$INSTALL_PATH"
    109 #wrapper.java.additional.10.stripquotes=TRUE
     102#wrapper.java.additional.3=-Di2p.dir.pid="$INSTALL_PATH"
     103#wrapper.java.additional.3.stripquotes=TRUE
     104#wrapper.java.additional.4=-Di2p.dir.temp="$INSTALL_PATH"
     105#wrapper.java.additional.4.stripquotes=TRUE
     106#wrapper.java.additional.5=-Di2p.dir.config="$INSTALL_PATH"
     107#wrapper.java.additional.5.stripquotes=TRUE
    110108#
    111109# Uncomment this for better performance.
     
    113111# This may not be required if your machine is already "server-class".
    114112# See http://java.sun.com/j2se/1.5.0/docs/guide/vm/server-class.html
    115 #wrapper.java.additional.7=-server
     113#wrapper.java.additional.5=-server
    116114
    117115# Initial Java Heap Size (in MB)
Note: See TracChangeset for help on using the changeset viewer.