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

Author: CarolynRountree

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

@@ -775,14 +775,6 @@ private void saveChangesToZip(Map<String, ZipEntry> updatedZipEntries, Map<Strin
     private File getNewOutputFile() throws WLSDeployArchiveIOException {
         final String METHOD = "getNewOutputFile";
 
-        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;
@@ -791,7 +783,18 @@ private File getNewOutputFile() throws WLSDeployArchiveIOException {
                 newOutputFile = getFile();
                 LOGGER.finest("WLSDPLY-01523", newOutputFile.getAbsolutePath());
             } else {
-                newOutputFile = File.createTempFile(nameComponents[0], DOT + nameComponents[1], directory);
+                // Is there a real case the the archive file with no extension ?
+                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);
+
+                // prefix shouldn't matter what we put here, but it has to be at least 3 characters
+
+                newOutputFile = File.createTempFile("wdt_temparchive", DOT + nameComponents[1], directory);
                 LOGGER.finest("WLSDPLY-01524", newOutputFile.getAbsolutePath());
             }
             LOGGER.finer("WLSDPLY-01525", getFileName(), newOutputFile.getAbsolutePath());

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

@@ -270,7 +270,7 @@ def add_application_plan_to_archive(self, application_name, application_dict):
             app_source_name = application_dict[model_constants.SOURCE_PATH]
             plan_path = application_dict[model_constants.PLAN_PATH]
             if plan_path:
-                _logger.info('WLSDPLY-06389', application_name, plan_path, class_name=_class_name,
+                _logger.info('WLSDPLY-06402', application_name, plan_path, class_name=_class_name,
                              method_name=_method_name)
                 plan_dir = None
                 if model_constants.PLAN_DIR in application_dict:

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -552,6 +552,7 @@ WLSDPLY-06399=Application {0} plan deployment has new source path location {1} w
   archive file deployment location
 WLSDPLY-06400=Skipping {0} application {1}
 WLSDPLY-06401=Skipping {0} shared library {1}
+WLSDPLY-06402=Add application {0} deployment plan {1} to archive file
 
 # domain_info_discoverer.py
 WLSDPLY-06420=Add the java archive files from the domain library {0} to the archive file