Wdt 05017 archive binding directory (#728)

* WDT allow directory for JMS connectionURL to support MQSeries

Author: CarolynRountree

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java

@@ -986,7 +986,7 @@ public String addCoherenceConfigFile(String clusterName, File configFile) throws
      * Add a Foreign Server binding file to the archive
      *
      * @param foreignServer the Foreign Server name used to segregate the directories
-     * @param configFile  the file to add
+     * @param configFile  the file or directory to add
      * @return the new location of the file to use in the model
      * @throws WLSDeployArchiveIOException if an error occurs while archiving the file
      * @throws IllegalArgumentException    if the file does not exist or the foreignServer is empty or null
@@ -997,7 +997,7 @@ public String addForeignServerFile(String foreignServer, File configFile) throws
         LOGGER.entering(CLASS, METHOD, foreignServer, configFile);
 
         validateNonEmptyString(foreignServer, "foreignServerName", METHOD);
-        validateExistingFile(configFile, "configFile", getArchiveFileName(), METHOD);
+        validateExistingFile(configFile, "configFile", getArchiveFileName(), METHOD, true);
         String newName = addItemToZip(ARCHIVE_JMS_FOREIGN_SERVER_DIR + ZIP_SEP + foreignServer, configFile);
         LOGGER.exiting(CLASS, METHOD, newName);
         return newName;

core/src/main/python/wlsdeploy/tool/deploy/deployer.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
@@ -393,7 +393,7 @@ def __process_archive_entry(self, location, key, value):
                         result = True
         elif self.archive_helper.contains_path(value):
             # contents should have been extracted elsewhere, such as for apps and shared libraries
-            result = self.__process_directory_entry(fullpath)
+            result = self.archive_helper.extract_directory(value)
         elif value.endswith('/'):
             # If the path is a directory in the wlsdeploy directory tree
             # but not in the archive, just create it to help the user.

core/src/main/python/wlsdeploy/tool/deploy/jms_resources_deployer.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import oracle.weblogic.deploy.util.PyOrderedDict as OrderedDict

core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py

@@ -411,7 +411,8 @@ def _add_foreign_server_binding(self, server_name, model_name, model_value):
                     _logger.info('WLSDPLY-06492', server_name, file_name, new_name, class_name=_class_name,
                                  method_name=_method_name)
                 except (IllegalArgumentException, WLSDeployArchiveIOException), wioe:
-                    _logger.warning('WLSDPLY-06493', server_name, file_name, wioe.getLocalizedMessage())
+                    _logger.warning('WLSDPLY-06493', server_name, file_name, wioe.getLocalizedMessage(),
+                                    class_name=_class_name, method_name=_method_name)
                     new_name = None
 
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=new_name)