Merge pull request #277 from oracle/issue-275-splitting-classpath

Issue #275 - Join discovered lists using comma delimiter only; split …

Author: ddsharpe

core/src/main/python/wlsdeploy/aliases/alias_utils.py

@@ -663,12 +663,12 @@ def get_number_of_directories_to_strip(desired_path_type, actual_path_type):
 
 def convert_from_type(data_type, value, preferred=None, delimiter=None):
     """
-    Convert from wlst type
-    :param data_type: type of data
-    :param value: value of data
-    :param preferred: how it should be represented
-    :param delimiter: for representation
-    :return: converted type
+    Convert WLST value to model representation type
+    :param data_type: the target data type for the model
+    :param value: value to be converted
+    :param preferred: the preferred data type to be represented in the model (optional)
+    :param delimiter: the delimiter for parsing the WLST representation of the data value (optional)
+    :return: converted value
     """
 
     _method_name = 'convert_from_type'
@@ -835,6 +835,14 @@ def get_dictionary_mode(alias_dict):
 
 
 def _jconvert_to_type(data_type, value, delimiter):
+    """
+    Convert WLST value to model representation type.
+    Assumes that empty values and password data types have been converted elsewhere.
+    :param data_type: the target data type for the model
+    :param value: value to be converted
+    :param delimiter: the delimiter for parsing the WLST representation of the data value (optional)
+    :return: converted value
+    """
     _method_name = '_jconvert_to_type'
     try:
         converted = TypeUtils.convertToType(data_type, value, delimiter)

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

@@ -13,6 +13,7 @@
 
 from wlsdeploy.aliases import model_constants
 from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.logging.platform_logger import PlatformLogger
@@ -296,7 +297,7 @@ def discover_security_configuration(self):
                 self._discover_subfolders(result, location)
             except DiscoverException, de:
                 _logger.warning('WLSDPLY-06200', self._wls_version, de.getLocalizedMessage(),
-                                 class_name=_class_name, method_name=_method_name)
+                                class_name=_class_name, method_name=_method_name)
                 result = OrderedDict()
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return model_top_folder_name, result
@@ -532,18 +533,25 @@ def _add_classpath_libraries_to_archive(self, model_name, model_value, location)
         _method_name = 'add_classpath_libraries_to_archive'
         server_name = self._get_server_name_from_location(location)
         _logger.entering(server_name, model_name, model_value, class_name=_class_name, method_name=_method_name)
+
         classpath_string = None
         if not StringUtils.isEmpty(model_value):
-            classpath_list = []
-            classpath_entries, separator = path_utils.split_classpath(model_value)
+            classpath = path_utils.fixup_path(model_value)
+
+            # model values are comma-separated
+            classpath_entries = classpath.split(MODEL_LIST_DELIMITER)
+
             if classpath_entries:
+                classpath_list = []
                 for classpath_entry in classpath_entries:
                     new_source_name = self._add_library(server_name, classpath_entry)
                     if new_source_name is not None:
                         classpath_list.append(new_source_name)
-                classpath_string = StringUtils.getStringFromList(classpath_list, separator)
+
+                classpath_string = StringUtils.getStringFromList(classpath_list, MODEL_LIST_DELIMITER)
                 _logger.fine('WLSDPLY-06617', server_name, classpath_string, class_name=_class_name,
                              method_name=_method_name)
+
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=classpath_string)
         return classpath_string
 

core/src/main/python/wlsdeploy/tool/validate/validator.py

@@ -886,7 +886,7 @@ def __validate_path_tokens_attribute(self, attribute_name, attribute_value, mode
             if value_data_type == 'string' and model_constants.MODEL_LIST_DELIMITER in attribute_value:
                 attr_values = attribute_value.split(model_constants.MODEL_LIST_DELIMITER)
 
-            if value_data_type == 'string':
+            elif value_data_type == 'string':
                 attr_values.append(attribute_value)
 
             for item_path in attr_values:

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json

@@ -938,7 +938,7 @@
                 "Arguments":          [ {"version": "[10,)",       "wlst_mode": "both",   "wlst_name": "Arguments",          "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string[space]"           } ],
                 "BeaHome":            [ {"version": "[10,)",       "wlst_mode": "both",   "wlst_name": "BeaHome",            "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string",                           "uses_path_tokens": "true"} ],
                 "BootProperties":     [ {"version": "[10,)",       "wlst_mode": "online", "wlst_name": "BootProperties",     "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties",                       "get_method": "GET", "preferred_model_type": "list", "access": "RO"} ],
-                "ClassPath":          [ {"version": "[10,)",       "wlst_mode": "both",   "wlst_name": "ClassPath",          "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string[path_separator]", "uses_path_tokens": "true"} ],
+                "ClassPath":          [ {"version": "[10,)",       "wlst_mode": "both",   "wlst_name": "ClassPath",          "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string[path_separator]", "preferred_model_type": "delimited_string", "uses_path_tokens": "true"} ],
                 "JavaHome":           [ {"version": "[10,)",       "wlst_mode": "both",   "wlst_name": "JavaHome",           "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string",                           "uses_path_tokens": "true"} ],
                 "JavaVendor":         [ {"version": "[10,)",       "wlst_mode": "both",   "wlst_name": "JavaVendor",         "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string"                            } ],
                 "MaxRestartCount":    [ {"version": "[10,)",       "wlst_mode": "offline", "wlst_name": "MaxRestartCount",   "wlst_path": "WP001", "value": {"default": 0      }, "wlst_type": "integer"                           } ],