Bug 399075 - Little improvement of the starting script
diff --git a/jetty-server/src/main/dist/bin/dmk.bat b/jetty-server/src/main/dist/bin/dmk.bat
index 62dd8fe..80948bf 100644
--- a/jetty-server/src/main/dist/bin/dmk.bat
+++ b/jetty-server/src/main/dist/bin/dmk.bat
@@ -140,8 +140,9 @@
rem do Clean work:
if not "%CLEAN_FLAG%"=="" (
- rmdir /Q /S "%KERNEL_HOME%\serviceability"
- rmdir /Q /S "%KERNEL_HOME%\work"
+ echo Cleaning the serviceability and working directories...
+ rmdir /Q /S "%KERNEL_HOME%\serviceability" 2>nul
+ rmdir /Q /S "%KERNEL_HOME%\work" 2>nul
set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
)
@@ -167,7 +168,7 @@
set TMP_DIR="%KERNEL_HOME%\work\tmp"
if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
- set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=512m %JAVA_OPTS%
+ set JAVA_OPTS=-Xmx1024m -XX:MaxPermSize=512m %JAVA_OPTS%
rem Run the server
rem Marshall parameters
diff --git a/jetty-server/src/main/filtered/bin/dmk.sh b/jetty-server/src/main/filtered/bin/dmk.sh
index 1f4f3a0..3a5a8f4 100644
--- a/jetty-server/src/main/filtered/bin/dmk.sh
+++ b/jetty-server/src/main/filtered/bin/dmk.sh
@@ -132,6 +132,7 @@
if [ "$CLEAN_FLAG" ]
then
+ echo "Cleaning the serviceability and working directories..."
rm -rf $KERNEL_HOME/work
rm -rf $KERNEL_HOME/serviceability
@@ -189,7 +190,7 @@
# Ensure that the tmp directory exists
mkdir -p $TMP_DIR
- JAVA_OPTS="-Xmx512m \
+ JAVA_OPTS="-Xmx1024m \
-XX:MaxPermSize=512m $JAVA_OPTS"
cd $KERNEL_HOME; exec $JAVA_EXECUTABLE \
diff --git a/kernel/src/main/dist/bin/dmk.bat b/kernel/src/main/dist/bin/dmk.bat
index ea1ed55..d35aca1 100644
--- a/kernel/src/main/dist/bin/dmk.bat
+++ b/kernel/src/main/dist/bin/dmk.bat
@@ -140,8 +140,9 @@
rem do Clean work:
if not "%CLEAN_FLAG%"=="" (
- rmdir /Q /S "%KERNEL_HOME%\serviceability"
- rmdir /Q /S "%KERNEL_HOME%\work"
+ echo Cleaning the serviceability and working directories...
+ rmdir /Q /S "%KERNEL_HOME%\serviceability" 2>nul
+ rmdir /Q /S "%KERNEL_HOME%\work" 2>nul
set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
)
@@ -167,7 +168,7 @@
set TMP_DIR="%KERNEL_HOME%\work\tmp"
if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
- set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=512m %JAVA_OPTS%
+ set JAVA_OPTS=-Xmx1024m -XX:MaxPermSize=512m %JAVA_OPTS%
rem Run the server
rem Marshall parameters
diff --git a/kernel/src/main/filtered/bin/dmk.sh b/kernel/src/main/filtered/bin/dmk.sh
index 2bab7e2..f1909cf 100755
--- a/kernel/src/main/filtered/bin/dmk.sh
+++ b/kernel/src/main/filtered/bin/dmk.sh
@@ -131,6 +131,7 @@
if [ "$CLEAN_FLAG" ]
then
+ echo "Cleaning the serviceability and working directories..."
rm -rf $KERNEL_HOME/work
rm -rf $KERNEL_HOME/serviceability
@@ -188,7 +189,7 @@
# Ensure that the tmp directory exists
mkdir -p $TMP_DIR
- JAVA_OPTS="-Xmx512m \
+ JAVA_OPTS="-Xmx1024m \
-XX:MaxPermSize=512m $JAVA_OPTS"
cd $KERNEL_HOME; exec $JAVA_EXECUTABLE \
diff --git a/nano/src/main/dist/bin/dmk.bat b/nano/src/main/dist/bin/dmk.bat
index ea1ed55..d35aca1 100644
--- a/nano/src/main/dist/bin/dmk.bat
+++ b/nano/src/main/dist/bin/dmk.bat
@@ -140,8 +140,9 @@
rem do Clean work:
if not "%CLEAN_FLAG%"=="" (
- rmdir /Q /S "%KERNEL_HOME%\serviceability"
- rmdir /Q /S "%KERNEL_HOME%\work"
+ echo Cleaning the serviceability and working directories...
+ rmdir /Q /S "%KERNEL_HOME%\serviceability" 2>nul
+ rmdir /Q /S "%KERNEL_HOME%\work" 2>nul
set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
)
@@ -167,7 +168,7 @@
set TMP_DIR="%KERNEL_HOME%\work\tmp"
if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
- set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=512m %JAVA_OPTS%
+ set JAVA_OPTS=-Xmx1024m -XX:MaxPermSize=512m %JAVA_OPTS%
rem Run the server
rem Marshall parameters
diff --git a/nano/src/main/filtered/bin/dmk.sh b/nano/src/main/filtered/bin/dmk.sh
index 2bab7e2..f1909cf 100755
--- a/nano/src/main/filtered/bin/dmk.sh
+++ b/nano/src/main/filtered/bin/dmk.sh
@@ -131,6 +131,7 @@
if [ "$CLEAN_FLAG" ]
then
+ echo "Cleaning the serviceability and working directories..."
rm -rf $KERNEL_HOME/work
rm -rf $KERNEL_HOME/serviceability
@@ -188,7 +189,7 @@
# Ensure that the tmp directory exists
mkdir -p $TMP_DIR
- JAVA_OPTS="-Xmx512m \
+ JAVA_OPTS="-Xmx1024m \
-XX:MaxPermSize=512m $JAVA_OPTS"
cd $KERNEL_HOME; exec $JAVA_EXECUTABLE \
diff --git a/tomcat-server/src/main/dist/bin/dmk.bat b/tomcat-server/src/main/dist/bin/dmk.bat
index 3405920..d35aca1 100644
--- a/tomcat-server/src/main/dist/bin/dmk.bat
+++ b/tomcat-server/src/main/dist/bin/dmk.bat
@@ -140,8 +140,9 @@
rem do Clean work:
if not "%CLEAN_FLAG%"=="" (
- rmdir /Q /S "%KERNEL_HOME%\serviceability"
- rmdir /Q /S "%KERNEL_HOME%\work"
+ echo Cleaning the serviceability and working directories...
+ rmdir /Q /S "%KERNEL_HOME%\serviceability" 2>nul
+ rmdir /Q /S "%KERNEL_HOME%\work" 2>nul
set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
)
@@ -167,7 +168,7 @@
set TMP_DIR="%KERNEL_HOME%\work\tmp"
if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
- set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=512m %JAVA_OPTS%
+ set JAVA_OPTS=-Xmx1024m -XX:MaxPermSize=512m %JAVA_OPTS%
rem Run the server
rem Marshall parameters
@@ -193,7 +194,7 @@
rem If Windows 10 set system property os.name=win32, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=486353
for /f "tokens=4 delims=] " %%i in ('ver') do set VIRGO_DETECTED_WIN_VERSION=%%i
if "%VIRGO_DETECTED_WIN_VERSION:~0,1%"=="1" set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dos.name=win32
-
+
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -classpath "%CLASSPATH%"
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% org.eclipse.equinox.launcher.Main
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -noExit
diff --git a/tomcat-server/src/main/filtered/bin/dmk.sh b/tomcat-server/src/main/filtered/bin/dmk.sh
index 2bab7e2..f1909cf 100755
--- a/tomcat-server/src/main/filtered/bin/dmk.sh
+++ b/tomcat-server/src/main/filtered/bin/dmk.sh
@@ -131,6 +131,7 @@
if [ "$CLEAN_FLAG" ]
then
+ echo "Cleaning the serviceability and working directories..."
rm -rf $KERNEL_HOME/work
rm -rf $KERNEL_HOME/serviceability
@@ -188,7 +189,7 @@
# Ensure that the tmp directory exists
mkdir -p $TMP_DIR
- JAVA_OPTS="-Xmx512m \
+ JAVA_OPTS="-Xmx1024m \
-XX:MaxPermSize=512m $JAVA_OPTS"
cd $KERNEL_HOME; exec $JAVA_EXECUTABLE \
diff --git a/virgo/nano/bin/dmk.bat b/virgo/nano/bin/dmk.bat
index a910a7e..d35aca1 100644
--- a/virgo/nano/bin/dmk.bat
+++ b/virgo/nano/bin/dmk.bat
@@ -140,8 +140,9 @@
rem do Clean work:
if not "%CLEAN_FLAG%"=="" (
- rmdir /Q /S "%KERNEL_HOME%\serviceability"
- rmdir /Q /S "%KERNEL_HOME%\work"
+ echo Cleaning the serviceability and working directories...
+ rmdir /Q /S "%KERNEL_HOME%\serviceability" 2>nul
+ rmdir /Q /S "%KERNEL_HOME%\work" 2>nul
set LAUNCH_OPTS=%LAUNCH_OPTS% -clean
)
@@ -167,7 +168,7 @@
set TMP_DIR="%KERNEL_HOME%\work\tmp"
if not exist "%TMP_DIR%" mkdir "%TMP_DIR%"
- set JAVA_OPTS=-Xmx512m -XX:MaxPermSize=512m %JAVA_OPTS%
+ set JAVA_OPTS=-Xmx1024m -XX:MaxPermSize=512m %JAVA_OPTS%
rem Run the server
rem Marshall parameters
@@ -180,7 +181,7 @@
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.authentication.file="%CONFIG_DIR%\org.eclipse.virgo.kernel.users.properties"
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Djava.io.tmpdir="%TMP_DIR%"
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.home="%KERNEL_HOME%"
- set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java6-server.profile"
+ set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.java.profile="file:%CONFIG_DIR%\java-server.profile"
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dssh.server.keystore="%CONFIG_DIR%/hostkey.ser"
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dorg.eclipse.virgo.kernel.config="%CONFIG_DIR%"
set KERNEL_JAVA_PARMS=%KERNEL_JAVA_PARMS% -Dosgi.sharedConfiguration.area="%CONFIG_DIR%"
diff --git a/virgo/nano/bin/dmk.sh b/virgo/nano/bin/dmk.sh
index 78f8089..f1909cf 100755
--- a/virgo/nano/bin/dmk.sh
+++ b/virgo/nano/bin/dmk.sh
@@ -131,6 +131,7 @@
if [ "$CLEAN_FLAG" ]
then
+ echo "Cleaning the serviceability and working directories..."
rm -rf $KERNEL_HOME/work
rm -rf $KERNEL_HOME/serviceability
@@ -147,7 +148,7 @@
AUTH_LOGIN=$CONFIG_DIR/org.eclipse.virgo.kernel.authentication.config
AUTH_FILE=$CONFIG_DIR/org.eclipse.virgo.kernel.users.properties
CONFIG_AREA=$KERNEL_HOME/work
- JAVA_PROFILE=$KERNEL_HOME/configuration/java6-server.profile
+ JAVA_PROFILE=$KERNEL_HOME/configuration/java-server.profile
if $cygwin; then
ACCESS_PROPERTIES=$(cygpath -wp $ACCESS_PROPERTIES)
@@ -188,7 +189,7 @@
# Ensure that the tmp directory exists
mkdir -p $TMP_DIR
- JAVA_OPTS="-Xmx512m \
+ JAVA_OPTS="-Xmx1024m \
-XX:MaxPermSize=512m $JAVA_OPTS"
cd $KERNEL_HOME; exec $JAVA_EXECUTABLE \
