Issue#379 classpath libraries adding oracle files to archive (#517)

* fix comparison string for correct check against oracle location

Author: CarolynRountree

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import os
@@ -578,7 +578,7 @@ def _is_oracle_home_file(self, file_name):
         :param file_name: to check for oracle home or weblogic home
         :return: true if in oracle home location
         """
-        py_str = str(file_name)
+        py_str = path_utils.fixup_path(str(file_name))
         return (not py_str.startswith(self._model_context.get_domain_home())) and \
             (py_str.startswith(self._model_context.get_oracle_home()) or
              py_str.startswith(self._model_context.get_wl_home()))

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

@@ -596,14 +596,13 @@ def _add_classpath_libraries_to_archive(self, model_name, model_value, location)
 
         classpath_string = None
         if not StringUtils.isEmpty(model_value):
-            classpath = path_utils.fixup_path(model_value)
-
             # model values are comma-separated
-            classpath_entries = classpath.split(MODEL_LIST_DELIMITER)
+            classpath_entries = model_value.split(MODEL_LIST_DELIMITER)
 
             if classpath_entries:
                 classpath_list = []
                 for classpath_entry in classpath_entries:
+                    classpath_entry = self._model_context.replace_token_string(classpath_entry)
                     new_source_name = self._add_library(server_name, classpath_entry)
                     if new_source_name is not None:
                         classpath_list.append(new_source_name)