Skip to content

Commit 8cd6b42

Browse files
driving decision for database configuration off typedef having one or more RCU schemas (#1079)
1 parent 8336a6e commit 8cd6b42

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,8 @@ def __set_core_domain_params(self):
676676

677677
if USE_SAMPLE_DATABASE in self._domain_info:
678678
use_sample_db = self._domain_info[USE_SAMPLE_DATABASE]
679+
if not isinstance(use_sample_db, basestring):
680+
use_sample_db = str(use_sample_db)
679681
self.wlst_helper.set_option_if_needed(USE_SAMPLE_DATABASE, use_sample_db)
680682

681683
self.__set_domain_name()
@@ -1010,8 +1012,8 @@ def __configure_fmw_infra_database(self):
10101012
_method_name = '__configure_fmw_infra_database'
10111013
self.logger.entering(class_name=self.__class_name, method_name=_method_name)
10121014

1013-
# only continue with RCU configuration for a JRF domain.
1014-
if not self._domain_typedef.is_jrf_domain_type():
1015+
# only continue with RCU configuration for domain type that requires RCU.
1016+
if not self._domain_typedef.required_rcu():
10151017
self.logger.finer('WLSDPLY-12249', class_name=self.__class_name, method_name=_method_name)
10161018
return
10171019

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ WLSDPLY-12246=Adding custom extension template file {0} to domain
13061306
WLSDPLY-12247=WebLogic does not support targeting resources to dynamic servers. JRF product related resources \
13071307
will be targeted to the dynamic cluster using the applyJRF function.
13081308
WLSDPLY-12248=The server group(s) {0} will not be targeted to the Admin server or a configured manage server
1309-
WLSDPLY-12249=Domain is not JRF, skipping database configuration
1309+
WLSDPLY-12249=Domain typedef has no RCU schema dependencies, skipping database configuration
13101310
WLSDPLY-12250=Domain bin ({0}) specified in the model but the archive file name was not provided
13111311
WLSDPLY-12251=Installing domain script {0} from archive to bin directory of {1}
13121312
WLSDPLY-12252=Copying domain script {0} to bin directory of {1}

0 commit comments

Comments
 (0)