Merge branch 'master' into WDT-267-Server-Migratable-Target-Attribute-fixes

CarolynRountree · CarolynRountree · commit 6f85c1292319 · 2019-03-20T14:47:26.000-05:00
diff --git a/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java b/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * The Universal Permissive License (UPL), Version 1.0
  */
 package oracle.weblogic.deploy.util;
@@ -657,7 +657,7 @@ public List<String> listDomainLibLibraries() throws WLSDeployArchiveIOException
     /**
      * Extract the specified domain library to the specified location (e.g., $DOMAIN_HOME/lib).
      *
-     * @param archivePath the name of the JAR to extract
+     * @param archivePath the path of the library within the archive
      * @param extractToLocation the location to write the file
      * @throws WLSDeployArchiveIOException if an IOException occurred while extracting or writing the file
      * @throws IllegalArgumentException if the file or directory passed in does not exist
@@ -669,11 +669,7 @@ public void extractDomainLibLibrary(String archivePath, File extractToLocation)
         validateNonEmptyString(archivePath, "archivePath", METHOD);
         validateExistingDirectory(extractToLocation, "extractToLocation", getArchiveFileName(), METHOD);
 
-        String libPath = archivePath;
-        if (!archivePath.startsWith(ARCHIVE_DOMLIB_TARGET_DIR)) {
-            libPath = ARCHIVE_DOMLIB_TARGET_DIR + ZIP_SEP + archivePath;
-        }
-        extractFileFromZip(libPath, ARCHIVE_DOMLIB_TARGET_DIR, "", extractToLocation);
+        extractFileFromZip(archivePath, ARCHIVE_DOMLIB_TARGET_DIR, "", extractToLocation);
         LOGGER.exiting(CLASS, METHOD);
     }
 
diff --git a/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployZipFile.java b/core/src/main/java/oracle/weblogic/deploy/util/WLSDeployZipFile.java
@@ -775,7 +775,14 @@ private void saveChangesToZip(Map<String, ZipEntry> updatedZipEntries, Map<Strin
     private File getNewOutputFile() throws WLSDeployArchiveIOException {
         final String METHOD = "getNewOutputFile";
 
-        String[] nameComponents = FileUtils.parseFileName(getFileName());
+        String fileName = getFileName();
+        if (fileName.contains(File.separator)) {
+            int lastSeparator = fileName.lastIndexOf(File.separator);
+            if (lastSeparator > 0)
+                fileName = fileName.substring(lastSeparator+1);
+        }
+
+        String[] nameComponents = FileUtils.parseFileName(fileName);
 
         File directory = getFile().getParentFile();
         File newOutputFile;
diff --git a/core/src/main/python/create.py b/core/src/main/python/create.py
@@ -335,41 +335,42 @@ def validate_model(model_dictionary, model_context, aliases):
 def validateRCUArgsAndModel(model_context, model):
     has_atpdbinfo = 0
     domain_info = model[model_constants.DOMAIN_INFO]
-    if model_constants.RCU_DB_INFO in domain_info:
-        rcu_db_info = domain_info[model_constants.RCU_DB_INFO]
-        has_tns_admin = atp_helper.has_tns_admin(rcu_db_info)
-        has_regular_db = atp_helper.is_regular_db(rcu_db_info)
-        has_atpdbinfo = atp_helper.has_atpdbinfo(rcu_db_info)
-
-        if model_context.get_archive_file_name() and not has_regular_db:
-            System.setProperty('oracle.jdbc.fanEnabled', 'false')
-
-            # 1. If it does not have the oracle.net.tns_admin specified, then extract to domain/atpwallet
-            # 2. If it is plain old regular oracle db, do nothing
-            # 3. If it deos not have tns_admin in the model, then the wallet must be in the archive
-            if not has_tns_admin:
-                # extract the wallet first
-                archive_file = WLSDeployArchive(model_context.get_archive_file_name())
-                atp_wallet_zipentry = archive_file.getATPWallet()
-                if atp_wallet_zipentry and model[model_constants.TOPOLOGY]['Name']:
-                    extract_path = atp_helper.extract_walletzip(model, model_context, archive_file, atp_wallet_zipentry)
-                    # update the model to add the tns_admin
-                    model[model_constants.DOMAIN_INFO][model_constants.RCU_DB_INFO][
-                        model_constants.DRIVER_PARAMS_NET_TNS_ADMIN] = extract_path
-                else:
-                    __logger.severe('WLSDPLY-12411', error=None,
-                                    class_name=_class_name, method_name="validateRCUArgsAndModel")
+    if domain_info is not None:
+        if model_constants.RCU_DB_INFO in domain_info:
+            rcu_db_info = domain_info[model_constants.RCU_DB_INFO]
+            has_tns_admin = atp_helper.has_tns_admin(rcu_db_info)
+            has_regular_db = atp_helper.is_regular_db(rcu_db_info)
+            has_atpdbinfo = atp_helper.has_atpdbinfo(rcu_db_info)
+
+            if model_context.get_archive_file_name() and not has_regular_db:
+                System.setProperty('oracle.jdbc.fanEnabled', 'false')
+
+                # 1. If it does not have the oracle.net.tns_admin specified, then extract to domain/atpwallet
+                # 2. If it is plain old regular oracle db, do nothing
+                # 3. If it deos not have tns_admin in the model, then the wallet must be in the archive
+                if not has_tns_admin:
+                    # extract the wallet first
+                    archive_file = WLSDeployArchive(model_context.get_archive_file_name())
+                    atp_wallet_zipentry = archive_file.getATPWallet()
+                    if atp_wallet_zipentry and model[model_constants.TOPOLOGY]['Name']:
+                        extract_path = atp_helper.extract_walletzip(model, model_context, archive_file, atp_wallet_zipentry)
+                        # update the model to add the tns_admin
+                        model[model_constants.DOMAIN_INFO][model_constants.RCU_DB_INFO][
+                            model_constants.DRIVER_PARAMS_NET_TNS_ADMIN] = extract_path
+                    else:
+                        __logger.severe('WLSDPLY-12411', error=None,
+                                        class_name=_class_name, method_name="validateRCUArgsAndModel")
+                        __clean_up_temp_files()
+                        tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
+
+        else:
+            if model_context.get_domain_typedef().required_rcu():
+                if not model_context.get_rcu_database() or not model_context.get_rcu_prefix():
+                    __logger.severe('WLSDPLY-12408', model_context.get_domain_type(), CommandLineArgUtil.RCU_DB_SWITCH,
+                                    CommandLineArgUtil.RCU_PREFIX_SWITCH)
                     __clean_up_temp_files()
                     tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
-    else:
-        if model_context.get_domain_typedef().required_rcu():
-            if not model_context.get_rcu_database() or not model_context.get_rcu_prefix():
-                __logger.severe('WLSDPLY-12408', model_context.get_domain_type(), CommandLineArgUtil.RCU_DB_SWITCH,
-                            CommandLineArgUtil.RCU_PREFIX_SWITCH)
-                __clean_up_temp_files()
-                tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
-
     return has_atpdbinfo
 
 
@@ -388,6 +389,8 @@ def main(args):
 
     wlst_helper.silence()
 
+    exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
+
     try:
         model_context = __process_args(args)
     except CLAException, ex:
@@ -450,8 +453,11 @@ def main(args):
         tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
     __clean_up_temp_files()
+
+    tool_exit.end(model_context, exit_code)
     return
 
+
 if __name__ == "main":
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)
diff --git a/core/src/main/python/wlsdeploy/tool/util/library_helper.py b/core/src/main/python/wlsdeploy/tool/util/library_helper.py
@@ -1,17 +1,19 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
-
-import wlsdeploy.util.dictionary_utils as dictionary_utils
+from java.io import File
+from oracle.weblogic.deploy.util import WLSDeployArchive
+from shutil import copy
 
 from wlsdeploy.aliases.model_constants import DOMAIN_LIBRARIES
-from wlsdeploy.aliases.model_constants import RCU_DB_INFO
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.tool.util.alias_helper import AliasHelper
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
 
+import wlsdeploy.util.dictionary_utils as dictionary_utils
+
 
 class LibraryHelper(object):
     """
@@ -51,9 +53,14 @@ def install_domain_libraries(self):
                 raise ex
 
             for domain_lib in domain_libs:
-                self.logger.info('WLSDPLY-12215', domain_lib, self.domain_home,
-                                 class_name=self.__class_name, method_name=_method_name)
-                self.archive_helper.extract_domain_library(domain_lib)
+                if WLSDeployArchive.isPathIntoArchive(domain_lib):
+                    self.logger.info('WLSDPLY-12215', domain_lib, self.domain_home,
+                                     class_name=self.__class_name, method_name=_method_name)
+                    self.archive_helper.extract_domain_library(domain_lib)
+                else:
+                    self.logger.info('WLSDPLY-12235', domain_lib, self.domain_home,
+                                     class_name=self.__class_name, method_name=_method_name)
+                    self._copy_domain_library(domain_lib)
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
@@ -78,3 +85,20 @@ def extract_classpath_libraries(self):
                                  class_name=self.__class_name, method_name=_method_name)
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
+
+    def _copy_domain_library(self, domain_lib):
+        """
+        Copy the specified domain library to the domain's lib directory.
+        :raises: BundleAwareException of the specified type: if an error occurs
+        """
+        _method_name = '_copy_domain_library'
+
+        source_path = File(domain_lib).getAbsolutePath()
+        target_dir = File(self.domain_home, 'lib').getPath()
+
+        try:
+            copy(str(source_path), str(target_dir))
+        except IOError:
+            ex = exception_helper.create_create_exception('WLSDPLY-12234', source_path, target_dir)
+            self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
diff --git a/core/src/main/python/wlsdeploy/tool/validate/validator.py b/core/src/main/python/wlsdeploy/tool/validate/validator.py
@@ -889,6 +889,10 @@ def __validate_path_tokens_attribute(self, attribute_name, attribute_value, mode
             elif value_data_type == 'string':
                 attr_values.append(attribute_value)
 
+            else:
+                # must be a list
+                attr_values.extend(attribute_value)
+
             for item_path in attr_values:
                 validation_result = self.__validate_single_path_in_archive(item_path.strip(), attribute_name,
                                                                            model_folder_path, validation_result)
diff --git a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties
@@ -1023,6 +1023,8 @@ WLSDPLY-12230=Creating placeholder for Coherence cluster {0}
 WLSDPLY-12231=Apply Domain {0} domain level attributes
 WLSDPLY-12232=Unable to configure the SecurityConfiguration in domain release {0} using weblogic-deploy {1}
 WLSDPLY-12233=Target JRF deployments and resources to {0} {1}
+WLSDPLY-12234=Unable to copy domain library {0} to directory {1}
+WLSDPLY-12235=Installing domain library {0} to lib directory of {1}
 
 # domain_typedef.py
 WLSDPLY-12300={0} got the domain type {1} but the domain type definition file {2} was not valid: {3}
diff --git a/installer/src/main/bin/createDomain.cmd b/installer/src/main/bin/createDomain.cmd
@@ -2,7 +2,7 @@
 @rem **************************************************************************
 @rem createDomain.cmd
 @rem
-@rem Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+@rem Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 @rem The Universal Permissive License (UPL), Version 1.0
 @rem
 @rem     NAME
@@ -271,7 +271,8 @@ IF NOT EXIST "%WLST%" (
 )
 :found_wlst
 
-SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
+SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
+SET WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
 SET WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
 SET "WLST_PROPERTIES=-Djava.util.logging.config.class=%LOG_CONFIG_CLASS% %WLST_PROPERTIES%"
 SET "WLST_PROPERTIES=%WLST_PROPERTIES% %WLSDEPLOY_PROPERTIES%"
@@ -282,6 +283,9 @@ IF NOT DEFINED WLSDEPLOY_LOG_PROPERTIES (
 IF NOT DEFINED WLSDEPLOY_LOG_DIRECTORY (
   SET WLSDEPLOY_LOG_DIRECTORY=%WLSDEPLOY_HOME%\logs
 )
+IF NOT DEFINED WLSDEPLOY_LOG_HANDLERS (
+  SET WLSDEPLOY_LOG_HANDLERS=%WLSDEPLOY_LOG_HANDLER%
+)
 
 ECHO JAVA_HOME = %JAVA_HOME%
 ECHO WLST_EXT_CLASSPATH = %WLST_EXT_CLASSPATH%
diff --git a/installer/src/main/bin/createDomain.sh b/installer/src/main/bin/createDomain.sh
@@ -2,7 +2,7 @@
 # *****************************************************************************
 # createDomain.sh
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # The Universal Permissive License (UPL), Version 1.0
 #
 #     NAME
@@ -295,7 +295,8 @@ else
     fi
 fi
 
-LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
+LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
+WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
 WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
 WLST_PROPERTIES="-Djava.util.logging.config.class=${LOG_CONFIG_CLASS} ${WLST_PROPERTIES} ${WLSDEPLOY_PROPERTIES}"
 export WLST_PROPERTIES
@@ -308,6 +309,10 @@ if [ "${WLSDEPLOY_LOG_DIRECTORY}" = "" ]; then
     WLSDEPLOY_LOG_DIRECTORY=${WLSDEPLOY_HOME}/logs; export WLSDEPLOY_LOG_DIRECTORY
 fi
 
+if [ "${WLSDEPLOY_LOG_HANDLERS}" == "" ]; then
+    WLSDEPLOY_LOG_HANDLERS=${WLSDEPLOY_LOG_HANDLER}; export WLSDEPLOY_LOG_HANDLERS
+fi
+
 echo "JAVA_HOME = ${JAVA_HOME}"
 echo "WLST_EXT_CLASSPATH = ${WLST_EXT_CLASSPATH}"
 echo "CLASSPATH = ${CLASSPATH}"
