Skip to content

Commit e938452

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'alias-updates-20250522' into 'main'
Alias updates for future WLS versions See merge request weblogic-cloud/weblogic-deploy-tooling!1805
2 parents a600e50 + 523c86e commit e938452

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,8 @@
408408
"CustomPrivateKeyAlias": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CustomPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string" } ],
409409
"CustomPrivateKeyPassPhraseEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CustomPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "password", "get_method": "GET", "secret_suffix": "customprivatekey"} ],
410410
"CustomProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CustomProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}", "preferred_model_type": "dict" } ],
411-
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
412-
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
411+
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
412+
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
413413
"Enabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
414414
"ExternalDNSName": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "ExternalDNSName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
415415
"ExcludedCiphersuite": [
@@ -702,7 +702,7 @@
702702
"DebugEjbDeployment": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugEjbDeployment", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
703703
"DebugEjbInvoke": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugEjbInvoke", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
704704
"DebugEjbLocking": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugEjbLocking", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
705-
"DebugEjbMdbAqMessageRecovery": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DebugEjbMdbAqMessageRecovery", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
705+
"DebugEjbMdbAqMessageRecovery": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DebugEjbMdbAqMessageRecovery", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
706706
"DebugEjbMdbConnection": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugEjbMdbConnection", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
707707
"DebugEjbMdbListener": [
708708
{"version": "[12.2.1.4.0.240922,14.1.1)", "wlst_mode": "both", "wlst_name": "DebugEjbMdbListener", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"},
@@ -1351,8 +1351,8 @@
13511351
"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" } ],
13521352
"ClientCertificateEnforced": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
13531353
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1354-
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
1355-
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
1354+
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
1355+
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
13561356
"Enabled": [
13571357
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"},
13581358
{"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}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,8 @@
418418
"CustomPrivateKeyAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CustomPrivateKeyAlias", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string" } ],
419419
"CustomPrivateKeyPassPhraseEncrypted": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CustomPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "password", "get_method": "GET", "secret_suffix": "customprivatekey"} ],
420420
"CustomProperties": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CustomProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" } ],
421-
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
422-
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
421+
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
422+
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
423423
"Enabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Enabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
424424
"ExcludedCiphersuite": [
425425
{"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"},
@@ -713,7 +713,7 @@
713713
"DebugEjbDeployment": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugEjbDeployment", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
714714
"DebugEjbInvoke": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugEjbInvoke", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
715715
"DebugEjbLocking": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugEjbLocking", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
716-
"DebugEjbMdbAqMessageRecovery": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DebugEjbMdbAqMessageRecovery", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
716+
"DebugEjbMdbAqMessageRecovery": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DebugEjbMdbAqMessageRecovery", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
717717
"DebugEjbMdbConnection": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugEjbMdbConnection", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
718718
"DebugEjbMdbListener": [
719719
{"version": "[12.2.1.4.0.240922,14.1.1)", "wlst_mode": "both", "wlst_name": "DebugEjbMdbListener", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"},
@@ -1362,8 +1362,8 @@
13621362
"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"} ],
13631363
"ClientCertificateEnforced": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
13641364
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1365-
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
1366-
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
1365+
"DomainCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-server-identity", "wlst_type": "string" } ],
1366+
"DomainClientCertificateAlias": [ {"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DomainClientCertificateAlias", "wlst_path": "WP001", "default_value": "domainpki-client-identity", "wlst_type": "string" } ],
13671367
"Enabled": [
13681368
{"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"},
13691369
{"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}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
{"version": "[12.2.1.4.0.250317,14.1.1)", "wlst_mode": "both", "wlst_name": "RestrictUserManagementAccessPattern${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" },
9797
{"version": "[14.1.1.0.0.250320,14.1.2)", "wlst_mode": "both", "wlst_name": "RestrictUserManagementAccessPattern${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" },
9898
{"version": "[14.1.2.0.0.250324,15.1.1)", "wlst_mode": "online", "wlst_name": "RestrictUserManagementAccessPattern${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" },
99-
{"version": "[15.1.1,)", "wlst_mode": "online", "wlst_name": "RestrictUserManagementAccessPattern${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" }
99+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "RestrictUserManagementAccessPattern${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}" }
100100
],
101101
"RetainOriginalURL": [ {"version": "[10,12.1.3)", "wlst_mode": "both", "wlst_name": "RetainOriginalU${rl:RL}", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ,
102102
{"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "RetainOriginalURL", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],

0 commit comments

Comments
 (0)