Merge branch 'apps-outside-archive' into 'main'

fixing error message when app is outside of the archive

See merge request weblogic-cloud/weblogic-deploy-tooling!1692

Author: robertpatrick

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

@@ -119,8 +119,15 @@ def get_application_versioned_name(self, source_path, model_name, module_type=No
                         self.logger.info('WLSDPLY-09328', model_name, versioned_name,
                                          class_name=self._class_name, method_name=_method_name)
 
-            except (IOException, FileNotFoundException, ZipException, IllegalStateException), e:
-                ex = exception_helper.create_deploy_exception('WLSDPLY-09329', model_name, source_path,
+            except (IOException, ZipException, IllegalStateException), e:
+                # The SourcePath may be a path into the archive or an absolute path to
+                # the application that was not in the archive file.
+                if self.archive_helper and self.archive_helper.is_path_into_archive(source_path):
+                    key = 'WLSDPLY-09329'
+                else:
+                    key = 'WLSDPLY-09354'
+
+                ex = exception_helper.create_deploy_exception(key, model_name, source_path,
                                                               str_helper.to_string(e), error=e)
                 self.logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
                 raise ex

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

@@ -1546,6 +1546,7 @@ WLSDPLY-09350={0} {1} cannot be deployed using the -remote options since the Sou
 WLSDPLY-09351={0} {1} has attribute {2} with a relative path that is not referencing an archive file so the absolute path to the file is not well-defined.
 WLSDPLY-09352=Structured application {0} plan file {1} does not exist.
 WLSDPLY-09353=Structured application {0} plan file {1} is not in the archive so WDT is not going to move it and therefore, does not need to fix the config-root element.
+WLSDPLY-09354=Failed to compute name for application {0} from application at {1}: {2}
 
 # wlsdeploy/tool/deploy/common_resources_deployer.py
 WLSDPLY-09400=ResourceGroup was specified in the test file but are not supported in WebLogic Server version {0}