You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/03/25 14:54:39 UTC
[karaf] branch master updated: [KARAF-6198] Fix quotes on Windows
for wrapper
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 8eb1a6f [KARAF-6198] Fix quotes on Windows for wrapper
new 1799c42 Merge pull request #793 from jbonofre/KARAF-6198
8eb1a6f is described below
commit 8eb1a6f4c59dac6e6dabb8b8fbd5d7719f5da1ee
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Mar 24 17:42:00 2019 +0100
[KARAF-6198] Fix quotes on Windows for wrapper
---
.../wrapper/internal/windows/karaf-wrapper-java11.conf | 16 ++++++++--------
.../wrapper/internal/windows64/karaf-wrapper-java11.conf | 16 ++++++++--------
.../wrapper/internal/windows64/karaf-wrapper-java8.conf | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
index 2d7b4f4..0aff4f5 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
@@ -46,15 +46,15 @@ wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/
# JVM Parameters
# note that n is the parameter number starting from 1.
-wrapper.java.additional.1=-Dkaraf.instances=%KARAF_HOME%/instances
-wrapper.java.additional.2=-Dkaraf.home=%KARAF_HOME%
-wrapper.java.additional.3=-Dkaraf.base=%KARAF_BASE%
-wrapper.java.additional.4=-Dkaraf.data=%KARAF_DATA%
-wrapper.java.additional.5=-Dkaraf.etc=%KARAF_ETC%
-wrapper.java.additional.6=-Dkaraf.log=%KARAF_LOG%
+wrapper.java.additional.1=-Dkaraf.instances="%KARAF_HOME%/instances"
+wrapper.java.additional.2=-Dkaraf.home="%KARAF_HOME%"
+wrapper.java.additional.3=-Dkaraf.base="%KARAF_BASE%"
+wrapper.java.additional.4=-Dkaraf.data="%KARAF_DATA%"
+wrapper.java.additional.5=-Dkaraf.etc="%KARAF_ETC%"
+wrapper.java.additional.6=-Dkaraf.log="%KARAF_LOG%"
wrapper.java.additional.7=-Dkaraf.restart.jvm.supported=true
-wrapper.java.additional.8=-Djava.io.tmpdir=%KARAF_DATA%/tmp
-wrapper.java.additional.9=-Djava.util.logging.config.file=%KARAF_ETC%/java.util.logging.properties
+wrapper.java.additional.8=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
+wrapper.java.additional.9=-Djava.util.logging.config.file="%KARAF_ETC%/java.util.logging.properties"
wrapper.java.additional.10=-Dcom.sun.management.jmxremote
wrapper.java.additional.11=-Dkaraf.startLocalConsole=false
wrapper.java.additional.12=-Dkaraf.startRemoteShell=true
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
index 0065bfa..47b2bf5 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
@@ -46,15 +46,15 @@ wrapper.java.library.path.1=%KARAF_BASE%/lib/wrapper/
# JVM Parameters
# note that n is the parameter number starting from 1.
-wrapper.java.additional.1=-Dkaraf.instances=%KARAF_HOME%/instances
-wrapper.java.additional.2=-Dkaraf.home=%KARAF_HOME%
-wrapper.java.additional.3=-Dkaraf.base=%KARAF_BASE%
-wrapper.java.additional.4=-Dkaraf.data=%KARAF_DATA%
-wrapper.java.additional.5=-Dkaraf.etc=%KARAF_ETC%
-wrapper.java.additional.6=-Dkaraf.log=%KARAF_LOG%
+wrapper.java.additional.1=-Dkaraf.instances="%KARAF_HOME%/instances"
+wrapper.java.additional.2=-Dkaraf.home="%KARAF_HOME%"
+wrapper.java.additional.3=-Dkaraf.base="%KARAF_BASE%"
+wrapper.java.additional.4=-Dkaraf.data="%KARAF_DATA%"
+wrapper.java.additional.5=-Dkaraf.etc="%KARAF_ETC%"
+wrapper.java.additional.6=-Dkaraf.log="%KARAF_LOG%"
wrapper.java.additional.7=-Dkaraf.restart.jvm.supported=true
-wrapper.java.additional.8=-Djava.io.tmpdir=%KARAF_DATA%/tmp
-wrapper.java.additional.9=-Djava.util.logging.config.file=%KARAF_BASE%/etc/java.util.logging.properties
+wrapper.java.additional.8=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
+wrapper.java.additional.9=-Djava.util.logging.config.file="%KARAF_BASE%/etc/java.util.logging.properties"
wrapper.java.additional.10=-Dcom.sun.management.jmxremote
wrapper.java.additional.11=-Dkaraf.startLocalConsole=false
wrapper.java.additional.12=-Dkaraf.startRemoteShell=true
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
index 86d2e2d..cd15b40 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
@@ -52,7 +52,7 @@ wrapper.java.additional.7=-Dkaraf.etc="%KARAF_ETC%"
wrapper.java.additional.8=-Dkaraf.log="%KARAF_LOG%"
wrapper.java.additional.9=-Dkaraf.restart.jvm.supported=true
wrapper.java.additional.10=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
-wrapper.java.additional.11=-Djava.util.logging.config.file=%KARAF_ETC%/java.util.logging.properties
+wrapper.java.additional.11=-Djava.util.logging.config.file="%KARAF_ETC%/java.util.logging.properties"
wrapper.java.additional.12=-Dcom.sun.management.jmxremote
wrapper.java.additional.13=-Dkaraf.startLocalConsole=false
wrapper.java.additional.14=-Dkaraf.startRemoteShell=true