diff --git a/core/src/main/java/oracle/weblogic/deploy/logging/SummaryHandler.java b/core/src/main/java/oracle/weblogic/deploy/logging/SummaryHandler.java index c20a3e2c5..ad59aad8a 100644 --- a/core/src/main/java/oracle/weblogic/deploy/logging/SummaryHandler.java +++ b/core/src/main/java/oracle/weblogic/deploy/logging/SummaryHandler.java @@ -291,4 +291,4 @@ private LogRecord getLogRecord(String msg, Object... params) { return record; } -} \ No newline at end of file +} diff --git a/core/src/main/python/wlsdeploy/aliases/model_constants.py b/core/src/main/python/wlsdeploy/aliases/model_constants.py index 9373897f2..7142902bf 100644 --- a/core/src/main/python/wlsdeploy/aliases/model_constants.py +++ b/core/src/main/python/wlsdeploy/aliases/model_constants.py @@ -299,6 +299,7 @@ UPDATE_MODE = 'UpdateMode' USER = 'User' USER_ATTRIBUTES = 'UserAttribute' +USE_SAMPLE_DATABASE = 'UseSampleDatabase' VIRTUAL_HOST = 'VirtualHost' VIRTUAL_TARGET = 'VirtualTarget' VIRTUAL_USER_AUTHENTICATOR = 'VirtualUserAuthenticator' diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py index fd7e46a8d..0c09190f4 100644 --- a/core/src/main/python/wlsdeploy/tool/create/domain_creator.py +++ b/core/src/main/python/wlsdeploy/tool/create/domain_creator.py @@ -68,6 +68,7 @@ from wlsdeploy.aliases.model_constants import UNIX_MACHINE from wlsdeploy.aliases.model_constants import URL from wlsdeploy.aliases.model_constants import USER +from wlsdeploy.aliases.model_constants import USE_SAMPLE_DATABASE from wlsdeploy.aliases.model_constants import VIRTUAL_TARGET from wlsdeploy.aliases.model_constants import WLS_USER_PASSWORD_CREDENTIAL_MAPPINGS from wlsdeploy.aliases.model_constants import WS_RELIABLE_DELIVERY_POLICY @@ -673,6 +674,10 @@ def __set_core_domain_params(self): server_start_mode = self._domain_info[SERVER_START_MODE] self.wlst_helper.set_option_if_needed(SET_OPTION_SERVER_START_MODE, server_start_mode) + if USE_SAMPLE_DATABASE in self._domain_info: + use_sample_db = self._domain_info[USE_SAMPLE_DATABASE] + self.wlst_helper.set_option_if_needed(USE_SAMPLE_DATABASE, use_sample_db) + self.__set_domain_name() self.__set_admin_password() self.__set_admin_server_name() diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/DomainInfo.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/DomainInfo.json index f9787fedd..d5b168884 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/DomainInfo.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/DomainInfo.json @@ -11,6 +11,7 @@ "ServerGroupTargetingLimits": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerGroupTargetingLimits", "wlst_path": "WP001", "default_value": null, "wlst_type": "dict" } ], "DynamicClusterServerGroupTargetingLimits": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "dynamicClusterServerGroupTargetingLimits", "wlst_path": "WP001", "default_value": null, "wlst_type": "dict" } ], "ServerStartMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerStartMode", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], + "UseSampleDatabase": [ {"version": "[12.2.1,)", "wlst_mode": "offline", "wlst_name": "UseSampleDatabase", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ], "domainBin": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "domainBin", "wlst_path": "WP001", "default_value": null, "wlst_type": "list", "uses_path_tokens": "true" } ], "domainLibraries": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "domainLibraries", "wlst_path": "WP001", "default_value": null, "wlst_type": "list", "uses_path_tokens": "true" } ] },