From 0766ddd20a189e831be4d6e6470a549f49059376 Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Sat, 23 Jul 2016 16:47:37 +0100 Subject: [PATCH] Small fixes to the wrapper config --- tools/yajsw/conf/wrapper.conf.in | 6 +++--- tools/yajsw/tmp/.DO_NOT_DELETE | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 tools/yajsw/tmp/.DO_NOT_DELETE diff --git a/tools/yajsw/conf/wrapper.conf.in b/tools/yajsw/conf/wrapper.conf.in index bf52803dede..2bfc88d5667 100644 --- a/tools/yajsw/conf/wrapper.conf.in +++ b/tools/yajsw/conf/wrapper.conf.in @@ -11,8 +11,8 @@ wrapper.java.command=java # or define conditions for YAJSW searching for a JVM # currently only valid for windows -wrapper.java.command.minVersion=1.7 -#wrapper.java.command.maxVersion=1.6 +wrapper.java.command.minVersion=1.8 +#wrapper.java.command.maxVersion=1.8 #wrapper.java.command.jreOnly=true #wrapper.java.command.jdkOnly=true #wrapper.java.command.preferJre=true @@ -106,7 +106,7 @@ wrapper.java.additional.6=-Djava.awt.headless=true # Application parameters. Add parameters as needed starting from 1 wrapper.app.parameter.1=jetty -wrapper.app.parameter.2=@jetty.dir@/etc/jetty.xml +wrapper.app.parameter.2=@jetty.dir@/etc/standard.enabled-jetty-configs # Initial Java Heap Size (in MB) # alternative for wrapper.java.additional.=-Xms diff --git a/tools/yajsw/tmp/.DO_NOT_DELETE b/tools/yajsw/tmp/.DO_NOT_DELETE new file mode 100644 index 00000000000..e2a862c183e --- /dev/null +++ b/tools/yajsw/tmp/.DO_NOT_DELETE @@ -0,0 +1 @@ +Required for YAJSW