Skip to content

Commit 9f71c00

Browse files
robertpatrickrobertpatrick
committed
Fixing DateFormatPattern default values for DataSourceLogFile and WebServerLog
1 parent fec0331 commit 9f71c00

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@
8181
"folders": {},
8282
"attributes": {
8383
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeK${b:B}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer" } ],
84-
"DateFormatPattern": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "GET" } ],
84+
"DateFormatPattern": [
85+
{"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "GET" },
86+
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "GET" }
87+
],
8588
"FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ],
8689
"FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ],
8790
"FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/datasource.log}", "derived_default": "${:true}", "wlst_type": "string" } ],
@@ -1378,7 +1381,7 @@
13781381
"folders": {},
13791382
"attributes": {
13801383
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSize${Kb:KB}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer", "get_method": "LSA" } ],
1381-
"DateFormatPattern": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } ,
1384+
"DateFormatPattern": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } ,
13821385
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
13831386
"ELFFields": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ELFFields", "wlst_path": "WP001", "default_value": "date time cs-method cs-uri sc-status", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
13841387
"FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ],

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@
8484
"folders": {},
8585
"attributes": {
8686
"BufferSizeKb": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "BufferSizeK${b:B}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer" } ],
87-
"DateFormatPattern": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
87+
"DateFormatPattern": [
88+
{"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "GET" },
89+
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "GET" }
90+
],
8891
"FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ],
8992
"FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ],
9093
"FileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/datasource.log}", "derived_default": "${:true}", "wlst_type": "string" } ],
@@ -1388,8 +1391,8 @@
13881391
"folders": {},
13891392
"attributes": {
13901393
"BufferSizeKb": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "BufferSizeK${b:B}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer" } ],
1391-
"DateFormatPattern": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } ,
1392-
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
1394+
"DateFormatPattern": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } ,
1395+
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss,SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
13931396
"ELFFields": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ELFFields", "wlst_path": "WP001", "default_value": "date time cs-method cs-uri sc-status", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
13941397
"FileCount": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" } ],
13951398
"FileMinSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" } ],

0 commit comments

Comments
 (0)