Skip to content

Commit b60ef12

Browse files
remove NO_NAME_0 from Log MBean types (#671)
* remove NO_NAME_0 from Log MBean types * WDT requested fix * Fix for request * make server template log named for server
1 parent 0b915f6 commit b60ef12

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
"wlst_type": "PartitionLog",
271271
"version": "[12.2.1,)",
272272
"child_folders_type": "single_unpredictable",
273-
"default_name_value": "${NO_NAME_0:%PARTITION%}",
273+
"default_name_value": "%PARTITION%",
274274
"folders": {},
275275
"attributes": {
276276
"EnabledServerDebugAttribute": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "EnabledServerDebugAttribute${:s}", "wlst_path": "WP001", "value": {"default": "[]"}, "wlst_type": "${list:jarray}", "get_method": "${LSA:GET}" } ],

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"Log": {
237237
"wlst_type": "Log",
238238
"child_folders_type": "single_unpredictable",
239-
"default_name_value": "%SERVERTEMPLATE%",
239+
"default_name_value": "${serverName}",
240240
"version": "[12.1.2,)",
241241
"folders": {},
242242
"attributes": {
@@ -1148,6 +1148,8 @@
11481148
"folders": {
11491149
"WebServerLog": {
11501150
"wlst_type": "WebServerLog",
1151+
"child_folders_type": "single_unpredictable",
1152+
"default_name_value": "%SERVERTEMPLATE_WEBSERVER%",
11511153
"version": "[12.1.2,)",
11521154
"folders": {},
11531155
"attributes": {
@@ -1176,7 +1178,7 @@
11761178
},
11771179
"wlst_attributes_path": "WP001",
11781180
"wlst_paths": {
1179-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/WebServerLog/${NO_NAME_0:%SERVERTEMPLATE%}"
1181+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/WebServerLog/%WEBSERVERLOG%"
11801182
}
11811183
}
11821184
},

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"folders": {
88
"WebServerLog": {
99
"wlst_type": "WebServerLog",
10+
"child_folders_type": "single_unpredictable",
11+
"default_name_value": "%VIRTUALHOST%",
1012
"folders": {},
1113
"attributes": {
1214
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSize${Kb:KB}", "wlst_path": "WP001", "value": {"default": 8 }, "wlst_type": "integer" } ],
@@ -33,7 +35,7 @@
3335
},
3436
"wlst_attributes_path": "WP001",
3537
"wlst_paths": {
36-
"WP001": "/VirtualHost${:s}/%VIRTUALHOST%/WebServerLog/${NO_NAME_0:%VIRTUALHOST%}"
38+
"WP001": "/VirtualHost${:s}/%VIRTUALHOST%/WebServerLog/%WEBSERVERLOG%"
3739
}
3840
}
3941
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"WebServerLog": {
1616
"wlst_type": "WebServerLog",
1717
"child_folders_type": "single_unpredictable",
18-
"default_name_value": "${NO_NAME_0:%VIRTUALTARGET%}",
18+
"default_name_value": "%VIRTUALTARGET%",
1919
"version": "[12.2.1,)",
2020
"folders": {},
2121
"attributes": {

0 commit comments

Comments
 (0)