Skip to content

Commit 7009fd9

Browse files
authored
Allow AppDir in model domainInfo section; set regardless of extension templates (#727)
1 parent abcad48 commit 7009fd9

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ def __extend_domain_with_select_template(self, domain_home):
551551
self.wlst_helper.load_templates()
552552

553553
self.__set_core_domain_params()
554+
self.__set_app_dir()
554555
if len(extension_templates) > 0:
555-
self.__set_app_dir()
556556
self.__configure_fmw_infra_database()
557557
self.__configure_opss_secrets()
558558
topology_folder_list = self.aliases.get_model_topology_top_level_folder_names()

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/DomainInfo.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
2-
"copyright": "Copyright (c) 2019, Oracle Corporation and/or its affiliates. All rights reserved.",
2+
"copyright": "Copyright (c) 2019, 2020, Oracle Corporation and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "DomainInfo",
55
"folders": { },
66
"attributes": {
77
"AdminPassword": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdminPassword", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password" } ],
88
"AdminUserName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdminUserName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
9+
"AppDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AppDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
910
"OPSSSecrets": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OPSSSecrets", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password" } ],
1011
"ServerGroupTargetingLimits": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerGroupTargetingLimits", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "dict" } ],
1112
"DynamicClusterServerGroupTargetingLimits": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "dynamicClusterServerGroupTargetingLimits", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "dict" } ],

0 commit comments

Comments
 (0)