Skip to content

honor existing WLST_EXT_CLASSPATH environment variable settings when invoking tools #1099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2022
Merged

honor existing WLST_EXT_CLASSPATH environment variable settings when invoking tools #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions installer/src/main/bin/shared.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,11 @@ GOTO :EOF
EXIT /B 98
)
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
IF DEFINED WLST_EXT_CLASSPATH (
SET "WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar;%WLST_EXT_CLASSPATH%"
) ELSE (
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
)
GOTO found_wlst
)

Expand All @@ -243,7 +247,11 @@ GOTO :EOF
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
IF DEFINED WLST_EXT_CLASSPATH (
SET "WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar;%WLST_EXT_CLASSPATH%"
) ELSE (
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
)
GOTO found_wlst
)
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
Expand Down
11 changes: 10 additions & 1 deletion installer/src/main/bin/shared.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,24 @@ runWlst() {
exit 98
fi
CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
if [ ! -z "${WLST_EXT_CLASSPATH}" ]; then
WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar:${WLST_EXT_CLASSPATH}"; export WLST_EXT_CLASSPATH
else
WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
fi
else
# if WLST_PATH_DIR was not set, find the WLST executable in one of the known ORACLE_HOME locations.

WLST=""
if [ -x "${ORACLE_HOME}/oracle_common/common/bin/wlst.sh" ]; then
WLST="${ORACLE_HOME}/oracle_common/common/bin/wlst.sh"
CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
if [ ! -z "${WLST_EXT_CLASSPATH}" ]; then
WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar:${WLST_EXT_CLASSPATH}"
export WLST_EXT_CLASSPATH
else
WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
fi
elif [ -x "${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh" ]; then
WLST="${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh"
CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
Expand Down