From 46f810e7887b09190abffb712ce4ec96d8628064 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Wed, 05 Feb 2014 15:58:25 +0000
Subject: [PATCH] Forward port OPENDJ-1322: Control-Panel.bat can not start and stop the OpenDJ server when running as a windows service
---
opendj3-server-dev/resource/bin/stop-ds.bat | 10 ++--
opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java | 44 +++++++++++-----------
opendj3-server-dev/resource/bin/start-ds.bat | 8 ++--
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/opendj3-server-dev/resource/bin/start-ds.bat b/opendj3-server-dev/resource/bin/start-ds.bat
index 5e13557..08f1379 100644
--- a/opendj3-server-dev/resource/bin/start-ds.bat
+++ b/opendj3-server-dev/resource/bin/start-ds.bat
@@ -40,11 +40,11 @@
cd /d %INSTANCE_DIR%
set INSTANCE_ROOT=%CD%
cd /d %CUR_DIR%
-set TEMP_LOG=%TEMP%\logs\
+set TEMP_LOG="%TEMP%\logs\"
-if NOT EXIST %INSTANCE_ROOT%\logs\ (
- if NOT EXIST %TEMP_LOG% (
- md %TEMP_LOG%
+if NOT EXIST "%INSTANCE_ROOT%\logs\" (
+ if NOT EXIST "%TEMP_LOG%" (
+ md "%TEMP_LOG%"
)
set LOG="%TEMP_LOG%native-windows.out"
) ELSE (
diff --git a/opendj3-server-dev/resource/bin/stop-ds.bat b/opendj3-server-dev/resource/bin/stop-ds.bat
index 862e9d9..40a09c4 100644
--- a/opendj3-server-dev/resource/bin/stop-ds.bat
+++ b/opendj3-server-dev/resource/bin/stop-ds.bat
@@ -23,7 +23,7 @@
rem
rem
rem Copyright 2006-2010 Sun Microsystems, Inc.
-rem Portions Copyright 2011-2013 ForgeRock AS
+rem Portions Copyright 2011-2014 ForgeRock AS
setlocal
@@ -51,11 +51,11 @@
cd /d%INSTANCE_DIR%
set INSTANCE_ROOT=%CD%
cd /d%CUR_DIR%
-set TEMP_LOG=%TEMP%\logs\
+set TEMP_LOG="%TEMP%\logs\"
-if NOT EXIST %INSTANCE_ROOT%\logs\ (
- if NOT EXIST %TEMP_LOG% (
- md %TEMP_LOG%
+if NOT EXIST "%INSTANCE_ROOT%\logs\" (
+ if NOT EXIST "%TEMP_LOG%" (
+ md "%TEMP_LOG%"
)
set LOG="%TEMP_LOG%native-windows.out"
) ELSE (
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
index 1ca2afa..e147e55 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesTool.java
@@ -880,15 +880,15 @@
{
buf.append(
"if \"%OPENDJ_JAVA_HOME%\" == \"\" goto "+javaHomeLabel2+LEGACY+EOL+
- "set TEMP=%OPENDJ_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP%\" goto "+javaHomeLabel2+LEGACY+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP%"+EOL+
+ "set TEMP_EXE=%OPENDJ_JAVA_HOME%\\bin\\java.exe"+EOL+
+ "if not exist \"%TEMP_EXE%\" goto "+javaHomeLabel2+LEGACY+EOL+
+ "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
"goto "+javaArgsLabel1+EOL+EOL+
":"+javaHomeLabel2+LEGACY+EOL+
"if \"%OPENDS_JAVA_HOME%\" == \"\" goto "+javaHomeLabel2+EOL+
- "set TEMP=%OPENDS_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP%\" goto "+javaHomeLabel2+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP%"+EOL+
+ "set TEMP_EXE=%OPENDS_JAVA_HOME%\\bin\\java.exe"+EOL+
+ "if not exist \"%TEMP_EXE%\" goto "+javaHomeLabel2+EOL+
+ "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
"goto "+javaArgsLabel1+EOL+EOL
);
}
@@ -896,15 +896,15 @@
{
buf.append(
"if \"%OPENDJ_JAVA_HOME%\" == \"\" goto "+javaArgsLabel1+LEGACY+EOL+
- "set TEMP=%OPENDJ_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP%\" goto "+javaArgsLabel1+LEGACY+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP%"+EOL+
+ "set TEMP_EXE=%OPENDJ_JAVA_HOME%\\bin\\java.exe"+EOL+
+ "if not exist \"%TEMP_EXE%\" goto "+javaArgsLabel1+LEGACY+EOL+
+ "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
"goto "+javaArgsLabel1+EOL+EOL+
":"+javaArgsLabel1+LEGACY+EOL+
"if \"%OPENDS_JAVA_HOME%\" == \"\" goto "+javaArgsLabel1+EOL+
- "set TEMP=%OPENDS_JAVA_HOME%\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP%\" goto "+javaArgsLabel1+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP%"+EOL+
+ "set TEMP_EXE=%OPENDS_JAVA_HOME%\\bin\\java.exe"+EOL+
+ "if not exist \"%TEMP_EXE%\" goto "+javaArgsLabel1+EOL+
+ "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
"goto "+javaArgsLabel1+EOL+EOL
);
}
@@ -915,9 +915,9 @@
{
buf.append(
":"+CHECK_DEFAULT_JAVA_HOME+EOL+
- "set TEMP="+defaultJavaHome+"\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP%\" goto "+javaArgsLabel1+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP%"+EOL+
+ "set TEMP_EXE="+defaultJavaHome+"\\bin\\java.exe"+EOL+
+ "if not exist \"%TEMP_EXE%\" goto "+javaArgsLabel1+EOL+
+ "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
"goto "+javaArgsLabel1+EOL+EOL
);
}
@@ -925,9 +925,9 @@
{
buf.append(
":"+CHECK_DEFAULT_JAVA_HOME+EOL+
- "set TEMP="+defaultJavaHome+"\\bin\\java.exe"+EOL+
- "if not exist \"%TEMP%\" goto "+CHECK_ENV_JAVA_HOME+EOL+
- "set OPENDJ_JAVA_BIN=%TEMP%"+EOL+
+ "set TEMP_EXE="+defaultJavaHome+"\\bin\\java.exe"+EOL+
+ "if not exist \"%TEMP_EXE%\" goto "+CHECK_ENV_JAVA_HOME+EOL+
+ "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
"goto "+javaArgsLabel1+EOL+EOL
);
}
@@ -986,19 +986,19 @@
name.length() - ".java-home".length());
buf.append(
":check"+scriptName+"JavaHome"+EOL+
- "set TEMP="+value+"\\bin\\java.exe"+EOL);
+ "set TEMP_EXE="+value+"\\bin\\java.exe"+EOL);
if (defaultJavaHome != null)
{
buf.append(
- "if not exist \"%TEMP%\" goto "+CHECK_DEFAULT_JAVA_HOME+EOL);
+ "if not exist \"%TEMP_EXE%\" goto "+CHECK_DEFAULT_JAVA_HOME+EOL);
}
else if (javaHomeLabel1 != CHECK_ENV_JAVA_HOME)
{
buf.append(
- "if not exist \"%TEMP%\" goto "+CHECK_ENV_JAVA_HOME+EOL);
+ "if not exist \"%TEMP_EXE%\" goto "+CHECK_ENV_JAVA_HOME+EOL);
}
buf.append(
- "set OPENDJ_JAVA_BIN=%TEMP%"+EOL+
+ "set OPENDJ_JAVA_BIN=%TEMP_EXE%"+EOL+
"goto "+javaArgsLabel1+EOL+EOL);
}
}
--
Gitblit v1.10.0