Skip to content

Commit 9f05639

Browse files
rakillenrakillen
authored
Some path tokens not replaced (#620)
* Issue #618 - Use path tokens for WebServerLog FileName * Issue #618 - Use path tokens for keystore file attributes; also ServerTemplate attributes
1 parent e67a10c commit 9f05639

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
"CompleteMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": "${0:60}" }, "wlst_type": "integer" } ],
301301
"CompleteT3MessageTimeout": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "CompleteT3MessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
302302
"ConnectTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectTimeout", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
303-
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
303+
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
304304
"CustomIdentityKeyStorePassPhraseEncrypted": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
305305
"CustomIdentityKeyStoreType": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
306306
"CustomPrivateKeyAlias": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CustomPrivateKeyAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -1149,7 +1149,7 @@
11491149
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "value": {"default":"${7:100}" }, "wlst_type": "integer" } ],
11501150
"FileMinSize": [ {"version": "[10,12.2.1.3)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "value": {"default": 500 }, "wlst_type": "integer" } ,
11511151
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "value": {"default": "${500:5000}" }, "wlst_type": "integer" } ],
1152-
"FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "${None:logs/access.log}" }, "wlst_type": "string" } ],
1152+
"FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "${None:logs/access.log}" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
11531153
"FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "value": {"default": 24 }, "wlst_type": "integer" } ],
11541154
"FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "value": {"default": 3600000 }, "wlst_type": "long" } ],
11551155
"LogFileFormat": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LogFileFormat", "wlst_path": "WP001", "value": {"default": "${None:common}" }, "wlst_type": "string" } ],

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
"CompleteMessageTimeout": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": "${0:60}" }, "wlst_type": "integer" } ],
310310
"CompleteT3MessageTimeout": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CompleteT3MessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
311311
"ConnectTimeout": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ConnectTimeout", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
312-
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
312+
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
313313
"CustomIdentityKeyStorePassPhraseEncrypted": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
314314
"CustomIdentityKeyStoreType": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
315315
"CustomPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CustomPrivateKeyAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -1159,7 +1159,7 @@
11591159
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "value": {"default": "${7:100}" }, "wlst_type": "integer" } ],
11601160
"FileMinSize": [ {"version": "[12.1.2,12.2.1.3)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "value": {"default": 500 }, "wlst_type": "integer" } ,
11611161
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "value": {"default": "${500:5000}" }, "wlst_type": "integer" } ],
1162-
"FileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "${None:logs/access.log}" }, "wlst_type": "string" } ],
1162+
"FileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "${None:logs/access.log}" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
11631163
"FileTimeSpan": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "value": {"default": 24 }, "wlst_type": "integer" } ],
11641164
"FileTimeSpanFactor": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "value": {"default": 3600000 }, "wlst_type": "long", "get_method": "LSA"} ],
11651165
"LogFileFormat": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LogFileFormat", "wlst_path": "WP001", "value": {"default": "${None:common}" }, "wlst_type": "string" } ],
@@ -1404,18 +1404,18 @@
14041404
"ConnectTimeout": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ConnectTimeout", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
14051405
"ConsensusProcessIdentifier": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ConsensusProcessIdentifier", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer", "get_method": "${LSA:GET}", "restart_required": "true" } ],
14061406
"ConsoleInputEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ConsoleInputEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "get_method": "${LSA:GET}" } ],
1407-
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ,
1408-
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ,
1409-
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1407+
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ,
1408+
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true", "restart_required": "true" } ,
1409+
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
14101410
"CustomIdentityKeyStorePassPhraseEncrypted": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ,
14111411
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "CustomIdentityKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET", "restart_required": "true"} ,
14121412
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
14131413
"CustomIdentityKeyStoreType": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ,
14141414
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ,
14151415
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomIdentityKeyStoreType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1416-
"CustomTrustKeyStoreFileName": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "CustomTrustKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ,
1417-
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "CustomTrustKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ,
1418-
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomTrustKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1416+
"CustomTrustKeyStoreFileName": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "CustomTrustKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ,
1417+
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "CustomTrustKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true", "restart_required": "true" } ,
1418+
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomTrustKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
14191419
"CustomTrustKeyStorePassPhraseEncrypted": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "CustomTrustKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ,
14201420
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "CustomTrustKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET", "restart_required": "true" } ,
14211421
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomTrustKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],

0 commit comments

Comments
 (0)