Skip to content

Commit bb060e3

Browse files
CarolynRountreeCarolynRountree
authored
Fix overlapping definitions in ServerTemplate (#531)
1 parent 13212a6 commit bb060e3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "value": {"default": "${7:100}"}, "wlst_type": "integer"} ],
252252
"FileMinSize": [ {"version": "[12.1.2,12.2.1.3)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "value": {"default": 500 }, "wlst_type": "integer"} ,
253253
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "value": {"default": "${500:5000}" }, "wlst_type": "integer"} ],
254-
"FileName": [ {"version": "[12.1.2,12.1.3]", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
254+
"FileName": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
255255
{"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "${None:logs/%SERVERTEMPLATE%.log}" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
256256
"FileTimeSpan": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "value": {"default": 24 }, "wlst_type": "integer"} ],
257257
"FileTimeSpanFactor": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "value": {"default": 3600000 }, "wlst_type": "long" } ],
@@ -1127,7 +1127,7 @@
11271127
"OraclePiggybackCommitEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "OraclePiggybackCommitEnabled", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "restart_required": "true" } ],
11281128
"PartialClusterStabilityDelaySeconds": [ {"version": "[12.2.1,12.2.1.1)","wlst_mode": "both","wlst_name": "PartialClusterStabilityDelaySeconds","wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "long" } ,
11291129
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PartialClusterStabilityDelaySeconds","wlst_path": "WP001", "value": {"default": 240 },"wlst_type": "long" } ],
1130-
"PrefixName": [ {"version": "[12.1.2,12.1.3]","wlst_mode": "both", "wlst_name": "PrefixName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" },
1130+
"PrefixName": [ {"version": "[12.1.2,12.1.3)","wlst_mode": "both", "wlst_name": "PrefixName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" },
11311131
{"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "PrefixName", "wlst_path": "WP001", "value": {"default": "${None:TLOG_%SERVERTEMPLATE%_}" }, "wlst_type": "string" } ],
11321132
"ReconnectRetryIntervalMillis": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ReconnectRetryIntervalMillis", "wlst_path": "WP001", "value": {"default": 200 }, "wlst_type": "integer", "restart_required": "true" } ],
11331133
"ReconnectRetryPeriodMillis": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ReconnectRetryPeriodMillis", "wlst_path": "WP001", "value": {"default": 1000 }, "wlst_type": "integer", "restart_required": "true" } ],
@@ -1551,7 +1551,7 @@
15511551
"SocketReaderTimeoutMaxMillis": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "SocketReaderTimeoutMaxMillis", "wlst_path": "WP001", "value": {"default": 100 }, "wlst_type": "integer" } ],
15521552
"SocketReaderTimeoutMinMillis": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "SocketReaderTimeoutMinMillis", "wlst_path": "WP001", "value": {"default": 10 }, "wlst_type": "integer" } ],
15531553
"SocketReaders": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SocketReaders", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
1554-
"StagingDirectoryName": [ {"version": "[12.1.2,12.1.3]", "wlst_mode": "both", "wlst_name": "StagingDirectoryName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
1554+
"StagingDirectoryName": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "both", "wlst_name": "StagingDirectoryName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
15551555
{"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "StagingDirectoryName", "wlst_path": "WP001", "value": {"default": "${None:@@DOMAIN@@/servers/%SERVERTEMPLATE%/stage}" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
15561556
"StagingMode": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "StagingMode", "wlst_path": "WP001", "value": {"default": "${None:stage}" }, "wlst_type": "string" } ],
15571557
"StartupMode": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "StartupMode", "wlst_path": "WP001", "value": {"default": "RUNNING" }, "wlst_type": "string" } ],
@@ -1577,7 +1577,7 @@
15771577
"TunnelingClientPingSecs": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "TunnelingClientPingSecs", "wlst_path": "WP001", "value": {"default": 45 }, "wlst_type": "integer" } ],
15781578
"TunnelingClientTimeoutSecs": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "TunnelingClientTimeoutSecs", "wlst_path": "WP001", "value": {"default": 40 }, "wlst_type": "integer" } ],
15791579
"TunnelingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "TunnelingEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
1580-
"UploadDirectoryName": [ {"version": "[12.1.2,12.1.3]", "wlst_mode": "both", "wlst_name": "UploadDirectoryName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ,
1580+
"UploadDirectoryName": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "both", "wlst_name": "UploadDirectoryName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ,
15811581
{"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "UploadDirectoryName", "wlst_path": "WP001", "value": {"default": "${None:./servers/%SERVERTEMPLATE%/upload}" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
15821582
"Use81StyleExecuteQueues": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Use81StyleExecuteQueues", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": "true" } ],
15831583
"UseConcurrentQueueForRequestManager": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "UseConcurrentQueueForRequestManager", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": "true" } ],

0 commit comments

Comments
 (0)