Skip to content

Commit 5d4ea19

Browse files
CarolynRountreeCarolynRountree
committed
Merge branch 'main' of github.com:oracle/weblogic-deploy-tooling
2 parents 6eecb64 + d4cec90 commit 5d4ea19

File tree

12 files changed

+154
-113
lines changed

12 files changed

+154
-113
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"MinThreads": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "MinThreads", "wlst_path": "WP001", "default_value": 101, "wlst_type": "integer" } ],
1212
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1313
"ProtectedCookieEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ProtectedCookieEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],
14-
"SsoLogoutUrl": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "${Sso:SSO}Logout${Url:URL}", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
14+
"SsoLogoutUrl": [ {"version": "[12.1.1,)", "wlst_mode": "both", "wlst_name": "${Sso:SSO}Logout${Url:URL}", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1515
"SessionTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SessionTimeout", "wlst_path": "WP001", "default_value": 3600, "wlst_type": "integer" } ]
1616
},
1717
"wlst_attributes_path": "WP001",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@
188188
"DataSourceForSessionPersistence": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForSessionPersistence", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}", "restart_required": "true" } ],
189189
"DatabaseLeasingBasisConnectionRetryCount": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "DatabaseLeasingBasisConnectionRetryCount", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "get_method": "GET", "restart_required": "true" } ],
190190
"DatabaseLeasingBasisConnectionRetryDelay": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "DatabaseLeasingBasisConnectionRetryDelay", "wlst_path": "WP001", "default_value": 1000, "wlst_type": "long", "restart_required": "true"} ],
191-
"DeathDetectorHeartbeatPeriod": [ {"version": "[10,12.1.1)", "wlst_mode": "online", "wlst_name": "DeathDetectorHeartbeatPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "get_method": "${LSA:GET}", "restart_required": true },
192-
{"version": "[12.1.1,)", "wlst_mode": "both", "wlst_name": "DeathDetectorHeartbeatPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "get_method": "${LSA:GET}", "restart_required": true } ],
191+
"DeathDetectorHeartbeatPeriod": [ {"version": "[10,12.1.2)", "wlst_mode": "online", "wlst_name": "DeathDetectorHeartbeatPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "get_method": "${LSA:GET}", "restart_required": true },
192+
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DeathDetectorHeartbeatPeriod", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "get_method": "${LSA:GET}", "restart_required": true } ],
193193
"DefaultLoadAlgorithm": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultLoadAlgorithm", "wlst_path": "WP001", "default_value": "${__NULL__:round-robin}", "wlst_type": "string" } ],
194194
"FencingGracePeriodMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FencingGracePeriodMillis", "wlst_path": "WP001", "default_value": 30000, "wlst_type": "integer", "restart_required": "true" } ],
195195
"FrontendHTTPPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FrontendHTTPPort", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "restart_required": "true" } ],
@@ -216,8 +216,8 @@
216216
{"version": "[14.1.1.0.0.221010,)", "wlst_mode": "both", "wlst_name": "MaxSecondarySelectionAttempts", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" }
217217
],
218218
"MaxServerCountForHttpPing": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxServerCountForHttpPing", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "get_method": "${LSA:GET}" } ],
219-
"MemberDeathDetectorEnabled": [ {"version": "[10,12.1.1)", "wlst_mode": "online", "wlst_name": "MemberDeathDetectorEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" },
220-
{"version": "[12.1.1,)", "wlst_mode": "both", "wlst_name": "MemberDeathDetectorEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ],
219+
"MemberDeathDetectorEnabled": [ {"version": "[10,12.1.2)", "wlst_mode": "online", "wlst_name": "MemberDeathDetectorEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" },
220+
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemberDeathDetectorEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ],
221221
"MemberWarmupTimeoutSeconds": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "MemberWarmupTimeoutSeconds", "wlst_path": "WP001", "default_value": 30, "wlst_type": "integer", "restart_required": "true" } ,
222222
{"version": "[12.1.2,12.1.3)", "wlst_mode": "both", "wlst_name": "MemberWarmupTimeoutSeconds", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true" } ,
223223
{"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "MemberWarmupTimeoutSeconds", "wlst_path": "WP001", "default_value": 0, "derived_default": "${:true}", "wlst_type": "integer" } ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"CacheSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheSize", "wlst_path": "WP001", "default_value": 32, "wlst_type": "integer" } ],
1616
"CacheTTL": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheTTL", "wlst_path": "WP001", "default_value": 60, "wlst_type": "integer" } ],
1717
"CredentialEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CredentialEncrypted", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "password", "get_method": "GET" } ],
18-
"KeepAliveEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeepAliveEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
18+
"KeepAliveEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "KeepAliveEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1919
"MasterFirst": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MasterFirst", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
2020
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
2121
"RefreshReplicaAtStartup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RefreshReplicaAtStartup", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
"ConnectionPoolFailoverCallbackHandler": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionPoolFailoverCallbackHandler", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
7777
"FailoverRequestIfBusy": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FailoverRequestIfBusy", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
7878
"GlobalTransactionsProtocol": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "GlobalTransactionsProtocol", "wlst_path": "WP001", "default_value": "${__NULL__:OnePhaseCommit}", "wlst_type": "string" } ],
79-
"KeepConnAfterGlobalTx": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeepConnAfterGlobalTx", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
80-
"KeepConnAfterLocalTx": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeepConnAfterLocalTx", "wlst_path": "WP001", "default_value": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "LSA"} ],
79+
"KeepConnAfterGlobalTx": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeepConnAfterGlobalTx", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
80+
"KeepConnAfterLocalTx": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeepConnAfterLocalTx", "wlst_path": "WP001", "default_value": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "LSA"} ],
8181
"RowPrefetch": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RowPrefetch", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
8282
"RowPrefetchSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RowPrefetchSize", "wlst_path": "WP001", "default_value": "${__NULL__:48}", "wlst_type": "integer", "get_method": "LSA"} ],
8383
"JNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JNDIName${:s}", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}", "preferred_model_type": "delimited_string"} ],

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -648,16 +648,15 @@
648648
"online_bean": "weblogic.j2ee.descriptor.wl.MulticastParamsBean",
649649
"default_name_value": "${NO_NAME_0:%TEMPLATE%}",
650650
"folder_params": [
651-
{"version": "[10,12.2.1)"},
652-
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "online" },
651+
{"version": "[10,12.2.1.1)", "wlst_mode": "online" },
653652
{"version": "[12.2.1.1,)"}
654653
],
655654
"folders": {},
656655
"attributes": {
657656
"MulticastAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MulticastAddress", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "get_method": "GET", "restart_required": "true" } ],
658-
"MulticastPort": [ {"version": "[10,12.2.1.1)", "wlst_mode": "both", "wlst_name": "MulticastPort", "wlst_path": "WP001", "default_value": 6001, "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ,
657+
"MulticastPort": [ {"version": "[10,12.2.1.1)", "wlst_mode": "both", "wlst_name": "MulticastPort", "wlst_path": "WP001", "default_value": 6001, "wlst_type": "integer", "restart_required": "true"} ,
659658
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "MulticastPort", "wlst_path": "WP001", "default_value": "${0:6001}", "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ],
660-
"MulticastTimeToLive": [ {"version": "[10,12.2.1.1)", "wlst_mode": "both", "wlst_name": "MulticastTimeToLive", "wlst_path": "WP001", "default_value": 1, "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ,
659+
"MulticastTimeToLive": [ {"version": "[10,12.2.1.1)", "wlst_mode": "both", "wlst_name": "MulticastTimeToLive", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer", "restart_required": "true"} ,
661660
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "MulticastTimeToLive", "wlst_path": "WP001", "default_value": "${0:1}", "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true"} ],
662661
"TemplateBean": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "TemplateBean", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ]
663662
},
@@ -779,8 +778,7 @@
779778
"online_bean": "weblogic.j2ee.descriptor.wl.MulticastParamsBean",
780779
"default_name_value": "${NO_NAME_0:%TOPIC%}",
781780
"folder_params": [
782-
{"version": "[10,12.2.1)"},
783-
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "online" },
781+
{"version": "[10,12.2.1.1)", "wlst_mode": "online" },
784782
{"version": "[12.2.1.1,)"}
785783
],
786784
"folders": {},
@@ -1024,8 +1022,7 @@
10241022
"online_bean": "weblogic.j2ee.descriptor.wl.MulticastParamsBean",
10251023
"default_name_value": "${NO_NAME_0:%UNIFORMDISTRIBUTEDTOPIC%}",
10261024
"folder_params": [
1027-
{"version": "[10,12.2.1)"},
1028-
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "online" },
1025+
{"version": "[10,12.2.1.1)", "wlst_mode": "online" },
10291026
{"version": "[12.2.1.1,)"}
10301027
],
10311028
"folders": {},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "RO" } ],
4141
"AutoDeployedApp": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "AutoDeployedApp", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "GET", "access": "RO" } ],
4242
"BackgroundDeployment": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "BackgroundDeployment", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "GET", "access": "RO" } ],
43-
"CacheInAppDirectory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
43+
"CacheInAppDirectory": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
4444
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
4545
"ConfiguredApplicationIdentifier": [ {"version": "[12.2.1.3,)", "wlst_mode": "online", "wlst_name": "ConfiguredApplicationIdentifier", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET" } ],
4646
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"wlst_type": "NMProperties",
55
"wlst_mode": "offline",
66
"short_name": "NMProps",
7+
"version": "[12.1.2,)",
78
"folders": {},
89
"attributes": {
910
"AuthenticationEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "AuthenticationEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "get_method": "LSA" } ],

0 commit comments

Comments
 (0)