Created
October 18, 2011 10:06
-
-
Save anpieber/1295087 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf | |
| index 19f47e3..5947cbc 100755 | |
| --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf | |
| +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf | |
| @@ -20,24 +20,28 @@ DIRNAME=`dirname "$0"` | |
| PROGNAME=`basename "$0"` | |
| # | |
| -# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# Sourcing environment settings for karaf similar to tomcats setenv | |
| # | |
| +export KARAF_SCRIPT="karaf" | |
| +if [ -e "$DIRNAME/setenv" ]; then | |
| + . "$DIRNAME/setenv" | |
| +fi | |
| +# | |
| +# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# | |
| if [ "x$JAVA_MIN_MEM" = "x" ]; then | |
| JAVA_MIN_MEM=128M | |
| export JAVA_MIN_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_MEM" = "x" ]; then | |
| JAVA_MAX_MEM=512M | |
| export JAVA_MAX_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_PERM_MEM" = "x" ]; then | |
| JAVA_PERM_MEM=16M | |
| export JAVA_PERM_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then | |
| JAVA_MAX_PERM_MEM=64M | |
| export JAVA_MAX_PERM_MEM | |
| @@ -112,7 +116,7 @@ locateHome() { | |
| if [ "x$KARAF_HOME" != "x" ]; then | |
| warn "Ignoring predefined value for KARAF_HOME" | |
| fi | |
| - | |
| + | |
| # In POSIX shells, CDPATH may cause cd to write to stdout | |
| (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | |
| @@ -166,10 +170,10 @@ pathCanonical() { | |
| dst="`dirname "${dst}"`/$link" | |
| fi | |
| done | |
| - local bas=`basename "${dst}"` | |
| - local dir=`dirname "${dst}"` | |
| + local bas=`basename "${dst}"` | |
| + local dir=`dirname "${dst}"` | |
| if [ "$bas" != "$dir" ]; then | |
| - dst="`pathCanonical "$dir"`/$bas" | |
| + dst="`pathCanonical "$dir"`/$bas" | |
| fi | |
| echo "${dst}" | sed -e 's#//#/#g' -e 's#/./#/#g' -e 's#/[^/]*/../#/#g' | |
| } | |
| @@ -286,7 +290,7 @@ init() { | |
| # Locate the Karaf base directory | |
| locateBase | |
| - | |
| + | |
| # Locate the Karaf data directory | |
| locateData | |
| diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv | |
| new file mode 100644 | |
| index 0000000..3093600 | |
| --- /dev/null | |
| +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/setenv | |
| @@ -0,0 +1,39 @@ | |
| +#!/bin/sh | |
| +# | |
| +# Licensed to the Apache Software Foundation (ASF) under one or more | |
| +# contributor license agreements. See the NOTICE file distributed with | |
| +# this work for additional information regarding copyright ownership. | |
| +# The ASF licenses this file to You under the Apache License, Version 2.0 | |
| +# (the "License"); you may not use this file except in compliance with | |
| +# the License. You may obtain a copy of the License at | |
| +# | |
| +# http://www.apache.org/licenses/LICENSE-2.0 | |
| +# | |
| +# Unless required by applicable law or agreed to in writing, software | |
| +# distributed under the License is distributed on an "AS IS" BASIS, | |
| +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +# See the License for the specific language governing permissions and | |
| +# limitations under the License. | |
| +# | |
| + | |
| +# handle start scripts | |
| +if [ "$KARAF_SCRIPT" == "start" ]; then | |
| + echo "Start Script Settings" | |
| +fi | |
| + | |
| +# handle stop scripts | |
| +if [ "$KARAF_SCRIPT" == "stop" ]; then | |
| + echo "Stop Script Settings" | |
| +fi | |
| + | |
| +# general settings; doesnt matter if executed more than once | |
| +echo "General Settings for script $KARAF_SCRIPT" | |
| +# export JAVA_MIN_MEM=128M | |
| +# export JAVA_MAX_MEM=512M | |
| +# export JAVA_PERM_MEM=16M | |
| +# export JAVA_MAX_PERM_MEM=64M | |
| +# export KARAF_HOME | |
| +# export KARAF_DATA | |
| +# export KARAF_BASE | |
| +# export KARAF_OPTS | |
| + | |
| diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start | |
| index f553db8..17f8841 100755 | |
| --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start | |
| +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/start | |
| @@ -20,27 +20,11 @@ DIRNAME=`dirname "$0"` | |
| PROGNAME=`basename "$0"` | |
| # | |
| -# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# Sourcing environment settings for karaf similar to tomcats setenv | |
| # | |
| - | |
| -if [ "x$JAVA_MIN_MEM" = "x" ]; then | |
| - JAVA_MIN_MEM=128M | |
| - export JAVA_MIN_MEM | |
| -fi | |
| - | |
| -if [ "x$JAVA_MAX_MEM" = "x" ]; then | |
| - JAVA_MAX_MEM=512M | |
| - export JAVA_MAX_MEM | |
| -fi | |
| - | |
| -if [ "x$JAVA_PERM_MEM" = "x" ]; then | |
| - JAVA_PERM_MEM=16M | |
| - export JAVA_PERM_MEM | |
| -fi | |
| - | |
| -if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then | |
| - JAVA_MAX_PERM_MEM=64M | |
| - export JAVA_MAX_PERM_MEM | |
| +export KARAF_SCRIPT="start" | |
| +if [ -e "$DIRNAME/setenv" ]; then | |
| + . "$DIRNAME/setenv" | |
| fi | |
| warn() { | |
| @@ -123,7 +107,7 @@ init() { | |
| # Locate the Karaf base directory | |
| locateBase | |
| - | |
| + | |
| # Locate the Karaf data directory | |
| locateData | |
| } | |
| diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop | |
| index 7595d27..51d913f 100755 | |
| --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop | |
| +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/stop | |
| @@ -20,27 +20,11 @@ DIRNAME=`dirname "$0"` | |
| PROGNAME=`basename "$0"` | |
| # | |
| -# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# Sourcing environment settings for karaf similar to tomcats setenv | |
| # | |
| - | |
| -if [ "x$JAVA_MIN_MEM" = "x" ]; then | |
| - JAVA_MIN_MEM=128M | |
| - export JAVA_MIN_MEM | |
| -fi | |
| - | |
| -if [ "x$JAVA_MAX_MEM" = "x" ]; then | |
| - JAVA_MAX_MEM=512M | |
| - export JAVA_MAX_MEM | |
| -fi | |
| - | |
| -if [ "x$JAVA_PERM_MEM" = "x" ]; then | |
| - JAVA_PERM_MEM=16M | |
| - export JAVA_PERM_MEM | |
| -fi | |
| - | |
| -if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then | |
| - JAVA_MAX_PERM_MEM=64M | |
| - export JAVA_MAX_PERM_MEM | |
| +export KARAF_SCRIPT="stop" | |
| +if [ -e "$DIRNAME/setenv" ]; then | |
| + . "$DIRNAME/setenv" | |
| fi | |
| warn() { | |
| @@ -123,7 +107,7 @@ init() { | |
| # Locate the Karaf base directory | |
| locateBase | |
| - | |
| + | |
| # Locate the Karaf data directory | |
| locateData | |
| } | |
| diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat | |
| index aa47c4e..dbb278e 100755 | |
| --- a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat | |
| +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat | |
| @@ -24,8 +24,13 @@ set DIRNAME=%~dp0% | |
| set PROGNAME=%~nx0% | |
| set ARGS=%* | |
| -rem Check console window title. Set to Karaf by default | |
| +rem Sourcing environment settings for karaf similar to tomcats setenv | |
| +SET KARAF_SCRIPT="karaf.bat" | |
| +if exist "%DIRNAME%setenv.bat" ( | |
| + call "%DIRNAME%setenv.bat" | |
| +) | |
| +rem Check console window title. Set to Karaf by default | |
| if not "%KARAF_TITLE%" == "" ( | |
| title %KARAF_TITLE% | |
| ) else ( | |
| @@ -33,19 +38,15 @@ if not "%KARAF_TITLE%" == "" ( | |
| ) | |
| rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| - | |
| if "%JAVA_MIN_MEM%" == "" ( | |
| set JAVA_MIN_MEM=128M | |
| ) | |
| - | |
| if "%JAVA_MAX_MEM%" == "" ( | |
| set JAVA_MAX_MEM=512M | |
| ) | |
| - | |
| if "%JAVA_PERM_MEM%" == "" ( | |
| set JAVA_PERM_MEM=16M | |
| ) | |
| - | |
| if "%JAVA_MAX_PERM_MEM%" == "" ( | |
| set JAVA_MAX_PERM_MEM=64M | |
| ) | |
| diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat | |
| new file mode 100644 | |
| index 0000000..90b7826 | |
| --- /dev/null | |
| +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/setenv.bat | |
| @@ -0,0 +1,40 @@ | |
| +@echo off | |
| +rem | |
| +rem | |
| +rem Licensed to the Apache Software Foundation (ASF) under one or more | |
| +rem contributor license agreements. See the NOTICE file distributed with | |
| +rem this work for additional information regarding copyright ownership. | |
| +rem The ASF licenses this file to You under the Apache License, Version 2.0 | |
| +rem (the "License"); you may not use this file except in compliance with | |
| +rem the License. You may obtain a copy of the License at | |
| +rem | |
| +rem http://www.apache.org/licenses/LICENSE-2.0 | |
| +rem | |
| +rem Unless required by applicable law or agreed to in writing, software | |
| +rem distributed under the License is distributed on an "AS IS" BASIS, | |
| +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |
| +rem See the License for the specific language governing permissions and | |
| +rem limitations under the License. | |
| +rem | |
| + | |
| +if "%KARAF_SCRIPT%" == "start.bat" ( | |
| + echo "Setup Karaf; start.bat" | |
| + rem SET KARAF_TITLE="Setup Karaf" | |
| +) | |
| + | |
| +if "%KARAF_SCRIPT%" == "stop.bat" ( | |
| + echo "Setup Karaf; stop.bat" | |
| + rem SET KARAF_TITLE="Setup Karaf" | |
| +) | |
| + | |
| +echo "General Settings for script %KARAF_SCRIPT%" | |
| +rem SET KARAF_TITLE="Karaf" | |
| +rem SET JAVA_MIN_MEM=128M | |
| +rem SET JAVA_MAX_MEM=512M | |
| +rem SET JAVA_PERM_MEM=16M | |
| +rem SET JAVA_MAX_PERM_MEM=64M | |
| +rem SET KARAF_HOME | |
| +rem SET KARAF_DATA | |
| +rem SET KARAF_BASE | |
| +rem SET KARAF_OPTS | |
| + | |
| diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat | |
| index a2fc8be..c2f2d0b 100755 | |
| --- a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat | |
| +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/start.bat | |
| @@ -24,32 +24,19 @@ set DIRNAME=%~dp0% | |
| set PROGNAME=%~nx0% | |
| set ARGS=%* | |
| -rem Check console window title. Set to Karaf by default | |
| +rem Sourcing environment settings for karaf similar to tomcats setenv | |
| +SET KARAF_SCRIPT="start.bat" | |
| +if exist "%DIRNAME%setenv.bat" ( | |
| + call "%DIRNAME%setenv.bat" | |
| +) | |
| +rem Check console window title. Set to Karaf by default | |
| if not "%KARAF_TITLE%" == "" ( | |
| title %KARAF_TITLE% | |
| ) else ( | |
| title Karaf | |
| ) | |
| -rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| - | |
| -if "%JAVA_MIN_MEM%" == "" ( | |
| - set JAVA_MIN_MEM=128M | |
| -) | |
| - | |
| -if "%JAVA_MAX_MEM%" == "" ( | |
| - set JAVA_MAX_MEM=512M | |
| -) | |
| - | |
| -if "%JAVA_PERM_MEM%" == "" ( | |
| - set JAVA_PERM_MEM=16M | |
| -) | |
| - | |
| -if "%JAVA_MAX_PERM_MEM%" == "" ( | |
| - set JAVA_MAX_PERM_MEM=64M | |
| -) | |
| - | |
| goto BEGIN | |
| :warn | |
| @@ -91,3 +78,4 @@ endlocal | |
| if not "%PAUSE%" == "" pause | |
| :END_NO_PAUSE | |
| + | |
| diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat | |
| index 04e0fcb..f4c3323 100755 | |
| --- a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat | |
| +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/stop.bat | |
| @@ -24,32 +24,19 @@ set DIRNAME=%~dp0% | |
| set PROGNAME=%~nx0% | |
| set ARGS=%* | |
| -rem Check console window title. Set to Karaf by default | |
| +rem Sourcing environment settings for karaf similar to tomcats setenv | |
| +SET KARAF_SCRIPT="stop.bat" | |
| +if exist "%DIRNAME%setenv.bat" ( | |
| + call "%DIRNAME%setenv.bat" | |
| +) | |
| +rem Check console window title. Set to Karaf by default | |
| if not "%KARAF_TITLE%" == "" ( | |
| title %KARAF_TITLE% | |
| ) else ( | |
| title Karaf | |
| ) | |
| -rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| - | |
| -if "%JAVA_MIN_MEM%" == "" ( | |
| - set JAVA_MIN_MEM=128M | |
| -) | |
| - | |
| -if "%JAVA_MAX_MEM%" == "" ( | |
| - set JAVA_MAX_MEM=512M | |
| -) | |
| - | |
| -if "%JAVA_PERM_MEM%" == "" ( | |
| - set JAVA_PERM_MEM=16M | |
| -) | |
| - | |
| -if "%JAVA_MAX_PERM_MEM%" == "" ( | |
| - set JAVA_MAX_PERM_MEM=64M | |
| -) | |
| - | |
| goto BEGIN | |
| :warn | |
| diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin | |
| index 525aba3..0b0f406 100644 | |
| --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin | |
| +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin | |
| @@ -20,24 +20,28 @@ DIRNAME=`dirname "$0"` | |
| PROGNAME=`basename "$0"` | |
| # | |
| -# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# Sourcing environment settings for karaf similar to tomcats setenv | |
| # | |
| +export KARAF_SCRIPT="admin" | |
| +if [ -e "$DIRNAME/setenv" ]; then | |
| + . "$DIRNAME/setenv" | |
| +fi | |
| +# | |
| +# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# | |
| if [ "x$JAVA_MIN_MEM" = "x" ]; then | |
| JAVA_MIN_MEM=128M | |
| export JAVA_MIN_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_MEM" = "x" ]; then | |
| JAVA_MAX_MEM=512M | |
| export JAVA_MAX_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_PERM_MEM" = "x" ]; then | |
| JAVA_PERM_MEM=16M | |
| export JAVA_PERM_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then | |
| JAVA_MAX_PERM_MEM=64M | |
| export JAVA_MAX_PERM_MEM | |
| @@ -112,7 +116,7 @@ locateHome() { | |
| if [ "x$KARAF_HOME" != "x" ]; then | |
| warn "Ignoring predefined value for KARAF_HOME" | |
| fi | |
| - | |
| + | |
| # In POSIX shells, CDPATH may cause cd to write to stdout | |
| (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | |
| @@ -313,3 +317,4 @@ main() { | |
| } | |
| main "$@" | |
| + | |
| diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat | |
| index f6958a8..c364ee9 100644 | |
| --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat | |
| +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat | |
| @@ -24,8 +24,13 @@ set DIRNAME=%~dp0% | |
| set PROGNAME=%~nx0% | |
| set ARGS=%* | |
| -rem Check console window title. Set to Karaf by default | |
| +rem Sourcing environment settings for karaf similar to tomcats setenv | |
| +SET KARAF_SCRIPT="admin.bat" | |
| +if exist "%DIRNAME%setenv.bat" ( | |
| + call "%DIRNAME%setenv.bat" | |
| +) | |
| +rem Check console window title. Set to Karaf by default | |
| if not "%KARAF_TITLE%" == "" ( | |
| title %KARAF_TITLE% | |
| ) else ( | |
| @@ -33,19 +38,15 @@ if not "%KARAF_TITLE%" == "" ( | |
| ) | |
| rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| - | |
| if "%JAVA_MIN_MEM%" == "" ( | |
| set JAVA_MIN_MEM=128M | |
| ) | |
| - | |
| if "%JAVA_MAX_MEM%" == "" ( | |
| set JAVA_MAX_MEM=512M | |
| ) | |
| - | |
| if "%JAVA_PERM_MEM%" == "" ( | |
| set JAVA_PERM_MEM=16M | |
| ) | |
| - | |
| if "%JAVA_MAX_PERM_MEM%" == "" ( | |
| set JAVA_MAX_PERM_MEM=64M | |
| ) | |
| diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/client b/assemblies/apache-karaf/src/main/filtered-resources/bin/client | |
| index 400185a..5adde36 100644 | |
| --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client | |
| +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/client | |
| @@ -20,24 +20,28 @@ DIRNAME=`dirname "$0"` | |
| PROGNAME=`basename "$0"` | |
| # | |
| -# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# Sourcing environment settings for karaf similar to tomcats setenv | |
| # | |
| +export KARAF_SCRIPT="client" | |
| +if [ -e "$DIRNAME/setenv" ]; then | |
| + . "$DIRNAME/setenv" | |
| +fi | |
| +# | |
| +# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# | |
| if [ "x$JAVA_MIN_MEM" = "x" ]; then | |
| JAVA_MIN_MEM=128M | |
| export JAVA_MIN_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_MEM" = "x" ]; then | |
| JAVA_MAX_MEM=512M | |
| export JAVA_MAX_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_PERM_MEM" = "x" ]; then | |
| JAVA_PERM_MEM=16M | |
| export JAVA_PERM_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then | |
| JAVA_MAX_PERM_MEM=64M | |
| export JAVA_MAX_PERM_MEM | |
| diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat | |
| index 4236be3..d4e6c75 100644 | |
| --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat | |
| +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat | |
| @@ -24,8 +24,13 @@ set DIRNAME=%~dp0% | |
| set PROGNAME=%~nx0% | |
| set ARGS=%* | |
| -rem Check console window title. Set to Karaf by default | |
| +rem Sourcing environment settings for karaf similar to tomcats setenv | |
| +SET KARAF_SCRIPT="client.bat" | |
| +if exist "%DIRNAME%setenv.bat" ( | |
| + call "%DIRNAME%setenv.bat" | |
| +) | |
| +rem Check console window title. Set to Karaf by default | |
| if not "%KARAF_TITLE%" == "" ( | |
| title %KARAF_TITLE% | |
| ) else ( | |
| @@ -33,19 +38,15 @@ if not "%KARAF_TITLE%" == "" ( | |
| ) | |
| rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| - | |
| if "%JAVA_MIN_MEM%" == "" ( | |
| set JAVA_MIN_MEM=128M | |
| ) | |
| - | |
| if "%JAVA_MAX_MEM%" == "" ( | |
| set JAVA_MAX_MEM=512M | |
| ) | |
| - | |
| if "%JAVA_PERM_MEM%" == "" ( | |
| set JAVA_PERM_MEM=16M | |
| ) | |
| - | |
| if "%JAVA_MAX_PERM_MEM%" == "" ( | |
| set JAVA_MAX_PERM_MEM=64M | |
| ) | |
| diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell | |
| index d68ffa9..7faf32f 100644 | |
| --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell | |
| +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell | |
| @@ -20,24 +20,28 @@ DIRNAME=`dirname "$0"` | |
| PROGNAME=`basename "$0"` | |
| # | |
| -# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# Sourcing environment settings for karaf similar to tomcats setenv | |
| # | |
| +export KARAF_SCRIPT="shell" | |
| +if [ -e "$DIRNAME/setenv" ]; then | |
| + . "$DIRNAME/setenv" | |
| +fi | |
| +# | |
| +# Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| +# | |
| if [ "x$JAVA_MIN_MEM" = "x" ]; then | |
| JAVA_MIN_MEM=128M | |
| export JAVA_MIN_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_MEM" = "x" ]; then | |
| JAVA_MAX_MEM=512M | |
| export JAVA_MAX_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_PERM_MEM" = "x" ]; then | |
| JAVA_PERM_MEM=16M | |
| export JAVA_PERM_MEM | |
| fi | |
| - | |
| if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then | |
| JAVA_MAX_PERM_MEM=64M | |
| export JAVA_MAX_PERM_MEM | |
| @@ -112,7 +116,7 @@ locateHome() { | |
| if [ "x$KARAF_HOME" != "x" ]; then | |
| warn "Ignoring predefined value for KARAF_HOME" | |
| fi | |
| - | |
| + | |
| # In POSIX shells, CDPATH may cause cd to write to stdout | |
| (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | |
| @@ -306,3 +310,4 @@ main() { | |
| } | |
| main "$@" | |
| + | |
| diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat | |
| index d627851..1657281 100644 | |
| --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat | |
| +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat | |
| @@ -24,8 +24,13 @@ set DIRNAME=%~dp0% | |
| set PROGNAME=%~nx0% | |
| set ARGS=%* | |
| -rem Check console window title. Set to Karaf by default | |
| +rem Sourcing environment settings for karaf similar to tomcats setenv | |
| +SET KARAF_SCRIPT="shell.bat" | |
| +if exist "%DIRNAME%setenv.bat" ( | |
| + call "%DIRNAME%setenv.bat" | |
| +) | |
| +rem Check console window title. Set to Karaf by default | |
| if not "%KARAF_TITLE%" == "" ( | |
| title %KARAF_TITLE% | |
| ) else ( | |
| @@ -33,19 +38,15 @@ if not "%KARAF_TITLE%" == "" ( | |
| ) | |
| rem Check/Set up some easily accessible MIN/MAX params for JVM mem usage | |
| - | |
| if "%JAVA_MIN_MEM%" == "" ( | |
| set JAVA_MIN_MEM=128M | |
| ) | |
| - | |
| if "%JAVA_MAX_MEM%" == "" ( | |
| set JAVA_MAX_MEM=512M | |
| ) | |
| - | |
| if "%JAVA_PERM_MEM%" == "" ( | |
| set JAVA_PERM_MEM=16M | |
| ) | |
| - | |
| if "%JAVA_MAX_PERM_MEM%" == "" ( | |
| set JAVA_MAX_PERM_MEM=64M | |
| ) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment