karaf-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (KARAF-5464) karaf.bat file is missing KARAF_SYSTEM_OPTS property
Date Mon, 11 Dec 2017 10:12:00 GMT

    [ https://issues.apache.org/jira/browse/KARAF-5464?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16285717#comment-16285717
] 

ASF GitHub Bot commented on KARAF-5464:
---------------------------------------

jbonofre closed pull request #426: [KARAF-5464] Add KARAF_SYSTEM_OPTS on karaf.bat and add
corresponding…
URL: https://github.com/apache/karaf/pull/426
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index 1f95c211e8..4d14deeaee 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -410,7 +410,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
                 -Djava.io.tmpdir="%KARAF_DATA%\tmp" ^
                 -Dkaraf.data="%KARAF_DATA%" ^
                 -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties"
^
-                %KARAF_OPTS% %MAIN% %ARGS%
+                %KARAF_SYSTEM_OPTS% %KARAF_OPTS% %MAIN% %ARGS%
         ) else (
             "%JAVA%" %JAVA_OPTS% %OPTS% ^
                 -classpath "%CLASSPATH%" ^
@@ -424,7 +424,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
                 -Djava.io.tmpdir="%KARAF_DATA%\tmp" ^
                 -Dkaraf.data="%KARAF_DATA%" ^
                 -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties"
^
-                %KARAF_OPTS% %MAIN% %ARGS%
+                %KARAF_SYSTEM_OPTS% %KARAF_OPTS% %MAIN% %ARGS%
         )
     ) else (
         echo There is a Root instance already running with name %ROOT_INSTANCE_NAME% and
pid %ROOT_INSTANCE_PID%. If you know what you are doing and want to force the run anyway,
SET CHECK_ROOT_INSTANCE_RUNNING=false and re run the command.
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
index 7ea9f69872..f285fc0187 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv
@@ -45,6 +45,7 @@
 # export KARAF_DATA # Karaf data folder
 # export KARAF_BASE # Karaf base folder
 # export KARAF_ETC  # Karaf etc  folder
+# export KARAF_SYSTEM_OPTS # First citizen Karaf options
 # export KARAF_OPTS # Additional available Karaf options
 # export KARAF_DEBUG # Enable debug mode
 # export KARAF_REDIRECT # Enable/set the std/err redirection when using bin/start
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat
index 2eead33592..b5ed41773e 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/setenv.bat
@@ -58,6 +58,8 @@ rem Karaf base folder
 rem SET KARAF_BASE
 rem Karaf etc folder
 rem SET KARAF_ETC
+rem First citizen Karaf options
+rem SET KARAF_SYSTEM_OPTS
 rem Additional available Karaf options
 rem SET KARAF_OPTS
 rem Enable debug mode


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> karaf.bat file is missing KARAF_SYSTEM_OPTS property
> ----------------------------------------------------
>
>                 Key: KARAF-5464
>                 URL: https://issues.apache.org/jira/browse/KARAF-5464
>             Project: Karaf
>          Issue Type: Bug
>          Components: karaf-core
>    Affects Versions: 4.1.3
>            Reporter: Scott Tustison
>            Assignee: Jean-Baptiste Onofré
>            Priority: Minor
>             Fix For: 4.1.4, 4.2.0
>
>
> The KARAF_SYSTEM_OPTS property that exists in the .sh karaf script is missing from the
.bat file version, which can cause different behavior between Linux and Windows.



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)

Mime
View raw message