do not collect domainBin user scripts for -target discoveries

Author: CarolynRountree

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

@@ -113,27 +113,30 @@ def get_user_env_scripts(self):
         """
         _method_name = 'get_user_env_scripts'
         _logger.entering(class_name=_class_name, method_name=_method_name)
-        archive_file = self._model_context.get_archive_file()
-        domain_bin = self._convert_path('bin')
         entries = []
-        if os.path.isdir(domain_bin):
-            search_directory = FileUtils.fixupFileSeparatorsForJython(os.path.join(domain_bin, "setUserOverrides*.*"))
-            _logger.finer('WLSDPLY-06425', search_directory, class_name=_class_name, method_name=_method_name)
-            file_list = glob.glob(search_directory)
-            if file_list:
-                _logger.finer('WLSDPLY-06423', domain_bin, class_name=_class_name, method_name=_method_name)
-                for entry in file_list:
-                    try:
-                        updated_name = archive_file.addDomainBinScript(File(entry))
-                    except WLSDeployArchiveIOException, wioe:
-                        de = exception_helper.create_discover_exception('WLSDPLY-06426', entry,
-                                                                        wioe.getLocalizedMessage())
-                        _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
-                        raise de
-
-                    entries.append(updated_name)
-                    _logger.finer('WLSDPLY-06424', entry, updated_name, class_name=_class_name,
-                                  method_name=_method_name)
+        if self._model_context.is_targetted_config():
+            _logger.fine('WLSDPLY-06427', class_name=_class_name, method_name=_method_name)
+        else:
+            archive_file = self._model_context.get_archive_file()
+            domain_bin = self._convert_path('bin')
+            if os.path.isdir(domain_bin):
+                search_directory = FileUtils.fixupFileSeparatorsForJython(os.path.join(domain_bin, "setUserOverrides*.*"))
+                _logger.finer('WLSDPLY-06425', search_directory, class_name=_class_name, method_name=_method_name)
+                file_list = glob.glob(search_directory)
+                if file_list:
+                    _logger.finer('WLSDPLY-06423', domain_bin, class_name=_class_name, method_name=_method_name)
+                    for entry in file_list:
+                        try:
+                            updated_name = archive_file.addDomainBinScript(File(entry))
+                        except WLSDeployArchiveIOException, wioe:
+                            de = exception_helper.create_discover_exception('WLSDPLY-06426', entry,
+                                                                            wioe.getLocalizedMessage())
+                            _logger.throwing(class_name=_class_name, method_name=_method_name, error=de)
+                            raise de
+
+                        entries.append(updated_name)
+                        _logger.finer('WLSDPLY-06424', entry, updated_name, class_name=_class_name,
+                                      method_name=_method_name)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=entries)
         return model_constants.DOMAIN_SCRIPTS, entries

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

@@ -705,6 +705,7 @@ WLSDPLY-06423=Add the user override env script files from the domain bin locatio
 WLSDPLY-06424=Add user override script {0} to the archive file and entry {1] to the model domain info section
 WLSDPLY-06425=Look for user env override scripts using search pattern {0}
 WLSDPLY-06426=Unexpected exception occurred writing the domain bin user overrides file {0} to the archive : {1}
+WLSDPLY-06427=Will not collect domainBin user override scripts for -target command line options.
 
 # global_resources_discoverer.py
 WLSDPLY-06440=Discover Global Resources from the domain