Skip to content

Commit b874049

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'alias-updates-08282024' into 'main'
Alias updates for future WLS release See merge request weblogic-cloud/weblogic-deploy-tooling!1735
2 parents 16db766 + d5e6dc3 commit b874049

File tree

5 files changed

+31
-13
lines changed

5 files changed

+31
-13
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
"BatchJobsExecutorServiceName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "BatchJobsExecutorServiceName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1919
"ClusterConstraintsEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterConstraintsEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
2020
"ConfigBackupEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigBackupEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
21-
"ConfigurationAuditType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigurationAuditType", "wlst_path": "WP001", "default_value": "${__NULL__:none}", "wlst_type": "string" } ],
21+
"ConfigurationAuditType": [
22+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConfigurationAuditType", "wlst_path": "WP001", "default_value": "${__NULL__:none}", "wlst_type": "string" },
23+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ConfigurationAuditType", "wlst_path": "WP001", "default_value": "none", "wlst_type": "string" }
24+
],
2225
"ConfigurationVersion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigurationVersion", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
2326
"ConsoleContextPath": [
2427
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "console", "wlst_type": "string", "uses_path_tokens": "true" },

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,8 @@
622622
"RequestCacheSize": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "RequestCacheSize", "wlst_path": "WP001", "default_value": "${0:500}", "wlst_type": "integer" } ],
623623
"RequestCacheTtl": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "RequestCacheT${tl:TL}", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer" } ],
624624
"SupportedTypes": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "SupportedTypes", "wlst_path": "WP001", "default_value": ["oidc_token"], "wlst_type": "jarray", "access": "IGNORED", "get_method": "GET", "preferred_model_type": "list"} ],
625-
"UserIDTokenClaim": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "UserIDTokenClaim", "wlst_path": "WP001", "default_value": "sub", "wlst_type": "string" } ],
626-
"UserNameTokenClaim": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "UserNameTokenClaim", "wlst_path": "WP001", "default_value": "upn", "wlst_type": "string" } ],
625+
"UserIdTokenClaim": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "UserI${d:D}TokenClaim", "wlst_path": "WP001", "default_value": "sub", "wlst_type": "string" } ],
626+
"UserNameTokenClaim": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "UserNameTokenClaim", "wlst_path": "WP001", "default_value": "upn", "wlst_type": "string" } ],
627627
"Version": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "Version", "wlst_path": "WP001", "default_value": "1.0", "wlst_type": "string", "access": "IGNORED" } ],
628628
"VirtualUserAllowed": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "VirtualUserAllowed", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ]
629629
},

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,11 @@
16381638
"AddWorkManagerThreadsByCpuCount": [ {"version": "[10,12.2.1.3)", "wlst_mode": "online", "wlst_name": "AddWorkManagerThreadsByCpuCount", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" },
16391639
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "AddWorkManagerThreadsByCpuCount", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ],
16401640
"AdminReconnectIntervalSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdminReconnectIntervalSeconds", "wlst_path": "WP001", "default_value": 10, "wlst_type": "integer" } ],
1641-
"AdministrationPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdministrationPort", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" } ],
1641+
"AdministrationPort": [
1642+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "AdministrationPort", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" },
1643+
{"version": "[14.1.2)", "wlst_mode": "offline", "wlst_name": "AdministrationPort", "wlst_path": "WP001", "default_value": 9002, "derived_default": "${:true}", "wlst_type": "integer" },
1644+
{"version": "[14.1.2)", "wlst_mode": "online", "wlst_name": "AdministrationPort", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" }
1645+
],
16421646
"AdministrationPortEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdministrationPortEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "${LSA:GET}" } ],
16431647
"AdministrationProtocol": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "${__NULL__:t3s}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true" } ],
16441648
"AllowShrinkingPriorityRequestQueue": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowShrinkingPriorityRequestQueue", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "restart_required": "true" } ],
@@ -1758,13 +1762,13 @@
17581762
"ListenDelaySecs": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenDelaySecs", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
17591763
"ListenPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": 7001, "wlst_type": "integer" } ],
17601764
"ListenPortEnabled": [
1761-
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "true", "secure_default": "${__NULL__:false}", "wlst_type": "boolean"},
1762-
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "${false:true}", "secure_default": "${__NULL__:false}", "wlst_type": "boolean", "derived_default": "${:true}"}
1765+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "true", "secure_default": "${__NULL__:false}", "wlst_type": "boolean"},
1766+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "true", "secure_default": "${__NULL__:false}", "wlst_type": "boolean", "derived_default": "${:true}"}
17631767
],
17641768
"ListenThreadStartDelaySecs": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenThreadStartDelaySecs", "wlst_path": "WP001", "default_value": 60, "wlst_type": "integer" } ],
17651769
"ListenersBindEarly": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenersBindEarly", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
17661770
"LoadStubUsingContextClassLoader": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "LoadStubUsingContextClassLoader", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "LSA"} ],
1767-
"LogCriticalRemoteExceptionsEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LogCriticalRemoteExceptionsEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
1771+
"LogCriticalRemoteExceptionsEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LogCriticalRemoteExceptionsEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
17681772
"LogRemoteExceptionsEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LogRemoteExceptionsEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
17691773
"LoginTimeoutMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoginTimeoutMillis", "wlst_path": "WP001", "default_value": 5000, "wlst_type": "integer" } ],
17701774
"LowMemoryGCThreshold": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LowMemoryGCThreshold", "wlst_path": "WP001", "default_value": 5, "wlst_type": "integer" } ],

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,7 +1296,8 @@
12961296
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "KeyEncrypted", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "GET", "restart_required": "true" } ],
12971297
"ListenPort": [
12981298
{"version": "[12.1.2,12.2.1.1.0)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": 7002, "wlst_type": "integer" },
1299-
{"version": "[12.2.1.1.0,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${8100:7002}", "wlst_type": "integer" }
1299+
{"version": "[12.2.1.1.0,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${8100:7002}", "wlst_type": "integer" },
1300+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": 7002, "wlst_type": "integer" }
13001301
],
13011302
"LoginTimeoutMillis": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoginTimeoutMillis", "wlst_path": "WP001", "default_value": 25000, "wlst_type": "integer" } ],
13021303
"MinimumTlsProtocolVersion": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "MinimumT${ls:LS}ProtocolVersion", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "LSA" } ],
@@ -1660,7 +1661,10 @@
16601661
"AddWorkManagerThreadsByCpuCount": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "AddWorkManagerThreadsByCpuCount", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ,
16611662
{"version": "[12.2.1.3,)", "wlst_mode": "offline", "wlst_name": "AddWorkManagerThreadsByCpuCount", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
16621663
"AdminReconnectIntervalSeconds": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AdminReconnectIntervalSeconds", "wlst_path": "WP001", "default_value": 10, "wlst_type": "integer" } ],
1663-
"AdministrationPort": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationPort", "wlst_path": "WP001", "default_value": "${0:9002}", "derived_default": "${:true}", "wlst_type": "integer" } ],
1664+
"AdministrationPort": [
1665+
{ "version": "[12.1.2,14.1.2)", "wlst_mode": "both", "wlst_name": "AdministrationPort", "wlst_path": "WP001", "default_value": "${0:9002}", "derived_default": "${:true}", "wlst_type": "integer" },
1666+
{ "version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationPort", "wlst_path": "WP001", "default_value": 9002, "derived_default": "${:true}", "wlst_type": "integer" }
1667+
],
16641668
"AdministrationPortEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationPortEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "${LSA:GET}" } ],
16651669
"AdministrationProtocol": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "${__NULL__:t3s}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true" } ],
16661670
"AllowShrinkingPriorityRequestQueue": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowShrinkingPriorityRequestQueue", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "restart_required": "true" } ],
@@ -1779,7 +1783,8 @@
17791783
"ListenDelaySecs": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenDelaySecs", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
17801784
"ListenPort": [
17811785
{"version": "[12.1.2,12.2.1.1.0)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": 7001, "wlst_type": "integer" },
1782-
{"version": "[12.2.1.1.0,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${7100:7001}", "wlst_type": "integer" }
1786+
{"version": "[12.2.1.1.0,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${7100:7001}", "wlst_type": "integer" },
1787+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": 7001, "wlst_type": "integer" }
17831788
],
17841789
"ListenPortEnabled": [
17851790
{"version": "[12.1.2,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "true", "secure_default": "${__NULL__:false}", "wlst_type": "boolean"},
@@ -1788,7 +1793,7 @@
17881793
"ListenThreadStartDelaySecs": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenThreadStartDelaySecs", "wlst_path": "WP001", "default_value": 60, "wlst_type": "integer" } ],
17891794
"ListenersBindEarly": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenersBindEarly", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
17901795
"LoadStubUsingContextClassLoader": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LoadStubUsingContextClassLoader", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1791-
"LogCriticalRemoteExceptionsEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LogCriticalRemoteExceptionsEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
1796+
"LogCriticalRemoteExceptionsEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LogCriticalRemoteExceptionsEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
17921797
"LogRemoteExceptionsEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LogRemoteExceptionsEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
17931798
"LoginTimeoutMillis": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoginTimeoutMillis", "wlst_path": "WP001", "default_value": 5000, "wlst_type": "integer" } ],
17941799
"LowMemoryGCThreshold": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LowMemoryGCThreshold", "wlst_path": "WP001", "default_value": 5, "wlst_type": "integer" } ],

0 commit comments

Comments
 (0)