From 23660030262ccde8c475cd091a035a65ba11564a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 11 May 2015 13:18:11 +0000
Subject: [PATCH] Drop support for Service Tag functionality removed long ago
---
opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh | 8 --------
opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat | 2 --
2 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat
index 1c05589..84aa2ab 100644
--- a/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat
+++ b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat
@@ -65,7 +65,6 @@
FOR /F %%i IN ("%INSTALL_ROOT%") DO set INSTALL_ROOT=%%~dpnxi
FOR /F %%i IN ("%INSTANCE_ROOT%") DO set INSTANCE_ROOT=%%~dpnxi
call "%INSTALL_ROOT%\lib\setcp.bat" %INSTALL_ROOT%\lib\bootstrap-client.jar
-FOR %%x in ("%INSTALL_ROOT%\resources\*.jar") DO call "%INSTALL_ROOT%\lib\setcp.bat" %%x
set CLASSPATH=%INSTANCE_ROOT%\classes;%CLASSPATH%
if "%INSTALL_ROOT%" == "%INSTANCE_ROOT%" goto setClassPathDone
FOR %%x in ("%INSTANCE_ROOT%\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
@@ -81,7 +80,6 @@
FOR /F %%i IN ("%INSTALL_ROOT%") DO set INSTALL_ROOT=%%~dpnxi
FOR /F %%i IN ("%INSTANCE_ROOT%") DO set INSTANCE_ROOT=%%~dpnxi
call "%INSTALL_ROOT%\lib\setcp.bat" %INSTALL_ROOT%\lib\bootstrap.jar
-FOR %%x in ("%INSTALL_ROOT%\resources\*.jar") DO call "%INSTALL_ROOT%\lib\setcp.bat" %%x
set CLASSPATH=%INSTANCE_ROOT%\classes;%CLASSPATH%
if "%INSTALL_ROOT%" == "%INSTANCE_ROOT%" goto setClassPathWithOpenDJLoggerDone
FOR %%x in ("%INSTANCE_ROOT%\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
diff --git a/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh
index b8df17e..ccd3c46 100644
--- a/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh
+++ b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh
@@ -253,10 +253,6 @@
# Configure the appropriate CLASSPATH for server, using Opend DJ logger.
set_opendj_logger_classpath() {
CLASSPATH="${INSTANCE_ROOT}/classes"
- for JAR in "${INSTALL_ROOT}/resources/"*.jar
- do
- CLASSPATH=${CLASSPATH}:${JAR}
- done
CLASSPATH="${CLASSPATH}:${INSTALL_ROOT}/lib/bootstrap.jar"
if [ "${INSTALL_ROOT}" != "${INSTANCE_ROOT}" ]
then
@@ -271,10 +267,6 @@
# Configure the appropriate CLASSPATH for client, using java.util.logging logger.
set_classpath() {
CLASSPATH="${INSTANCE_ROOT}/classes"
- for JAR in "${INSTALL_ROOT}/resources/"*.jar
- do
- CLASSPATH=${CLASSPATH}:${JAR}
- done
CLASSPATH="${CLASSPATH}:${INSTALL_ROOT}/lib/bootstrap-client.jar"
if [ "${INSTALL_ROOT}" != "${INSTANCE_ROOT}" ]
then
--
Gitblit v1.10.0