fixing JMS foreign server discovery to not use method that does not accept...

Author: robertpatrick

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

@@ -1096,8 +1096,8 @@ def _get_from_url(self, owner_name, file_name):
         success = True
         url = None
         path = None
-        try:
-            uri = URI(file_name)
+        uri = self._get_uri(owner_name, file_name)
+        if uri is not None:
             if 'http' == uri.getScheme() or 'https' == uri.getScheme():
                 url = uri.toURL()
             elif 'file' == uri.getScheme() or uri.getScheme() is None:
@@ -1106,10 +1106,8 @@ def _get_from_url(self, owner_name, file_name):
                 success = False
                 _logger.warning('WLSDPLY-06160', owner_name, file_name, uri.getScheme(),
                                 class_name=_class_name, method_name=_method_name)
-        except (URISyntaxException, MalformedURLException), e:
+        else:
             success = False
-            _logger.warning('WLSDPLY-06321', owner_name, file_name, e.getLocalizedMessage,
-                            error=e, class_name=_class_name, method_name=_method_name)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=(success, url, path))
         return success, url, path
@@ -1118,6 +1116,16 @@ def download_deployment_from_remote_server(self, source_path, local_download_roo
         return self.path_helper.download_file_from_remote_server(self._model_context, source_path,
                                                                  local_download_root, file_type)
 
+    def _get_uri(self, name, value):
+        _method_name = '_get_uri'
+        uri = None
+        try:
+            uri = URI(value)
+        except (URISyntaxException, MalformedURLException), e:
+            _logger.warning('WLSDPLY-06321', name, value, e.getLocalizedMessage,
+                            error=e, class_name=_class_name, method_name=_method_name)
+        return uri
+
 
 def add_to_model_if_not_empty(dictionary, entry_name, entry_value):
     """

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

@@ -402,10 +402,14 @@ def _add_foreign_server_binding(self, server_name, model_name, model_value):
         _logger.entering(server_name, model_name, model_value, class_name=_class_name, method_name=_method_name)
         new_name = model_value
         if model_value is not None:
-            # FIXME - This is an ugly hack...
-            success, _, file_name = self._get_from_url('Foreign Server ' + server_name + ' Connection URL', model_value)
+            uri = self._get_uri('Foreign Server ' + server_name + ' Connection URL', model_value)
+            file_name = None
+            if uri is not None:
+                if 'file' == uri.getScheme() or uri.getScheme() is None:
+                    file_name = uri.getPath()
+
             archive_file = self._model_context.get_archive_file()
-            if success and file_name is not None:
+            if file_name is not None:
                 if not self._model_context.is_remote():
                     file_name = self._convert_path(file_name)
                     _logger.finer('WLSDPLY-06495', server_name, file_name, class_name=_class_name, method_name=_method_name)

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

@@ -909,7 +909,7 @@ WLSDPLY-06317=Added Coherence Cluster {0} cache configuration file from URL loca
 WLSDPLY-06318=Unable to add Coherence Cluster {0} persistence directory {1} type {2} to archive file: {3}
 WLSDPLY-06319=Added Coherence Cluster {0} cache configuration file from location {1} to archive file with name {2}
 WLSDPLY-06320=Added Coherence Cluster {0} persistence directory {1} type {2} to archive file
-WLSDPLY-06321=Unable to access {0} file {1} and will not add the file to the archive: {2}
+WLSDPLY-06321=Unable to parse {0} file {1} and will not add the file to the archive: {2}
 WLSDPLY-06322=Skipping {0} Coherence Cluster System Resource {1}
 WLSDPLY-06323=Skipping discovery of Coherence Cache Config {0} in Coherence Cluster System Resource {1} due to WebLogic Server Bug 35969096
 WLSDPLY-06324=Skipping discovery of Coherence Cluster {0} Cache Config {1} due to unexpected problem processing the cache config file location {2}