mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

jvergara
23.32.2007 939762c0ca558218be468ee79a0e75b4371fdfda
Fix for issue 1985.

Use the short version of the path to call other scripts and to generate the CLASSPATH. This reduces the possibility of hitting the maximum environment variable size allowed on Windows.
31 files modified
64 ■■■■ changed files
opends/resource/bin/_client-script.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/_server-script.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/backup.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/configure-ds.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/dsconfig.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/dsframework.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/encode-password.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/export-ldif.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/import-ldif.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldapcompare.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldapdelete.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldapmodify.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldappasswordmodify.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldapsearch.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldif-diff.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldifmodify.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/ldifsearch.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/list-backends.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/make-ldif.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/manage-account.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/rebuild-index.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/restore.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/start-ds.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/status-panel.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/status.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/stop-ds.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/verify-index.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/windows-service.bat 2 ●●● patch | view | raw | blame | history
opends/resource/setup.bat 4 ●●●● patch | view | raw | blame | history
opends/resource/uninstall.bat 2 ●●● patch | view | raw | blame | history
opends/resource/upgrade.bat 2 ●●● patch | view | raw | blame | history
opends/resource/bin/_client-script.bat
@@ -30,7 +30,7 @@
setlocal
set DIR_HOME=%~dP0..
set DIR_HOME=%~dPs0..
set INSTANCE_ROOT=%DIR_HOME%
if "%OPENDS_INVOKE_CLASS%" == "" goto noInvokeClass
opends/resource/bin/_server-script.bat
@@ -30,7 +30,7 @@
setlocal
set DIR_HOME=%~dP0..
set DIR_HOME=%~dPs0..
set INSTANCE_ROOT=%DIR_HOME%
if "%OPENDS_INVOKE_CLASS%" == "" goto noInvokeClass
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
opends/resource/bin/dsconfig.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.dsconfig.DSConfig"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=dsconfig"
call "%~dP0\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
opends/resource/bin/dsframework.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.admin.client.cli.DsFrameworkCliMain"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=dsframework"
call "%~dP0\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_server-script.bat" --resourcePath "%~dP0..\config\MakeLDIF" %*
call "%~dPs0\..\lib\_server-script.bat" --resourcePath "%~dPs0..\config\MakeLDIF" %*
opends/resource/bin/manage-account.bat
@@ -29,5 +29,5 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.ManageAccount"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=manage-account"
call "%~dP0\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
opends/resource/bin/start-ds.bat
@@ -27,7 +27,7 @@
setlocal
set DIR_HOME=%~dP0..
set DIR_HOME=%~dPs0..
set INSTANCE_ROOT=%DIR_HOME%
set LOG="%INSTANCE_ROOT%\logs\native-windows.out"
opends/resource/bin/status-panel.bat
@@ -27,7 +27,7 @@
setlocal
set DIR_HOME=%~dP0..
set DIR_HOME=%~dPs0..
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
opends/resource/bin/stop-ds.bat
@@ -31,7 +31,7 @@
set OPENDS_INVOKE_CLASS="org.opends.server.tools.StopDS"
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=stop-ds"
set DIR_HOME=%~dP0..
set DIR_HOME=%~dPs0..
set INSTANCE_ROOT=%DIR_HOME%
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\..\lib\_server-script.bat" %*
call "%~dPs0\..\lib\_server-script.bat" %*
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\..\lib\_client-script.bat" %*
call "%~dPs0\..\lib\_client-script.bat" %*
opends/resource/setup.bat
@@ -29,11 +29,11 @@
rem check that the path does not contain the ^% character which breaks
rem the batch files.
set NON_ESCAPED=%~dPs0..
set NON_ESCAPED=%~dP0..
FOR /F "tokens=1-2* delims=%%" %%1 IN ("%NON_ESCAPED%") DO (
if NOT "%%2" == "" goto invalidPath)
set DIR_HOME=%~dP0.
set DIR_HOME=%~dPs0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
opends/resource/uninstall.bat
@@ -27,7 +27,7 @@
setlocal
set DIR_HOME=%~dP0.
set DIR_HOME=%~dPs0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin
opends/resource/upgrade.bat
@@ -27,7 +27,7 @@
setlocal
set DIR_HOME=%~dP0.
set DIR_HOME=%~dPs0.
set INSTANCE_ROOT=%DIR_HOME%
:checkJavaBin