Merge branch 'Issue#164-support-custom-security-providers' of github.com:oracle/weblogic-deploy-tooling into Issue#164-support-custom-security-providers

Author: CarolynRountree

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

@@ -11,6 +11,7 @@
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
+from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.util.alias_helper import AliasHelper
 from wlsdeploy.tool.util.attribute_setter import AttributeSetter
 from wlsdeploy.tool.util.custom_folder_helper import CustomFolderHelper
@@ -134,6 +135,11 @@ def _create_mbean(self, type_name, model_nodes, base_location, log_created=False
 
         token_name = self.alias_helper.get_name_token(location)
         if token_name is not None:
+            if self.alias_helper.requires_unpredictable_single_name_handling(location):
+                existing_subfolder_names = deployer_utils.get_existing_object_list(location, self.alias_helper)
+                if len(existing_subfolder_names) > 0:
+                    mbean_name = existing_subfolder_names[0]
+
             location.add_name_token(token_name, mbean_name)
 
         self._process_flattened_folder(location)

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

@@ -50,6 +50,7 @@
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.tool.create.creator import Creator
 from wlsdeploy.tool.create.security_provider_creator import SecurityProviderCreator
+from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.deploy import model_deployer
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
 from wlsdeploy.tool.util.library_helper import LibraryHelper
@@ -853,7 +854,7 @@ def _configure_security_configuration(self):
         # SecurityConfiguration is special since the subfolder name does not change when you change the domain name.
         # It only changes once the domain is written and re-read...
         location = LocationContext()
-        domain_name_token = self.alias_helper.get_name_token(location)
+        domain_name_token = deployer_utils.get_domain_token(self.alias_helper)
         security_config_location = LocationContext().add_name_token(domain_name_token, self._domain_name)
         self.security_provider_creator.create_security_configuration(security_config_location)
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/tool/deploy/deployer_utils.py

@@ -20,7 +20,6 @@
 
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP
 from wlsdeploy.aliases.model_constants import RESOURCE_GROUP_TEMPLATE
-from wlsdeploy.aliases.model_constants import SECURITY_CONFIGURATION
 
 _class_name = "deployer_utils"
 _logger = platform_logger.PlatformLogger('wlsdeploy.deploy.utils')
@@ -157,9 +156,7 @@ def get_domain_token(alias_helper):
     Returns the domain token required by some root-level WLST elements.
     :return: the domain token
     """
-    # determine the domain token by checking security configuration
-    security_location = LocationContext().append_location(SECURITY_CONFIGURATION)
-    return alias_helper.get_name_token(security_location)
+    return "DOMAIN"
 
 
 def is_in_resource_group_or_template(location):