Merge pull request #270 from oracle/jira-wdt-3-version-mismatch-error

Jira WDT-3 - Improve error messaging when domain read fails due to…

Author: CarolynRountree

core/src/main/python/discover.py

@@ -289,8 +289,9 @@ def __connect_to_domain(model_context):
         try:
             wlst_helper.read_domain(model_context.get_domain_home())
         except PyWLSTException, wlst_ex:
+            wls_version = WebLogicHelper(__logger).get_actual_weblogic_version()
             ex = exception_helper.create_discover_exception('WLSDPLY-06002', model_context.get_domain_home(),
-                                                            wlst_ex.getLocalizedMessage(), error=wlst_ex)
+                                                            wls_version, wlst_ex.getLocalizedMessage(), error=wlst_ex)
             __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
             raise ex
 

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

@@ -407,7 +407,7 @@ WLSDPLY-05404={0} encountered an error while printing model usage information: {
 WLSDPLY-06000=Internal error while discovering domain {0} from directory {1} for WebLogic version {2} in \
   WLST mode {3}: {4}
 WLSDPLY-06001=Connecting to the administration server at {0} as user {1} failed: {2}
-WLSDPLY-06002=Reading the domain at {0} failed: {1}
+WLSDPLY-06002=Reading the domain at {0} using Oracle home version {1} failed: {2}
 WLSDPLY-06004=Unexpected exception return from opening archive file at location {0}. Check the contents \
   of the log for more information
 WLSDPLY-06005=Unable to clear the existing archive file. Correct the problem before re-attempting discover : {0}