improved a few messages

Author: CarolynRountree

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

@@ -82,9 +82,8 @@ def _populate_model_parameters(self, dictionary, location):
                     try:
                         wlst_value = wlst_helper.get(wlst_param)
                     except PyWLSTException, pe:
-                        _logger.warning('WLSDPLY-06127', wlst_param, str(location), self._get_wlst_mode_string(),
-                                        self._wls_version, pe.getLocalizedMessage(), class_name=_class_name,
-                                        method_name=_method_name)
+                        _logger.warning('WLSDPLY-06127', wlst_param, wlst_path,
+                                        pe.getLocalizedMessage(), class_name=_class_name, method_name=_method_name)
                         continue
                 else:
                     wlst_value = wlst_params[wlst_param]
@@ -179,8 +178,8 @@ def _get_required_attributes(self, location):
             attributes = self._alias_helper.get_wlst_get_required_attribute_names(location)
         except DiscoverException, de:
             name = location.get_model_folders()[-1]
-            _logger.warning('WLSDPLY-06109', name, str(location), de.getLocalizedMessage(), class_name=_class_name,
-                            method_name=_method_name)
+            _logger.warning('WLSDPLY-06109', name, location.get_folder_path(), de.getLocalizedMessage(),
+                            class_name=_class_name, method_name=_method_name)
         return attributes
 
     def _mbean_names_exist(self, location):

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

@@ -434,7 +434,7 @@ WLSDPLY-06105=Processing attribute {0} value {1} retrieved from location {2}
 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-06109=Problem with the model folder {0} for the model definition at location {1} : {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
@@ -448,14 +448,12 @@ 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}. \
-  This security entity will not be added to the model
+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}
 WLSDPLY-06126=Locate model name for MBean interface {0} for {1}
-WLSDPLY-06127=Unable to discover attribute {0} at location {1} under wls version {2} in {3} mode and the attribute \
-  will not be added to the model : {4}
-WLSDPLY-06130=Unexpected exception attempting to discover MBean entries at location {0} will prevent the discovery \
+WLSDPLY-06127=Unable to discover the wlst attribute {0} value at location {1} : {2}
+WLSDPLY-06130=Unexpected exception attempting to discover MBean entries at {0} will prevent the discovery \
   of attributes at this location : {1}
 WLSDPLY-06140=Unable to cd to the expected path {0} constructed from location context {1}; the current folder \
   and its sub-folders cannot be discovered : {2}