Cleaned up messages

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/create/creator.py

@@ -4,9 +4,9 @@
 """
 
 from oracle.weblogic.deploy.util import WLSDeployArchive
+from oracle.weblogic.deploy.exception import BundleAwareException
 
 from wlsdeploy.aliases.location_context import LocationContext
-from wlsdeploy.aliases.model_constants import SECURITY_CONFIGURATION
 from wlsdeploy.aliases.validation_codes import ValidationCodes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
@@ -189,8 +189,6 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
         existing_folder_names = self._get_existing_folders(list_path)
         known_providers = self.alias_helper.get_model_subfolder_names(location)
         allow_custom = str(self.alias_helper.is_custom_folder_allowed(location))
-        self.logger.finer('create path {0}, list_path {1}, existing folders {2}', create_path, list_path,
-                          str(existing_folder_names))
 
         for model_name in model_nodes:
             model_node = model_nodes[model_name]
@@ -491,9 +489,18 @@ def _delete_existing_providers(self, location):
             create_path = self.alias_helper.get_wlst_create_path(location)
             self.wlst_helper.cd(create_path)
             for existing_folder_name in existing_folder_names:
-                self.wlst_helper.delete(existing_folder_name, wlst_base_provider_type)
-                self.logger.finer('Removed default provider {0} from provider {1} at location {2}',
-                                  existing_folder_name, wlst_base_provider_type, create_path)
+                try:
+                    self.wlst_helper.delete(existing_folder_name, wlst_base_provider_type)
+                    self.logger.finer('Removed default provider {0} from provider {1} at location {2}',
+                                      existing_folder_name, wlst_base_provider_type, create_path)
+                except BundleAwareException, bae:
+                    ex = exception_helper.create_exception(self._exception_type, 'WLSDPLY-12134', existing_folder_name,
+                                                           self.wls_helper.get_weblogic_version(),
+                                                           wlst_base_provider_type, bae.getLocalizedMessage(),
+                                                           error=bae)
+                    self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+                    raise ex
+
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 

core/src/main/python/wlsdeploy/tool/util/wlst_helper.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 from oracle.weblogic.deploy.util import PyWLSTException
@@ -41,19 +41,6 @@ def assign(self, source_type, source_name, target_type, target_name):
             self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
 
-
-    def reorder_provider(self, provider_type, provider_map, wlst_path):
-        """
-        Retrieve the list of security providers at the provided path and
-        :param provider_type: MBean Type of the Security Provider, i.e. AuthenticationProvider
-        :param provider_map: Map of mbean names and corresponding mbean type
-        :param wlst_path: Location of the realm where the Mbeans will be reordered.
-        :return: Map of provider name and corresponding mbean object
-        """
-        _method_name = 'reorder_provider'
-
-
-
     def cd(self, wlst_path):
         """
         Change WLST directories to the specified path
@@ -172,7 +159,7 @@ def delete(self, wlst_name, wlst_type):
         try:
             wlst_helper.delete(wlst_name, wlst_type)
         except PyWLSTException, pwe:
-            ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19103', wlst_type, wlst_name,
+            ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19135', wlst_type, wlst_name,
                                                    pwe.getLocalizedMessage(), error=pwe)
             self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex

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

@@ -959,6 +959,9 @@ WLSDPLY-12130=The set method for attribute {0} has {1} arguments
 WLSDPLY-12131=Unable to invoke method "{0}" with argument {1}: {2}
 WLSDPLY-12132=Unrecognized data type {0}
 WLSDPLY-12133=Unable to convert "{0}" to value of type {1}
+WLSDPLY-12134=Unable to remove "{0}" in target domain release {1}. The remove is required to properly configure \
+  the Realm Provider Type {2}. Consult the WebLogic Deploy Tool documentation for further information. : {3}
+WLSDPLY-12135=Removed Security provider {0} with Provider type {1} at location {2}
 
 # domain_creator.py
 WLSDPLY-12200={0} did not find the required {1} section in the model file {2}