Skip to content

Commit 08d5174

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'alias-updates-6-4' into 'main'
Alias updates for future release See merge request weblogic-cloud/weblogic-deploy-tooling!1704
2 parents 35f2e1b + 63484c3 commit 08d5174

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"JavaServiceConsoleEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaServiceConsoleEnabled", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean" } ],
4343
"JavaServiceEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaServiceEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ],
4444
"LastModificationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LastModificationTime", "wlst_path": "WP001", "default_value": 0, "wlst_type": "long", "access": "IGNORED"} ],
45+
"ListenPortEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": true, "secure_default": "${__NULL__:false}", "wlst_type": "boolean", "derived_default": "${:true}" } ],
4546
"LogFormatCompatibilityEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogFormatCompatibilityEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ],
4647
"MaxConcurrentLongRunningRequests": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "MaxConcurrentLongRunningRequests", "wlst_path": "WP001", "default_value": 50, "wlst_type": "integer" } ],
4748
"MaxConcurrentNewThreads": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "MaxConcurrentNewThreads", "wlst_path": "WP001", "default_value": 50, "wlst_type": "integer" } ],
@@ -58,6 +59,7 @@
5859
"RemoteConsoleHelperEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "RemoteConsoleHelperEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
5960
"ResourceManagement": [ {"version": "[14.1.1,)", "wlst_mode": "online", "wlst_name": "ResourceManagement", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list since ResourceManagement folder is no longer created"} ],
6061
"RootDirectory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RootDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "uses_path_tokens": "true"} ],
62+
"SSLEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "SSLEnabled", "wlst_path": "WP001", "default_value": false, "secure_default": "${__NULL__:false}", "wlst_type": "boolean", "derived_default": "${:true}" } ],
6163
"ServerMigrationHistorySize": [ {"version": "[12.1.2,12.2.1.1)", "wlst_mode": "both", "wlst_name": "ServerMigrationHistorySize", "wlst_path": "WP001", "default_value": "-1", "wlst_type": "integer", "restart_required": "true" },
6264
{"version": "[12.2.1.1,12.2.1.3)","wlst_mode": "both", "wlst_name": "ServerMigrationHistorySize", "wlst_path": "WP001", "default_value": "-1", "wlst_type": "integer" } ,
6365
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ServerMigrationHistorySize", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,10 @@
705705
"DebugIIOPTransport": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugIIOPTransport", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
706706
"DebugIIOPTunneling": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugIIOPTunneling", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
707707
"DebugIiopDetail": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugI${iop:IOP}Detail", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"} ],
708-
"DebugIiopRepalcer": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugI${iop:IOP}Repalcer", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"} ],
708+
"DebugIiopRepalcer": [
709+
{"version": "[12.2.1,)", "wlst_mode": "offline", "wlst_name": "DebugI${iop:IOP}Repalcer", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"},
710+
{"version": "[12.2.1,14.1.2)", "wlst_mode": "online", "wlst_name": "DebugI${iop:IOP}Repalcer", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"}
711+
],
709712
"DebugInterceptors": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugInterceptors", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
710713
"DebugJ2EEManagement": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJ2EEManagement", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
711714
"DebugJAXPDebugLevel": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJAXPDebugLevel", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer"} ],
@@ -1256,7 +1259,10 @@
12561259
"ClientCertPrivateKeyPassPhraseEncrypted": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "ClientCertPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "secret_suffix": "clientcertprivatekey" } ],
12571260
"ClientCertificateEnforced": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
12581261
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1259-
"Enabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" } ],
1262+
"Enabled": [
1263+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"},
1264+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "derived_default": "${:true}"}
1265+
],
12601266
"ExcludedCiphersuite": [
12611267
{"version": "[14,)", "wlst_mode": "offline", "wlst_name": "ExcludedCiphersuite", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"},
12621268
{"version": "[14,)", "wlst_mode": "online", "wlst_name": "ExcludedCiphersuites", "wlst_path": "WP001", "default_value": ["TLS_RSA_*", "*_CBC_*"], "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"}
@@ -1748,7 +1754,10 @@
17481754
"ListenAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": "${All Local Addresses:__NULL__}", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
17491755
"ListenDelaySecs": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenDelaySecs", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
17501756
"ListenPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": 7001, "wlst_type": "integer" } ],
1751-
"ListenPortEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "true", "secure_default": "${__NULL__:false}", "wlst_type": "boolean" } ],
1757+
"ListenPortEnabled": [
1758+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "true", "secure_default": "${__NULL__:false}", "wlst_type": "boolean"},
1759+
{"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}"}
1760+
],
17521761
"ListenThreadStartDelaySecs": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenThreadStartDelaySecs", "wlst_path": "WP001", "default_value": 60, "wlst_type": "integer" } ],
17531762
"ListenersBindEarly": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenersBindEarly", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
17541763
"LoadStubUsingContextClassLoader": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "LoadStubUsingContextClassLoader", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "LSA"} ],

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,10 @@
716716
"DebugIIOPTransport": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugIIOPTransport", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
717717
"DebugIIOPTunneling": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugIIOPTunneling", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
718718
"DebugIiopDetail": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugI${iop:IOP}Detail", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"} ],
719-
"DebugIiopRepalcer": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugI${iop:IOP}Repalcer", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"} ],
719+
"DebugIiopRepalcer": [
720+
{"version": "[12.2.1,)", "wlst_mode": "offline", "wlst_name": "DebugI${iop:IOP}Repalcer", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"},
721+
{"version": "[12.2.1,14.1.2)", "wlst_mode": "online", "wlst_name": "DebugI${iop:IOP}Repalcer", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "${LSA:GET}"}
722+
],
720723
"DebugInterceptors": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DebugInterceptors", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
721724
"DebugJ2EEManagement": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJ2EEManagement", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
722725
"DebugJAXPDebugLevel": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJAXPDebugLevel", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer"} ],
@@ -1267,7 +1270,10 @@
12671270
"ClientCertPrivateKeyPassPhraseEncrypted": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "secret_suffix": "clientcertprivatekey"} ],
12681271
"ClientCertificateEnforced": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
12691272
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1270-
"Enabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1273+
"Enabled": [
1274+
{"version": "[12.1.2,14.1.2)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"},
1275+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "derived_default": "${:true}"}
1276+
],
12711277
"ExcludedCiphersuite": [
12721278
{"version": "[14,)", "wlst_mode": "offline", "wlst_name": "ExcludedCiphersuite", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"},
12731279
{"version": "[14,)", "wlst_mode": "online", "wlst_name": "ExcludedCiphersuites", "wlst_path": "WP001", "default_value": ["TLS_RSA_*", "*_CBC_*"], "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string" , "get_method": "${LSA:GET}", "derived_default": "${:true}", "preferred_model_type": "list"}
@@ -1772,7 +1778,10 @@
17721778
{"version": "[12.1.2,12.2.1.1.0)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": 7001, "wlst_type": "integer" },
17731779
{"version": "[12.2.1.1.0,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${7100:7001}", "wlst_type": "integer" }
17741780
],
1775-
"ListenPortEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenPortEnabled", "wlst_path": "WP001", "default_value": "true", "secure_default": "${__NULL__:false}", "wlst_type": "boolean" } ],
1781+
"ListenPortEnabled": [
1782+
{"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"},
1783+
{"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}"}
1784+
],
17761785
"ListenThreadStartDelaySecs": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenThreadStartDelaySecs", "wlst_path": "WP001", "default_value": 60, "wlst_type": "integer" } ],
17771786
"ListenersBindEarly": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenersBindEarly", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
17781787
"LoadStubUsingContextClassLoader": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LoadStubUsingContextClassLoader", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],

0 commit comments

Comments
 (0)