Skip to content

Commit 32e7db4

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'alias-updates-10-08-2024' into 'main'
Alias updates for older and future versions of WLS See merge request weblogic-cloud/weblogic-deploy-tooling!1743
2 parents ae63882 + da04c7e commit 32e7db4

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
}
2727
},
2828
"attributes": {
29-
"CompatibilityName": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
30-
"DeploymentOrder": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
31-
"DeploymentPrincipalName": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
32-
"DescriptorBeanClass": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "DescriptorBeanClass", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
33-
"ModuleType": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
34-
"Notes": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
35-
"PartitionName": [ { "version": "[10,)", "wlst_mode": "online", "wlst_name": "PartitionName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],
36-
"ResourceClass": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "ResourceClass", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
37-
"SourcePath": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": "${:true}" } ],
38-
"Target": [ { "version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
39-
{ "version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "derived_default": true, "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
29+
"CompatibilityName": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
30+
"DeploymentOrder": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
31+
"DeploymentPrincipalName": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
32+
"DescriptorBeanClass": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "DescriptorBeanClass", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
33+
"ModuleType": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
34+
"Notes": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
35+
"PartitionName": [ { "version": "[12.2.1,)", "wlst_mode": "online", "wlst_name": "PartitionName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],
36+
"ResourceClass": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "ResourceClass", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
37+
"SourcePath": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": "${:true}" } ],
38+
"Target": [ { "version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
39+
{ "version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "derived_default": true, "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
4040
},
4141
"wlst_attributes_path": "WP001",
4242
"wlst_paths": {

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,10 @@
420420
"IdleConnectionTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "IdleConnectionTimeout", "wlst_path": "WP001", "default_value": "${0:65}", "derived_default": "${:true}", "wlst_type": "integer" } ],
421421
"IdleIIOPConnectionTimeout": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "IdleIIOPConnectionTimeout", "wlst_path": "WP001", "default_value": -1, "wlst_type": "integer" } ],
422422
"InboundCertificateValidation": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "InboundCertificateValidation", "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "derived_default": "${:true}", "wlst_type": "string" } ],
423-
"ListenAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } ],
423+
"ListenAddress": [
424+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" },
425+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": null, "derived_default": true, "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" }
426+
],
424427
"ListenPort": [
425428
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true" },
426429
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": true, "wlst_type": "integer", "restart_required": "true" }
@@ -448,7 +451,10 @@
448451
],
449452
"ProxyAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ProxyAddress", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
450453
"ProxyPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ProxyPort", "wlst_path": "WP001", "default_value": 80, "wlst_type": "integer" } ],
451-
"PublicAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PublicAddress", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
454+
"PublicAddress": [
455+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "PublicAddress", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" },
456+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "PublicAddress", "wlst_path": "WP001", "default_value": null, "derived_default": true, "wlst_type": "string", "get_method": "${LSA:GET}" }
457+
],
452458
"PublicPort": [
453459
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "PublicPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": "${:true}", "wlst_type": "integer" },
454460
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "PublicPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": true, "wlst_type": "integer" }

0 commit comments

Comments
 (0)