Finalize changes for discover recap

Author: CarolynRountree

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

@@ -99,8 +99,8 @@ def _populate_model_parameters(self, dictionary, location):
                                                                                                 wlst_param,
                                                                                                 wlst_value)
                 except AliasException, de:
-                    _logger.warning('WLSDPLY-06106', wlst_param, de.getLocalizedMessage(), class_name=_class_name,
-                                    method_name=_method_name)
+                    _logger.warning('WLSDPLY-06106', wlst_param, wlst_path, de.getLocalizedMessage(),
+                                    class_name=_class_name, method_name=_method_name)
                     continue
 
                 attr_dict[model_param] = wlst_value
@@ -228,8 +228,8 @@ def _find_names_in_folder(self, location):
         names = None
         mbean_type = self._alias_helper.get_wlst_mbean_type(location)
         if mbean_type is None:
-            _logger.fine('WLSDPLY-06110', location.get_model_folders()[-1], self._get_wlst_mode_string(),
-                         self._wls_version, class_name=_class_name, method_name=_method_name)
+            _logger.fine('WLSDPLY-06110', location.get_model_folders()[-1], location.get_folder_path(),
+                         class_name=_class_name, method_name=_method_name)
         else:
             folder_path = self._alias_helper.get_wlst_list_path(location)
             _logger.finest('WLSDPLY-06111', folder_path, class_name=_class_name, method_name=_method_name)
@@ -341,8 +341,7 @@ def _discover_artificial_folder(self, model_subfolder_name, location, name_token
                 artificial = self._get_artificial_type(location)
                 if artificial is None:
                     _logger.warning('WLSDPLY-06123', self._alias_helper.get_model_folder_path(location),
-                                    self._get_wlst_mode_string(), self._wls_version, class_name=_class_name,
-                                    method_name=_method_name)
+                                    class_name=_class_name, method_name=_method_name)
                 else:
                     _logger.finer('WLSDPLY-06120', artificial, name, model_subfolder_name, class_name=_class_name,
                                   method_name=_method_name)

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

@@ -414,7 +414,7 @@ WLSDPLY-06011={0} failed to discover domain {1} at {2} : {3}
 WLSDPLY-06012={0} failed to persist the model to the archive file {1}: {2}
 WLSDPLY-06013={0} failed to create the archive file at {1}: {2}
 WLSDPLY-06014=Filters applied to the model
-WLSDPLY-06015=Unable to run validation against the discovered model :  {0}
+WLSDPLY-06015=Unable to run validation against the discovered model : {0}
 WLSDPLY-06016=Please enter the WebLogic administrator username
 WLSDPLY-06017=Failed to read the WebLogic administrator username input from the user: {0}
 WLSDPLY-06018=Please enter the WebLogic administrator password
@@ -431,11 +431,11 @@ WLSDPLY-06102=The attributes found at path {0} are {1}
 WLSDPLY-06103=Get required attributes at location {0} are {1}
 WLSDPLY-06104=Attribute {0} value must be retrieved using wlst.get() instead of lsa()
 WLSDPLY-06105=Processing attribute {0} value {1} retrieved from location {2}
-WLSDPLY-06106=Unable to add the wlst attribute {0} to the model : {1}
+WLSDPLY-06106=Unable to add {0} from location {1} to the model : {2}
 WLSDPLY-06107=Added attribute {0} value {1} to model
 WLSDPLY-06108=Attribute {0} has default value and will not be added to the model
 WLSDPLY-06109=Unable to get the attributes at the path with name {0} at the current location {1} : {2}
-WLSDPLY-06110=The mbean type {0} is not defined in the alias definitions while running in {1} mode wls version {2}
+WLSDPLY-06110=The mbean type {0} is not defined for the model and will not be added to the model
 WLSDPLY-06111=Locate WLST MBean names at location {0}
 WLSDPLY-06112=The mbean type {0} for {1} is marked as singleton but has {2} name entries
 WLSDPLY-06113=Adding entity with name {0} to {1}
@@ -448,7 +448,7 @@ WLSDPLY-06119=The mbean type {0} for is not present in {1} mode for wls version
 WLSDPLY-06120=Add artificial folder type {0} with name {1} to {2}
 WLSDPLY-06121=Invalid location returned from wlst.cd() to {0}
 WLSDPLY-06122=Invalid security type MBean interface {0} : {1}
-WLSDPLY-06123=Unable to determine the security type for {0} while running in {1} mode wls version {2}. \
+WLSDPLY-06123=Unable to determine the security type for {0}. \
   This security entity will not be added to the model
 WLSDPLY-06124=Entity at location {0} is a proxy that does not have a registered MBean interface name : {1}
 WLSDPLY-06125=Unable to locate model name for MBean interface name {0} for {1}
@@ -658,7 +658,7 @@ WLSDPLY-08108=Unable to get the alias attributes for location {0} because the {1
 WLSDPLY-08109=Unable to get the WLST name for attribute {0} in folder {1} because the {2} attribute is missing \
   from the alias folder entry
 WLSDPLY-08110=The alias for the attribute with WLST name {0} in folder {1} is missing the {2} field
-WLSDPLY-08111=The wlst attribute {1} in folder {0} is not defined in the model
+WLSDPLY-08111=The wlst attribute {1} is not defined for the model folder {0}
 WLSDPLY-08112=Unable to locate the model attribute entry for folder {0} and WLST name {1} because the {2} \
   attribute is missing
 WLSDPLY-08113=Unable to get alias information for folder {0} because the location {1} appears to be invalid
@@ -1212,4 +1212,4 @@ WLSDPLY-20024={0} failed to persist the model to the archive file {1}: {2}
 WLSDPLY-21000={0} Messages:
 WLSDPLY-21001=          {0} total : {1}
 WLSDPLY-21002= Total:   {0}
-WLSDPLY-21003=Activity Log for {0} version {1} {2} mode:
+WLSDPLY-21003=Issue Log for {0} version {1} {2} mode: