Issue #287 - Allow directory paths for domain libraries in model; validate path lists correctly

Author: rakillen

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);
     }
 

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

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)

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}