commit to branch

Author: CarolynRountree

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

@@ -294,6 +294,7 @@
 UNIFORM_DISTRIBUTED_QUEUE = 'UniformDistributedQueue'
 UNIFORM_DISTRIBUTED_TOPIC = 'UniformDistributedTopic'
 UNIX_MACHINE = 'UnixMachine'
+UNIX_MACHINE_ATTRIBUTE = 'PostBindGID'
 UPDATE_MODE = 'UpdateMode'
 USER = 'User'
 VIRTUAL_TARGET = 'VirtualTarget'

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

@@ -223,7 +223,8 @@ def get_unix_machines(self):
         _method_name = 'get_unix_machines'
         _logger.entering(class_name=_class_name, method_name=_method_name)
         result = OrderedDict()
-        model_top_folder_name = model_constants.UNIX_MACHINE
+        model_top_folder_name = model_constants.MACHINE
+        unix_location = LocationContext(self._base_location)
         location = LocationContext(self._base_location)
         location.append_location(model_top_folder_name)
         machines = self._find_names_in_folder(location)
@@ -238,7 +239,7 @@ def get_unix_machines(self):
                 self._discover_subfolders(result[machine], location)
                 location.remove_name_token(name_token)
 
-        _logger.exiting(class_name=_cjlass_name, method_name=_method_name, result=result)
+        _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return model_top_folder_name, result
 
     def get_machines(self, unix_machines=None):

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

@@ -10,7 +10,8 @@
         "JNDIName":                 [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "JNDIName",                     "wlst_path": "WP001", "value": {"default": "None"},    "wlst_type": "string"           } ],
         "Notes":                    [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "Notes",                        "wlst_path": "WP001", "value": {"default": "None"},    "wlst_type": "string"           } ],
         "SessionPasswordEncrypted": [ {"version": "[12.1.3,)",    "wlst_mode": "both",    "wlst_name": "SessionPasswordEncrypted",     "wlst_path": "WP001", "value": {"default": "None"},    "wlst_type": "password",        "get_method": "GET"} ],
-        "Properties":               [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "Properties",                   "wlst_path": "WP001", "value": {"default": "None"},    "wlst_type": "properties",      "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" } ],
+        "Properties":               [ {"version": "[10,)",        "wlst_mode": "offline", "wlst_name": "Properties",                   "wlst_path": "WP001", "value": {"default": "None"},    "wlst_type": "properties",      "wlst_read_type": "delimited_string[semicolon]", "get_method": "LSA" } ,
+                                      {"version": "[10,)",        "wlst_mode": "online",  "wlst_name": "Properties",                   "wlst_path": "WP001", "value": {"default": "None"},    "wlst_type": "properties",      "wlst_read_type": "delimited_string", "get_method": "LSA" } ],
         "Target":                   [ {"version": "[10,)",        "wlst_mode": "offline", "wlst_name": "Target",                       "wlst_path": "WP001", "value": {"default": "None"   }, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
                                       {"version": "[10,)",        "wlst_mode": "online",  "wlst_name": "Targets",                      "wlst_path": "WP002", "value": {"default": "None"   }, "wlst_type": "jarray",          "get_method": "GET", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
         "SessionUsername":          [ {"version": "[12.1.3,)",    "wlst_mode": "both",    "wlst_name": "SessionUsername",              "wlst_path": "WP001", "value": {"default": "None"},    "wlst_type": "credential"       } ]