From 2060f09eb5919f55fb76db11ba92a4dad08b603d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 26 Apr 2007 14:43:23 +0000
Subject: [PATCH] Complete fix for 1252 restrict installed bin files to relevant platform.
---
opendj-sdk/opends/resource/bin/list-backends | 2
opendj-sdk/opends/resource/bin/_server-script.bat | 6
opendj-sdk/opends/resource/bin/stop-ds | 4
opendj-sdk/opends/resource/uninstall.bat | 6
opendj-sdk/opends/resource/bin/ldifsearch | 2
opendj-sdk/opends/resource/bin/README_WINDOWS.txt | 4
opendj-sdk/opends/resource/bin/verify-index | 2
opendj-sdk/opends/resource/bin/make-ldif | 2
opendj-sdk/opends/resource/bin/_client-script.bat | 6
opendj-sdk/opends/resource/bin/ldapmodify.bat | 2
opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java | 15 +--
opendj-sdk/opends/resource/bin/windows-service.bat | 2
opendj-sdk/opends/resource/bin/start-ds.bat | 6
opendj-sdk/opends/resource/bin/backup | 2
opendj-sdk/opends/resource/bin/_server-script.sh | 4
opendj-sdk/opends/resource/bin/import-ldif.bat | 2
opendj-sdk/opends/resource/bin/export-ldif.bat | 2
opendj-sdk/opends/resource/bin/_client-script.sh | 4
opendj-sdk/opends/resource/bin/encode-password.bat | 2
opendj-sdk/opends/resource/bin/restore | 2
opendj-sdk/opends/resource/bin/ldappasswordmodify | 2
opendj-sdk/opends/resource/bin/rebuild-index | 2
opendj-sdk/opends/resource/bin/ldifmodify.bat | 2
opendj-sdk/opends/resource/bin/ldapcompare | 2
opendj-sdk/opends/resource/bin/start-ds | 4
opendj-sdk/opends/resource/bin/ldappasswordmodify.bat | 2
opendj-sdk/opends/resource/bin/ldifmodify | 2
opendj-sdk/opends/resource/bin/status-panel.bat | 6
opendj-sdk/opends/resource/bin/ldifsearch.bat | 2
opendj-sdk/opends/resource/setup.bat | 6
opendj-sdk/opends/resource/bin/restore.bat | 2
opendj-sdk/opends/resource/bin/verify-index.bat | 2
opendj-sdk/opends/resource/upgrade | 4
opendj-sdk/opends/resource/bin/ldif-diff | 2
opendj-sdk/opends/resource/bin/ldapcompare.bat | 2
opendj-sdk/opends/resource/bin/stop-ds.bat | 8 +-
opendj-sdk/opends/resource/bin/rebuild-index.bat | 2
opendj-sdk/opends/resource/upgrade.bat | 8 +-
opendj-sdk/opends/resource/setup | 2
opendj-sdk/opends/build.xml | 22 +++--
opendj-sdk/opends/resource/bin/export-ldif | 2
opendj-sdk/opends/resource/bin/status.bat | 2
opendj-sdk/opends/resource/bin/ldapmodify | 2
opendj-sdk/opends/resource/bin/ldapsearch | 2
opendj-sdk/opends/resource/bin/backup.bat | 2
opendj-sdk/opends/resource/bin/configure-ds.bat | 2
opendj-sdk/opends/resource/bin/ldif-diff.bat | 2
opendj-sdk/opends/resource/bin/import-ldif | 2
opendj-sdk/opends/resource/bin/ldapdelete.bat | 2
opendj-sdk/opends/resource/bin/make-ldif.bat | 2
opendj-sdk/opends/resource/bin/encode-password | 2
opendj-sdk/opends/resource/bin/ldapsearch.bat | 2
opendj-sdk/opends/resource/bin/status | 2
opendj-sdk/opends/resource/bin/status-panel | 2
opendj-sdk/opends/resource/bin/list-backends.bat | 2
opendj-sdk/opends/resource/uninstall | 4
opendj-sdk/opends/resource/bin/ldapdelete | 2
opendj-sdk/opends/resource/bin/configure-ds | 2
58 files changed, 96 insertions(+), 103 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index ca0d689..eae249f 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -689,10 +689,11 @@
<antcall target="example-plugin" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat" eol="lf" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" includes="*.bat,README_WINDOWS.txt" eol="crlf" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bat" includes="*.bat"
- eol="crlf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat,_client-script.sh,_server-script.sh" eol="lf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.sh,_server-script.sh" eol="lf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" includes="README_WINDOWS.txt" eol="crlf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bat" excludes="_client-script.bat,_server-script.bat,setcp.bat" includes="*.bat" eol="crlf" />
+ <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.bat,_server-script.bat,setcp.bat" eol="crlf" />
<copy todir="${pdir}/config">
<fileset file="${config.dir}/*" />
@@ -742,7 +743,6 @@
<chmod file="${pdir}/uninstall" perm="755" />
<chmod perm="755">
<fileset dir="${pdir}/bin">
- <exclude name="*.bat"/>
</fileset>
</chmod>
</target>
@@ -755,14 +755,16 @@
description="Package the Directory Server for distribution.">
<zip destfile="${package.dir}/OpenDS-${pkgversion}.zip">
<zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/**/*"
- excludes="OpenDS-${pkgversion}/bin/*,OpenDS-${pkgversion}/setup,OpenDS-${pkgversion}/uninstall"
+ excludes="OpenDS-${pkgversion}/bin/*,OpenDS-${pkgversion}/lib/_client-script.sh,OpenDS-${pkgversion}/lib/_server-script.sh,OpenDS-${pkgversion}/setup,OpenDS-${pkgversion}/uninstall"
filemode="644" dirmode="755" />
<zipfileset dir="${package.dir}"
- includes="OpenDS-${pkgversion}/bin/*.bat"
- filemode="644" dirmode="755" />
- <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/*"
- excludes="OpenDS-${pkgversion}/bin/*.bat"
+ includes="OpenDS-${pkgversion}/lib/_client-script.sh,OpenDS-${pkgversion}/lib/_server-script.sh"
filemode="755" dirmode="755" />
+ <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/*"
+ excludes="OpenDS-${pkgversion}/bin/README_WINDOWS.txt"
+ filemode="755" dirmode="755" />
+ <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/README_WINDOWS.txt"
+ filemode="644" dirmode="755" />
<zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/setup,OpenDS-${pkgversion}/uninstall"
filemode="755" dirmode="755" />
</zip>
diff --git a/opendj-sdk/opends/resource/bin/README_WINDOWS.txt b/opendj-sdk/opends/resource/bin/README_WINDOWS.txt
index c429ea3..1588206 100644
--- a/opendj-sdk/opends/resource/bin/README_WINDOWS.txt
+++ b/opendj-sdk/opends/resource/bin/README_WINDOWS.txt
@@ -25,6 +25,4 @@
* Portions Copyright 2007 Sun Microsystems, Inc.
*/
Note that all the batch files under the 'bin' directory have been moved to the
-'bat' directory. For the moment a copy of the batch files is still included
-under 'bin' directory. However these files will be removed in next builds and
-so only a copy of the batch files will be provided under the 'bat' directory.
+'bat' directory.
diff --git a/opendj-sdk/opends/resource/bin/_client-script.bat b/opendj-sdk/opends/resource/bin/_client-script.bat
index e20c48f..52fe3e7 100644
--- a/opendj-sdk/opends/resource/bin/_client-script.bat
+++ b/opendj-sdk/opends/resource/bin/_client-script.bat
@@ -51,8 +51,8 @@
goto setClassPath
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
goto setClassPath
@@ -62,7 +62,7 @@
goto end
:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
set PATH=%SystemRoot%
diff --git a/opendj-sdk/opends/resource/bin/_client-script.sh b/opendj-sdk/opends/resource/bin/_client-script.sh
index 225ea01..a972b26 100755
--- a/opendj-sdk/opends/resource/bin/_client-script.sh
+++ b/opendj-sdk/opends/resource/bin/_client-script.sh
@@ -56,9 +56,9 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
- . "${INSTANCE_ROOT}/bin/set-java-home"
+ . "${INSTANCE_ROOT}/lib/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
export JAVA_BIN
else
diff --git a/opendj-sdk/opends/resource/bin/_server-script.bat b/opendj-sdk/opends/resource/bin/_server-script.bat
index 66ffb0d..07b66fa 100644
--- a/opendj-sdk/opends/resource/bin/_server-script.bat
+++ b/opendj-sdk/opends/resource/bin/_server-script.bat
@@ -51,8 +51,8 @@
goto setClassPath
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
goto setClassPath
@@ -62,7 +62,7 @@
goto end
:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
set PATH=%SystemRoot%
diff --git a/opendj-sdk/opends/resource/bin/_server-script.sh b/opendj-sdk/opends/resource/bin/_server-script.sh
index ec5526a..203fbb9 100755
--- a/opendj-sdk/opends/resource/bin/_server-script.sh
+++ b/opendj-sdk/opends/resource/bin/_server-script.sh
@@ -56,9 +56,9 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
- . "${INSTANCE_ROOT}/bin/set-java-home"
+ . "${INSTANCE_ROOT}/lib/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
export JAVA_BIN
else
diff --git a/opendj-sdk/opends/resource/bin/backup b/opendj-sdk/opends/resource/bin/backup
index 864933d..c7fd119 100755
--- a/opendj-sdk/opends/resource/bin/backup
+++ b/opendj-sdk/opends/resource/bin/backup
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/backup.bat b/opendj-sdk/opends/resource/bin/backup.bat
index 17ec2d4..85748bb 100644
--- a/opendj-sdk/opends/resource/bin/backup.bat
+++ b/opendj-sdk/opends/resource/bin/backup.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.BackUpDB"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=backup"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/configure-ds b/opendj-sdk/opends/resource/bin/configure-ds
index 11c2e06..9c36f56 100755
--- a/opendj-sdk/opends/resource/bin/configure-ds
+++ b/opendj-sdk/opends/resource/bin/configure-ds
@@ -35,4 +35,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/configure-ds.bat b/opendj-sdk/opends/resource/bin/configure-ds.bat
index 298dfbc..2992fe9 100644
--- a/opendj-sdk/opends/resource/bin/configure-ds.bat
+++ b/opendj-sdk/opends/resource/bin/configure-ds.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ConfigureDS"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=configure-ds"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/encode-password b/opendj-sdk/opends/resource/bin/encode-password
index 23ae5c9..b0fec61 100755
--- a/opendj-sdk/opends/resource/bin/encode-password
+++ b/opendj-sdk/opends/resource/bin/encode-password
@@ -35,4 +35,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/encode-password.bat b/opendj-sdk/opends/resource/bin/encode-password.bat
index 3df4f0a..34c0143 100644
--- a/opendj-sdk/opends/resource/bin/encode-password.bat
+++ b/opendj-sdk/opends/resource/bin/encode-password.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.EncodePassword"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=encode-password"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/export-ldif b/opendj-sdk/opends/resource/bin/export-ldif
index 19885ec..21c4f9c 100755
--- a/opendj-sdk/opends/resource/bin/export-ldif
+++ b/opendj-sdk/opends/resource/bin/export-ldif
@@ -35,4 +35,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/export-ldif.bat b/opendj-sdk/opends/resource/bin/export-ldif.bat
index c8964e2..9e2cdcc 100644
--- a/opendj-sdk/opends/resource/bin/export-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/export-ldif.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ExportLDIF"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=export-ldif"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/import-ldif b/opendj-sdk/opends/resource/bin/import-ldif
index 5f72f8c..96e6fb8 100755
--- a/opendj-sdk/opends/resource/bin/import-ldif
+++ b/opendj-sdk/opends/resource/bin/import-ldif
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/import-ldif.bat b/opendj-sdk/opends/resource/bin/import-ldif.bat
index cddbc11..740e735 100644
--- a/opendj-sdk/opends/resource/bin/import-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/import-ldif.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ImportLDIF"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=import-ldif"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapcompare b/opendj-sdk/opends/resource/bin/ldapcompare
index 9b3f7af..fe2c466 100755
--- a/opendj-sdk/opends/resource/bin/ldapcompare
+++ b/opendj-sdk/opends/resource/bin/ldapcompare
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_client-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldapcompare.bat b/opendj-sdk/opends/resource/bin/ldapcompare.bat
index 27e165a..9a2b78a 100644
--- a/opendj-sdk/opends/resource/bin/ldapcompare.bat
+++ b/opendj-sdk/opends/resource/bin/ldapcompare.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPCompare"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapcompare"
-call "%~dP0\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapdelete b/opendj-sdk/opends/resource/bin/ldapdelete
index d909dab..dce0b82 100755
--- a/opendj-sdk/opends/resource/bin/ldapdelete
+++ b/opendj-sdk/opends/resource/bin/ldapdelete
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_client-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldapdelete.bat b/opendj-sdk/opends/resource/bin/ldapdelete.bat
index e58fc58..54af183 100644
--- a/opendj-sdk/opends/resource/bin/ldapdelete.bat
+++ b/opendj-sdk/opends/resource/bin/ldapdelete.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPDelete"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapdelete"
-call "%~dP0\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapmodify b/opendj-sdk/opends/resource/bin/ldapmodify
index f854831..0ecf40e 100755
--- a/opendj-sdk/opends/resource/bin/ldapmodify
+++ b/opendj-sdk/opends/resource/bin/ldapmodify
@@ -35,4 +35,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_client-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldapmodify.bat b/opendj-sdk/opends/resource/bin/ldapmodify.bat
index 303a29c..fca9c92 100644
--- a/opendj-sdk/opends/resource/bin/ldapmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldapmodify.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPModify"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapmodify"
-call "%~dP0\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldappasswordmodify b/opendj-sdk/opends/resource/bin/ldappasswordmodify
index bed7716..706e84f 100755
--- a/opendj-sdk/opends/resource/bin/ldappasswordmodify
+++ b/opendj-sdk/opends/resource/bin/ldappasswordmodify
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_client-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat b/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
index 3c166ec..434ef40 100644
--- a/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldappasswordmodify.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPPasswordModify"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldappasswordmodify"
-call "%~dP0\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldapsearch b/opendj-sdk/opends/resource/bin/ldapsearch
index e18decb..a745977 100755
--- a/opendj-sdk/opends/resource/bin/ldapsearch
+++ b/opendj-sdk/opends/resource/bin/ldapsearch
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_client-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldapsearch.bat b/opendj-sdk/opends/resource/bin/ldapsearch.bat
index a9f119d..afb9db2 100644
--- a/opendj-sdk/opends/resource/bin/ldapsearch.bat
+++ b/opendj-sdk/opends/resource/bin/ldapsearch.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDAPSearch"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldapsearch"
-call "%~dP0\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldif-diff b/opendj-sdk/opends/resource/bin/ldif-diff
index 7e2f65a..a197671 100755
--- a/opendj-sdk/opends/resource/bin/ldif-diff
+++ b/opendj-sdk/opends/resource/bin/ldif-diff
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_client-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldif-diff.bat b/opendj-sdk/opends/resource/bin/ldif-diff.bat
index 1983d37..1052bef 100644
--- a/opendj-sdk/opends/resource/bin/ldif-diff.bat
+++ b/opendj-sdk/opends/resource/bin/ldif-diff.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDIFDiff"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldif-diff"
-call "%~dP0\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldifmodify b/opendj-sdk/opends/resource/bin/ldifmodify
index 59a8fed..64e398b 100755
--- a/opendj-sdk/opends/resource/bin/ldifmodify
+++ b/opendj-sdk/opends/resource/bin/ldifmodify
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldifmodify.bat b/opendj-sdk/opends/resource/bin/ldifmodify.bat
index dc09ff2..e2ec712 100644
--- a/opendj-sdk/opends/resource/bin/ldifmodify.bat
+++ b/opendj-sdk/opends/resource/bin/ldifmodify.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDIFModify"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldifmodify"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/ldifsearch b/opendj-sdk/opends/resource/bin/ldifsearch
index 2af9a76..d4c4be5 100755
--- a/opendj-sdk/opends/resource/bin/ldifsearch
+++ b/opendj-sdk/opends/resource/bin/ldifsearch
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/ldifsearch.bat b/opendj-sdk/opends/resource/bin/ldifsearch.bat
index 67ae30a..e9aa749 100644
--- a/opendj-sdk/opends/resource/bin/ldifsearch.bat
+++ b/opendj-sdk/opends/resource/bin/ldifsearch.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.LDIFSearch"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=ldifsearch"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/list-backends b/opendj-sdk/opends/resource/bin/list-backends
index f640c90..4d1eef4 100755
--- a/opendj-sdk/opends/resource/bin/list-backends
+++ b/opendj-sdk/opends/resource/bin/list-backends
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/list-backends.bat b/opendj-sdk/opends/resource/bin/list-backends.bat
index 1650694..ff1edbe 100644
--- a/opendj-sdk/opends/resource/bin/list-backends.bat
+++ b/opendj-sdk/opends/resource/bin/list-backends.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ListBackends"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=list-backends"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/make-ldif b/opendj-sdk/opends/resource/bin/make-ldif
index 44f46b1..cb0d531 100755
--- a/opendj-sdk/opends/resource/bin/make-ldif
+++ b/opendj-sdk/opends/resource/bin/make-ldif
@@ -34,5 +34,5 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" \
+"${SCRIPT_DIR}/../lib/_server-script.sh" \
--resourcePath "${SCRIPT_DIR}/../config/MakeLDIF" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/make-ldif.bat b/opendj-sdk/opends/resource/bin/make-ldif.bat
index c4ca0d8..0ba5232 100644
--- a/opendj-sdk/opends/resource/bin/make-ldif.bat
+++ b/opendj-sdk/opends/resource/bin/make-ldif.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.makeldif.MakeLDIF"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=make-ldif"
-call "%~dP0\_server-script.bat" --resourcePath "%~dP0..\config\MakeLDIF" %*
+call "%~dP0\..\lib\_server-script.bat" --resourcePath "%~dP0..\config\MakeLDIF" %*
diff --git a/opendj-sdk/opends/resource/bin/rebuild-index b/opendj-sdk/opends/resource/bin/rebuild-index
index 92570fe..00aa7aa 100644
--- a/opendj-sdk/opends/resource/bin/rebuild-index
+++ b/opendj-sdk/opends/resource/bin/rebuild-index
@@ -35,4 +35,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/rebuild-index.bat b/opendj-sdk/opends/resource/bin/rebuild-index.bat
index 903bd7c..ec5af25 100644
--- a/opendj-sdk/opends/resource/bin/rebuild-index.bat
+++ b/opendj-sdk/opends/resource/bin/rebuild-index.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.RebuildIndex"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=rebuild-index"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/restore b/opendj-sdk/opends/resource/bin/restore
index 298521d..8e07646 100755
--- a/opendj-sdk/opends/resource/bin/restore
+++ b/opendj-sdk/opends/resource/bin/restore
@@ -34,4 +34,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/restore.bat b/opendj-sdk/opends/resource/bin/restore.bat
index d146c47..bfd31ec 100644
--- a/opendj-sdk/opends/resource/bin/restore.bat
+++ b/opendj-sdk/opends/resource/bin/restore.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.RestoreDB"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=restore"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/start-ds b/opendj-sdk/opends/resource/bin/start-ds
index 36f8454..2d000f5 100755
--- a/opendj-sdk/opends/resource/bin/start-ds
+++ b/opendj-sdk/opends/resource/bin/start-ds
@@ -47,9 +47,9 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
- . "${INSTANCE_ROOT}/bin/set-java-home"
+ . "${INSTANCE_ROOT}/lib/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
export JAVA_BIN
else
diff --git a/opendj-sdk/opends/resource/bin/start-ds.bat b/opendj-sdk/opends/resource/bin/start-ds.bat
index c8f7e34..d9311e5 100644
--- a/opendj-sdk/opends/resource/bin/start-ds.bat
+++ b/opendj-sdk/opends/resource/bin/start-ds.bat
@@ -41,8 +41,8 @@
goto setClassPath
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
goto setClassPath
@@ -57,7 +57,7 @@
goto end
:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
set PATH=%SystemRoot%
diff --git a/opendj-sdk/opends/resource/bin/status b/opendj-sdk/opends/resource/bin/status
index 01c51e8..211e09d 100644
--- a/opendj-sdk/opends/resource/bin/status
+++ b/opendj-sdk/opends/resource/bin/status
@@ -31,4 +31,4 @@
export OPENDS_INVOKE_CLASS
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/status-panel b/opendj-sdk/opends/resource/bin/status-panel
index d469283..e294e3d 100644
--- a/opendj-sdk/opends/resource/bin/status-panel
+++ b/opendj-sdk/opends/resource/bin/status-panel
@@ -31,4 +31,4 @@
export OPENDS_INVOKE_CLASS
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/status-panel.bat b/opendj-sdk/opends/resource/bin/status-panel.bat
index d8c9f35..67c3955 100644
--- a/opendj-sdk/opends/resource/bin/status-panel.bat
+++ b/opendj-sdk/opends/resource/bin/status-panel.bat
@@ -41,8 +41,8 @@
goto setClassPath
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
goto setClassPath
@@ -52,7 +52,7 @@
goto end
:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
set PATH=%SystemRoot%
diff --git a/opendj-sdk/opends/resource/bin/status.bat b/opendj-sdk/opends/resource/bin/status.bat
index 49dee20..967eee2 100644
--- a/opendj-sdk/opends/resource/bin/status.bat
+++ b/opendj-sdk/opends/resource/bin/status.bat
@@ -29,4 +29,4 @@
set OPENDS_INVOKE_CLASS="org.opends.statuspanel.StatusCli"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=status"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/stop-ds b/opendj-sdk/opends/resource/bin/stop-ds
index 6a531ec..b424df1 100755
--- a/opendj-sdk/opends/resource/bin/stop-ds
+++ b/opendj-sdk/opends/resource/bin/stop-ds
@@ -56,9 +56,9 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
- . "${INSTANCE_ROOT}/bin/set-java-home"
+ . "${INSTANCE_ROOT}/lib/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
export JAVA_BIN
else
diff --git a/opendj-sdk/opends/resource/bin/stop-ds.bat b/opendj-sdk/opends/resource/bin/stop-ds.bat
index f135505..c3c1540 100644
--- a/opendj-sdk/opends/resource/bin/stop-ds.bat
+++ b/opendj-sdk/opends/resource/bin/stop-ds.bat
@@ -44,8 +44,8 @@
goto setClassPath
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
goto setClassPath
@@ -60,7 +60,7 @@
goto end
:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
rem Test that the provided JDK is 1.5 compatible.
"%JAVA_BIN%" org.opends.server.tools.InstallDS -t > NUL 2>&1
@@ -96,7 +96,7 @@
goto startUsingSystemCall
:stopUsingProtocol
-call "%~dP0\_client-script.bat" %*
+call "%DIR_HOME%\lib\_client-script.bat" %*
goto end
:stopAsWindowsService
diff --git a/opendj-sdk/opends/resource/bin/verify-index b/opendj-sdk/opends/resource/bin/verify-index
index 209cc2a..187c53b 100755
--- a/opendj-sdk/opends/resource/bin/verify-index
+++ b/opendj-sdk/opends/resource/bin/verify-index
@@ -35,4 +35,4 @@
export SCRIPT_NAME_ARG
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/_server-script.sh" "${@}"
+"${SCRIPT_DIR}/../lib/_server-script.sh" "${@}"
diff --git a/opendj-sdk/opends/resource/bin/verify-index.bat b/opendj-sdk/opends/resource/bin/verify-index.bat
index 0fc4cb7..276dbbc 100644
--- a/opendj-sdk/opends/resource/bin/verify-index.bat
+++ b/opendj-sdk/opends/resource/bin/verify-index.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.VerifyIndex"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=verify-index"
-call "%~dP0\_server-script.bat" %*
+call "%~dP0\..\lib\_server-script.bat" %*
diff --git a/opendj-sdk/opends/resource/bin/windows-service.bat b/opendj-sdk/opends/resource/bin/windows-service.bat
index b19d0a6..8ee95e4 100644
--- a/opendj-sdk/opends/resource/bin/windows-service.bat
+++ b/opendj-sdk/opends/resource/bin/windows-service.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ConfigureWindowsService"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=windows-service"
-call "%~dP0\_client-script.bat" %*
+call "%~dP0\..\lib\_client-script.bat" %*
diff --git a/opendj-sdk/opends/resource/setup b/opendj-sdk/opends/resource/setup
index 1e15f86..e97bc84 100755
--- a/opendj-sdk/opends/resource/setup
+++ b/opendj-sdk/opends/resource/setup
@@ -32,7 +32,7 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
. "${INSTANCE_ROOT}/bin/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
diff --git a/opendj-sdk/opends/resource/setup.bat b/opendj-sdk/opends/resource/setup.bat
index 705b208..a46efdd 100644
--- a/opendj-sdk/opends/resource/setup.bat
+++ b/opendj-sdk/opends/resource/setup.bat
@@ -41,8 +41,8 @@
goto setClassPath
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
goto setClassPath
@@ -57,7 +57,7 @@
goto end
:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
set PATH=%SystemRoot%
diff --git a/opendj-sdk/opends/resource/uninstall b/opendj-sdk/opends/resource/uninstall
index 01ce80b..8649f51 100644
--- a/opendj-sdk/opends/resource/uninstall
+++ b/opendj-sdk/opends/resource/uninstall
@@ -32,9 +32,9 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
- . "${INSTANCE_ROOT}/bin/set-java-home"
+ . "${INSTANCE_ROOT}/lib/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
export JAVA_BIN
else
diff --git a/opendj-sdk/opends/resource/uninstall.bat b/opendj-sdk/opends/resource/uninstall.bat
index e071367..7349a8f 100644
--- a/opendj-sdk/opends/resource/uninstall.bat
+++ b/opendj-sdk/opends/resource/uninstall.bat
@@ -41,8 +41,8 @@
goto setClassPath
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
goto setClassPath
@@ -57,7 +57,7 @@
goto end
:setClassPath
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
set PATH=%SystemRoot%
diff --git a/opendj-sdk/opends/resource/upgrade b/opendj-sdk/opends/resource/upgrade
index f9612a6..07e7f12 100644
--- a/opendj-sdk/opends/resource/upgrade
+++ b/opendj-sdk/opends/resource/upgrade
@@ -32,9 +32,9 @@
then
if test -z "${JAVA_HOME}"
then
- if test -f "${INSTANCE_ROOT}/bin/set-java-home"
+ if test -f "${INSTANCE_ROOT}/lib/set-java-home"
then
- . "${INSTANCE_ROOT}/bin/set-java-home"
+ . "${INSTANCE_ROOT}/lib/set-java-home"
JAVA_BIN="${JAVA_HOME}/bin/java"
JAVAWS_BIN="${JAVA_HOME}/bin/javaws"
export JAVA_BIN
diff --git a/opendj-sdk/opends/resource/upgrade.bat b/opendj-sdk/opends/resource/upgrade.bat
index 3ec7e2d..7063a83 100644
--- a/opendj-sdk/opends/resource/upgrade.bat
+++ b/opendj-sdk/opends/resource/upgrade.bat
@@ -44,8 +44,8 @@
goto callExtractor
:noJavaHome
-if not exist "%DIR_HOME%\bat\set-java-home.bat" goto noSetJavaHome
-call "%DIR_HOME%\bat\set-java-home.bat"
+if not exist "%DIR_HOME%\lib\set-java-home.bat" goto noSetJavaHome
+call "%DIR_HOME%\lib\set-java-home.bat"
set JAVA_BIN=%JAVA_HOME%\bin\java.exe
set jAVAWS_BIN=%JAVA_HOME%\bin\javaws.exe
if "%*" == "" goto callWebStartUpgrade
@@ -73,7 +73,7 @@
:callExtractor
if EXIST .\tmp\upgrade rd .\tmp\upgrade /s /q
set CLASSPATH=""
-FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
"%JAVA_BIN%" org.opends.quicksetup.upgrader.BuildExtractor %*
if %ERRORLEVEL%==0 goto callUpgrader
goto end
@@ -87,7 +87,7 @@
:callUpgrader
set CLASSPATH=""
-FOR %%x in ("%DIR_HOME%\tmp\upgrade\lib\*.jar") DO call "%DIR_HOME%\bat\setcp.bat" %%x
+FOR %%x in ("%DIR_HOME%\tmp\upgrade\lib\*.jar") DO call "%DIR_HOME%\lib\setcp.bat" %%x
"%JAVA_BIN%" org.opends.quicksetup.upgrader.UpgradeLauncher %*
if EXIST .\tmp\upgrade rd .\tmp\upgrade /s /q
goto end
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
index 43c67de..45b6e79 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -203,19 +203,12 @@
}
- File binDirectory;
- if (isWindows())
- {
- binDirectory = new File(serverRoot, "bat");
- }
- else
- {
- binDirectory = new File(serverRoot, "bin");
- }
+ File libDirectory = new File(serverRoot, "lib");
+
File setJavaHomeFile;
if (isWindows())
{
- setJavaHomeFile = new File(binDirectory, "set-java-home.bat");
+ setJavaHomeFile = new File(libDirectory, "set-java-home.bat");
if (setJavaHomeFile.exists())
{
return setJavaHomeFile;
@@ -229,7 +222,7 @@
}
else
{
- setJavaHomeFile = new File(binDirectory, "set-java-home");
+ setJavaHomeFile = new File(libDirectory, "set-java-home");
if (setJavaHomeFile.exists())
{
return setJavaHomeFile;
--
Gitblit v1.10.0