Issue #275 - Make discover delimiter changes specific to ClassPath; fixed validation archive check

Author: rakillen

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

@@ -35,7 +35,6 @@
 from wlsdeploy.aliases.alias_constants import JAVA_LANG_BOOLEAN
 from wlsdeploy.aliases.alias_constants import LIST
 from wlsdeploy.aliases.alias_constants import LONG
-from wlsdeploy.aliases.model_constants import MODEL_LIST_DELIMITER
 from wlsdeploy.aliases.alias_constants import PATH_SEPARATOR_DELIMITED_STRING
 from wlsdeploy.aliases.alias_constants import PREFERRED_MODEL_TYPE
 from wlsdeploy.aliases.alias_constants import SECURITY_PROVIDER_FOLDER_PATHS
@@ -866,11 +865,15 @@ def _jconvert_to_type(data_type, value, delimiter):
         elif data_type in (COMMA_DELIMITED_STRING, DELIMITED_STRING, SEMI_COLON_DELIMITED_STRING,
                            SPACE_DELIMITED_STRING, PATH_SEPARATOR_DELIMITED_STRING):
             #
-            # Data type value may be the wlst_type, wlst_read_type, or the preferred_model_type from the alias
-            # definition. For any of these, the representation in the model should be comma-separated string.
+            # This code intentionally ignores the delimiter value passed in and computes it from the data type.
+            # This is required to handle the special case where the value we read from WLST might have a
+            # different delimiter than the model value.  In this use case, the value passed into the method
+            # is the WLST value delimiter and the data_type is the preferred_model_type, so we compute the
+            # model delimiter from the data_type directly.
             #
-            if converted:
-                converted = MODEL_LIST_DELIMITER.join(converted)
+            delimiter = compute_delimiter_from_data_type(data_type, converted)
+            if delimiter and converted:
+                converted = delimiter.join(converted)
     except TypeError, te:
         ex = exception_helper.create_alias_exception('WLSDPLY-08021', value, data_type, delimiter, str(te))
         _logger.throwing(ex, class_name=_class_name, method_name=_method_name)

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"                           } ],