Merge remote-tracking branch 'origin/master'

rjeberhard · rjeberhard · commit e35dc6d5747a · 2021-05-04T16:21:48.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ release.properties
 **/*$py.class
 **/*.pyc
 **/.DS_Store
+system-test/domains
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ If you want to submit a pull request to fix a bug or enhance an existing feature
 
 If you have any questions about a possible submission, feel free to open an issue too.
 
-## [Contributing to the Oracle WLS Deploy repository](http://github.com/oracle/wls-deploy/blob/master/CONTRIBUTING.md)
+## [Contributing to the WebLogic Deploy repository](http://github.com/oracle/wls-deploy/blob/master/CONTRIBUTING.md)
 Pull requests can be made under [The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
 
 For pull requests to be accepted, the bottom of your commit message must have the following line using your name and e-mail address as it appears in the OCA Signatories list.
diff --git a/alias-test/pom.xml b/alias-test/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/core/pom.xml b/core/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>weblogic-deploy</artifactId>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
-        <version>1.9.12-SNAPSHOT</version>
+        <version>1.9.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/installer/pom.xml b/installer/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.oracle.weblogic.lifecycle</groupId>
         <artifactId>weblogic-deploy</artifactId>
-        <version>1.9.12-SNAPSHOT</version>
+        <version>1.9.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/installer/src/main/bin/compareModel.sh b/installer/src/main/bin/compareModel.sh
@@ -43,11 +43,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="compareModel"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/createDomain.sh b/installer/src/main/bin/createDomain.sh
@@ -107,11 +107,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="createDomain"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/deployApps.sh b/installer/src/main/bin/deployApps.sh
@@ -92,11 +92,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="deployApps"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/discoverDomain.sh b/installer/src/main/bin/discoverDomain.sh
@@ -90,11 +90,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="discoverDomain"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/encryptModel.sh b/installer/src/main/bin/encryptModel.sh
@@ -63,11 +63,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="encryptModel"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/extractDomainResource.sh b/installer/src/main/bin/extractDomainResource.sh
@@ -69,11 +69,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="extractDomainResource"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/injectVariables.sh b/installer/src/main/bin/injectVariables.sh
@@ -72,11 +72,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="injectVariables"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/modelHelp.sh b/installer/src/main/bin/modelHelp.sh
@@ -69,11 +69,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="modelHelp"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/prepareModel.sh b/installer/src/main/bin/prepareModel.sh
@@ -41,11 +41,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="prepareModel"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/shared.sh b/installer/src/main/bin/shared.sh
@@ -27,13 +27,13 @@ javaSetup() {
     fi
 
     if [ -x "${JAVA_HOME}/bin/java" ]; then
-      JAVA_EXE=${JAVA_HOME}/bin/java
+      JAVA_EXE="${JAVA_HOME}/bin/java"
     else
       echo "Java executable at ${JAVA_HOME}/bin/java either does not exist or is not executable" >&2
       exit 2
     fi
 
-    JVM_OUTPUT=`${JAVA_EXE} -version 2>&1`
+    JVM_OUTPUT=`"${JAVA_EXE}" -version 2>&1`
 
     case "${JVM_OUTPUT}" in
       *GraalVM*)
@@ -51,7 +51,7 @@ javaSetup() {
     esac
 
 
-    JVM_FULL_VERSION=`${JAVA_EXE} -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
+    JVM_FULL_VERSION=`"${JAVA_EXE}" -fullversion 2>&1 | awk -F"\"" '{ print $2 }'`
 
     # set JVM version to the major version, unless equal to 1, like 1.8.0, then use the minor version
     JVM_VERSION=`echo ${JVM_FULL_VERSION} | awk -F"." '{ print $1 }'`
@@ -69,7 +69,7 @@ javaSetup() {
 }
 
 setOracleVersion() {
-  ORACLE_VERSION=`${JAVA_HOME}/bin/java -cp $ORACLE_HOME/wlserver/server/lib/weblogic.jar weblogic.version | grep "WebLogic Server" | cut -d " " -f3 2>&1`
+  ORACLE_VERSION=`"${JAVA_HOME}/bin/java" -cp "$ORACLE_HOME/wlserver/server/lib/weblogic.jar" weblogic.version | grep "WebLogic Server" | cut -d " " -f3 2>&1`
   ORACLE_VER_ONE=`echo ${ORACLE_VERSION} | cut -d "." -f1`
   ORACLE_VER_THREE=`echo ${ORACLE_VERSION} | cut -d "." -f3`
   echo ORACLE_VERSION=$ORACLE_VERSION
@@ -88,7 +88,7 @@ checkJythonArgs() {
 
     # if no args were given and print the usage message
     if [ "$#" -eq "0" ]; then
-      usage `basename $0`
+      usage `basename "$0"`
       exit 0
     fi
 
@@ -99,7 +99,7 @@ checkJythonArgs() {
         key="$1"
         case $key in
             -help)
-            usage `basename $0`
+            usage `basename "$0"`
             exit 0
             ;;
             -oracle_home)
@@ -121,12 +121,12 @@ checkJythonArgs() {
     done
 
     if [ -n "${ORACLE_HOME_ARG}" ]; then
-        ORACLE_HOME=${ORACLE_HOME_ARG}
+        ORACLE_HOME="${ORACLE_HOME_ARG}"
     elif [ -n "${ORACLE_HOME}" ]; then
         # if -oracle_home argument was not found, but ORACLE_HOME was set in environment,
         # add the -oracle_home argument with the environment value.
         # put it at the beginning to protect trailing arguments.
-        scriptArgs="-oracle_home ${ORACLE_HOME} ${scriptArgs}"
+        scriptArgs="-oracle_home \"${ORACLE_HOME}\" ${scriptArgs}"
     fi
 
     #
@@ -135,9 +135,9 @@ checkJythonArgs() {
     #
     if [ -z "${ORACLE_HOME}" ]; then
         echo "-oracle_home not provided, and ORACLE_HOME not set" >&2
-        usage `basename $0`
+        usage `basename "$0"`
         exit 99
-    elif [ ! -d ${ORACLE_HOME} ]; then
+    elif [ ! -d "${ORACLE_HOME}" ]; then
         echo "The specified Oracle home directory does not exist: ${ORACLE_HOME}" >&2
         exit 98
     fi
@@ -149,10 +149,10 @@ variableSetup() {
     # set the WLSDEPLOY_HOME variable. if it was already set, verify that it is valid
 
     if [ -z "${WLSDEPLOY_HOME}" ]; then
-        BASEDIR="$( cd "$( dirname $0 )" && pwd )"
+        BASEDIR="$( cd "$( dirname "$0" )" && pwd )"
         WLSDEPLOY_HOME=`cd "${BASEDIR}/.." ; pwd`
         export WLSDEPLOY_HOME
-    elif [ ! -d ${WLSDEPLOY_HOME} ]; then
+    elif [ ! -d "${WLSDEPLOY_HOME}" ]; then
         echo "Specified WLSDEPLOY_HOME of ${WLSDEPLOY_HOME} does not exist" >&2
         exit 2
     fi
@@ -163,11 +163,11 @@ variableSetup() {
     WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
 
     if [ -z "${WLSDEPLOY_LOG_PROPERTIES}" ]; then
-        WLSDEPLOY_LOG_PROPERTIES=${WLSDEPLOY_HOME}/etc/logging.properties; export WLSDEPLOY_LOG_PROPERTIES
+        WLSDEPLOY_LOG_PROPERTIES="${WLSDEPLOY_HOME}/etc/logging.properties"; export WLSDEPLOY_LOG_PROPERTIES
     fi
 
     if [ -z "${WLSDEPLOY_LOG_DIRECTORY}" ]; then
-        WLSDEPLOY_LOG_DIRECTORY=${WLSDEPLOY_HOME}/logs; export WLSDEPLOY_LOG_DIRECTORY
+        WLSDEPLOY_LOG_DIRECTORY="${WLSDEPLOY_HOME}/logs"; export WLSDEPLOY_LOG_DIRECTORY
     fi
 
     if [ -z "${WLSDEPLOY_LOG_HANDLERS}" ]; then
@@ -186,34 +186,34 @@ runWlst() {
     # if the WLST_PATH_DIR was set, verify and use that value.
 
     if [ -n "${WLST_PATH_DIR}" ]; then
-        if [ ! -d ${WLST_PATH_DIR} ]; then
+        if [ ! -d "${WLST_PATH_DIR}" ]; then
             echo "Specified -wlst_path directory does not exist: ${WLST_PATH_DIR}" >&2
             exit 98
         fi
-        WLST=${WLST_PATH_DIR}/common/bin/wlst.sh
+        WLST="${WLST_PATH_DIR}/common/bin/wlst.sh"
         if [ ! -x "${WLST}" ]; then
             echo "WLST executable ${WLST} not found under -wlst_path directory: ${WLST_PATH_DIR}" >&2
             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
+        CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
+        WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
     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
-            WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
-        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
-        elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
-            WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
-            CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
-        elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
-            WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
-            CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
+        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
+            WLST_EXT_CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export WLST_EXT_CLASSPATH
+        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
+        elif [ -x "${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh" ]; then
+            WLST="${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh"
+            CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
+        elif [ -x "${ORACLE_HOME}/wlserver/common/bin/wlst.sh" -a -f "${ORACLE_HOME}/wlserver/.product.properties" ]; then
+            WLST="${ORACLE_HOME}/wlserver/common/bin/wlst.sh"
+            CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"; export CLASSPATH
         fi
 
 
@@ -235,7 +235,7 @@ runWlst() {
     echo "CLASSPATH = ${CLASSPATH}"
     echo "WLST_PROPERTIES = ${WLST_PROPERTIES}"
 
-    PY_SCRIPTS_PATH=${WLSDEPLOY_HOME}/lib/python
+    PY_SCRIPTS_PATH="${WLSDEPLOY_HOME}/lib/python"
     echo "${WLST} ${PY_SCRIPTS_PATH}/$wlstScript ${scriptArgs}"
 
     "${WLST}" "${PY_SCRIPTS_PATH}/$wlstScript" ${scriptArgs}
@@ -252,12 +252,12 @@ runJython() {
     # set up Oracle directory, logger, classpath
 
     ORACLE_SERVER_DIR=
-    if [ -x ${ORACLE_HOME}/wlserver_10.3 ]; then
-        ORACLE_SERVER_DIR=${ORACLE_HOME}/wlserver_10.3
-    elif [ -x ${ORACLE_HOME}/wlserver_12.1 ]; then
-        ORACLE_SERVER_DIR=${ORACLE_HOME}/wlserver_12.1
+    if [ -x "${ORACLE_HOME}/wlserver_10.3" ]; then
+        ORACLE_SERVER_DIR="${ORACLE_HOME}/wlserver_10.3"
+    elif [ -x "${ORACLE_HOME}/wlserver_12.1" ]; then
+        ORACLE_SERVER_DIR="${ORACLE_HOME}/wlserver_12.1"
     else
-        ORACLE_SERVER_DIR=${ORACLE_HOME}/wlserver
+        ORACLE_SERVER_DIR="${ORACLE_HOME}/wlserver"
     fi
 
     variableSetup
@@ -269,24 +269,24 @@ runJython() {
     JAVA_PROPERTIES="${JAVA_PROPERTIES}  ${WLSDEPLOY_PROPERTIES}"
     export JAVA_PROPERTIES
 
-    CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar
-    CLASSPATH=${CLASSPATH}:${ORACLE_SERVER_DIR}/server/lib/weblogic.jar
+    CLASSPATH="${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar"
+    CLASSPATH="${CLASSPATH}:${ORACLE_SERVER_DIR}/server/lib/weblogic.jar"
 
     # print the configuration, and run the script
 
     echo "JAVA_HOME = ${JAVA_HOME}"
     echo "CLASSPATH = ${CLASSPATH}"
     echo "JAVA_PROPERTIES = ${JAVA_PROPERTIES}"
 
-    PY_SCRIPTS_PATH=${WLSDEPLOY_HOME}/lib/python
+    PY_SCRIPTS_PATH="${WLSDEPLOY_HOME}/lib/python"
 
     echo \
     ${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
         ${JAVA_PROPERTIES} \
         org.python.util.jython \
         "${PY_SCRIPTS_PATH}/$jythonScript" ${scriptArgs}
 
-    ${JAVA_HOME}/bin/java -cp ${CLASSPATH} \
+    "${JAVA_HOME}/bin/java" -cp "${CLASSPATH}" \
         ${JAVA_PROPERTIES} \
         org.python.util.jython \
         "${PY_SCRIPTS_PATH}/$jythonScript" ${scriptArgs}
diff --git a/installer/src/main/bin/updateDomain.sh b/installer/src/main/bin/updateDomain.sh
@@ -92,11 +92,11 @@ usage() {
 
 WLSDEPLOY_PROGRAM_NAME="updateDomain"; export WLSDEPLOY_PROGRAM_NAME
 
-scriptName=`basename $0`
+scriptName=$(basename "$0")
 scriptPath=$(dirname "$0")
 scriptArgs=$*
 
-. $scriptPath/shared.sh
+. "$scriptPath/shared.sh"
 
 umask 27
 
diff --git a/installer/src/main/bin/validateModel.sh b/installer/src/main/bin/validateModel.sh
diff --git a/pom.xml b/pom.xml
diff --git a/samples/docker-domain/README.md b/samples/docker-domain/README.md
diff --git a/system-test/pom.xml b/system-test/pom.xml
