Skip to content

Commit c7acab5

Browse files
committed
Merge remote-tracking branch 'origin/Issue#164-support-custom-security-providers' into Issue#164-support-custom-security-providers
2 parents ae67e8b + a275df4 commit c7acab5

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

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

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,11 @@ def __init__(self, model_dictionary, model_context, aliases, exception_type, log
5454
def create_security_configuration(self, location):
5555
"""
5656
Create the /SecurityConfiguration folder objects, if any.
57-
Update is calling this method. The SecurityConfiguration should already be configured by create domain, but
57+
58+
The SecurityConfiguration should already be configured by create domain, but
5859
allow the method to create the default security configuration with the default realm if for some reason
59-
it does not exit. Then bypass any configuration of the update from the model. The update tool does not
60-
support configuration of the SecurityConfiguration in this release.
60+
it does not exist.
61+
6162
:param location: the location to use
6263
:raises: BundleAwareException of the specified type: if an error occurs
6364
"""
@@ -67,19 +68,15 @@ def create_security_configuration(self, location):
6768
security_configuration_nodes = dictionary_utils.get_dictionary_element(self._topology, SECURITY_CONFIGURATION)
6869

6970
# in WLS 11g, the SecurityConfiguration mbean is not created until the domain is written.
70-
# This is called after the domain is written, but check to make sure the mbean exists.
71-
# if missing, we will create it to initialize realm and default security providers.
72-
# This release does not support configuring 11g security providers beyond making sure the default
73-
# realm exists.
71+
# This is called after the domain is written, but check to make sure the mbean does exist.
72+
# It missing it will be created to initialize the default realm and security providers.
7473
config_location = LocationContext(location).append_location(SECURITY_CONFIGURATION)
7574
existing_names = deployer_utils.get_existing_object_list(config_location, self.alias_helper)
7675
if len(existing_names) == 0:
7776
mbean_type, mbean_name = self.alias_helper.get_wlst_mbean_type_and_name(config_location)
7877
self.wlst_helper.create(mbean_name, mbean_type)
7978

80-
# This will leave 11g asis with the default security realm for the current release. No configuration
81-
# will be done to the 11g default security realm.
82-
if len(security_configuration_nodes) > 0: # and self._configure_security_configuration():
79+
if len(security_configuration_nodes) > 0:
8380
self._create_mbean(SECURITY_CONFIGURATION, security_configuration_nodes, location, log_created=True)
8481

8582
self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
@@ -132,7 +129,8 @@ def __get_default_realm_location(self):
132129

133130
def _configure_security_configuration(self):
134131
"""
135-
For this release, the update tool will not configure the security realm.
132+
Keep this method in case we need to configure non-support.
133+
136134
:return: True if can configure the SecurityConfiguration mbean
137135
"""
138136
_method_name = '_configure_security_configuration'

0 commit comments

Comments
 (0)