mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
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> 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. 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%
@@ -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 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%
@@ -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 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" "${@}" 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" %*
@@ -35,4 +35,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -35,4 +35,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -35,4 +35,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_client-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_client-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_client-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_client-script.sh" "${@}" 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" %*
@@ -35,4 +35,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_client-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_client-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_client-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_client-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_client-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_client-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_client-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_client-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -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" "${@}" 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" %*
@@ -35,4 +35,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -34,4 +34,4 @@ export SCRIPT_NAME_ARG SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" %*
@@ -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 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%
@@ -31,4 +31,4 @@ export OPENDS_INVOKE_CLASS SCRIPT_DIR=`dirname "${0}"` "${SCRIPT_DIR}/_server-script.sh" "${@}" "${SCRIPT_DIR}/../lib/_server-script.sh" "${@}" 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" "${@}" 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%
@@ -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" %* 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 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 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" "${@}" 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" %*
@@ -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" %*
@@ -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" 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%
@@ -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 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%
@@ -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 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 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;
