Skip to content

Commit 867b66c

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'oracle-identity-fixes' into 'main'
Correct OracleIdentityCloudIntegrator aliases for 12.2.1.3 See merge request weblogic-cloud/weblogic-deploy-tooling!1830
2 parents 76f1cef + a55773a commit 867b66c

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -866,24 +866,27 @@
866866
"ClientTenant": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientTenant", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
867867
"ClientTenantTokenClaim": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientTenantTokenClaim", "wlst_path": "WP001", "default_value": "client_tenantname", "wlst_type": "string" } ],
868868
"CompatibilityObjectName": [ {"version": "[12.2.1.3,)", "wlst_mode": "offline", "wlst_name": "CompatibilityObjectName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
869-
"ConnectTimeout": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ConnectTimeout", "wlst_path": "WP001", "default_value": "${0:60}", "wlst_type": "integer" } ],
869+
"ConnectTimeout": [
870+
{"version": "[12.2.1.3,12.2.1.3.0.200227)", "wlst_mode": "both", "wlst_name": "ConnectTimeout", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer"},
871+
{"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "ConnectTimeout", "wlst_path": "WP001", "default_value": "${0:60}", "wlst_type": "integer"}
872+
],
870873
"ControlFlag": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ControlFlag", "wlst_path": "WP001", "default_value": "${__NULL__:REQUIRED}", "wlst_type": "string" } ],
871874
"Description": [ {"version": "[12.2.1.3,)", "wlst_mode": "online", "wlst_name": "Description", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
872875
"GroupsTokenClaim": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "GroupsTokenClaim", "wlst_path": "WP001", "default_value": "groups", "wlst_type": "string" } ],
873876
"Host": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "Host", "wlst_path": "WP001", "default_value": "localhost", "wlst_type": "string" } ],
874877
"Issuer": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "Issuer", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
875878
"JsonWebKeySetUri": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "J${son:SON}WebKeySetU${ri:RI}", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
876-
"KnownTenantEmptyMetadataTtl": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "KnownTenantEmptyMetadataT${tl:TL}", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer" } ],
877-
"KnownTenantPrefix": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "KnownTenantPrefix${:List}", "wlst_path": "WP001", "default_value": "${:idcs-}", "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
879+
"KnownTenantEmptyMetadataTtl": [ {"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "KnownTenantEmptyMetadataT${tl:TL}", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer" } ],
880+
"KnownTenantPrefix": [ {"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "KnownTenantPrefix${:List}", "wlst_path": "WP001", "default_value": "${:idcs-}", "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
878881
"OnlyUserTokenClaimsEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "OnlyUserTokenClaimsEnabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
879882
"Port": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "Port", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
880883
"PreferAltId": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "PreferAltI${d:D}", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
881884
"ProviderClassName": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "ProviderClassName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" },
882885
{"version": "[12.2.1.4,)", "wlst_mode": "offline", "wlst_name": "ProviderClassName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "get_method": "GET" }],
883886
"ResourceTenantTokenClaim": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ResourceTenantTokenClaim", "wlst_path": "WP001", "default_value": "tenant", "wlst_type": "string" } ],
884887
"ResponseReadTimeout": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ResponseReadTimeout", "wlst_path": "WP001", "default_value": "${0:60}", "wlst_type": "integer" } ],
885-
"ServerBackoffEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ServerBackoffEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],
886-
"ServerNotAvailableCounterInterval": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ServerNotAvailableCounterInterval", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer" } ],
888+
"ServerBackoffEnabled": [ {"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "ServerBackoffEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],
889+
"ServerNotAvailableCounterInterval": [ {"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "ServerNotAvailableCounterInterval", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer" } ],
887890
"SignaturePreferX509Certificate": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "SignaturePreferX509Certificate", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
888891
"SslEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "S${sl:SL}Enabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
889892
"SupportedTypes": [ {"version": "[12.2.1.3,)", "wlst_mode": "online", "wlst_name": "SupportedTypes", "wlst_path": "WP001", "default_value": null, "wlst_type": "jarray", "access": "IGNORED" } ],
@@ -894,19 +897,22 @@
894897
"SyncFilterUserHeaderName": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "SyncFilterUserHeaderName${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
895898
"Tenant": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "Tenant", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
896899
"TenantDataFlushInterval": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TenantDataFlushInterval", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
897-
"TenantDataReloadEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TenantDataReloadEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],
898-
"TenantDataReloadInterval": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TenantDataReloadInterval", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer" } ],
900+
"TenantDataReloadEnabled": [ {"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "TenantDataReloadEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],
901+
"TenantDataReloadInterval": [ {"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "TenantDataReloadInterval", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer" } ],
899902
"TenantHeaderName": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TenantHeaderName${:s}", "wlst_path": "WP001", "default_value": "X-USER-IDENTITY-SERVICE-GUID, X-USER-IDENTITY-DOMAIN-NAME, X-RESOURCE-IDENTITY-SERVICE-GUID, X-RESOURCE-IDENTITY-DOMAIN-NAME", "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
900903
"TenantHostNameTemplate": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TenantHostNameTemplate", "wlst_path": "WP001", "default_value": "{%tenant}.{%host}", "wlst_type": "string" } ],
901904
"TenantName": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TenantName${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
902905
"TenantTokenClaim": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TenantTokenClaim", "wlst_path": "WP001", "default_value": "user_tenantname", "wlst_type": "string" } ],
903-
"ThreadLockTimeout": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ThreadLockTimeout", "wlst_path": "WP001", "default_value": "${0:120}", "wlst_type": "integer" } ],
906+
"ThreadLockTimeout": [
907+
{"version": "[12.2.1.3,12.2.1.3.0.200227)", "wlst_mode": "both", "wlst_name": "ThreadLockTimeout", "wlst_path": "WP001", "default_value": "${0:300}", "wlst_type": "integer"},
908+
{"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "ThreadLockTimeout", "wlst_path": "WP001", "default_value": "${0:120}", "wlst_type": "integer"}
909+
],
904910
"TokenCacheEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TokenCacheEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],
905911
"TokenClockSkew": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TokenClockSkew", "wlst_path": "WP001", "default_value": 120, "wlst_type": "integer" } ],
906912
"TokenSecureTransportRequired": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TokenSecureTransportRequired", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
907913
"TokenValidationLevel": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TokenValidationLevel", "wlst_path": "WP001", "default_value": "${__NULL__:NORMAL}", "wlst_type": "string" } ],
908914
"TokenVirtualUserAllowed": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "TokenVirtualUserAllowed", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
909-
"UnknownTenantEmptyMetadataTtl": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "UnknownTenantEmptyMetadataT${tl:TL}", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
915+
"UnknownTenantEmptyMetadataTtl": [ {"version": "[12.2.1.3.0.200227,)", "wlst_mode": "both", "wlst_name": "UnknownTenantEmptyMetadataT${tl:TL}", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
910916
"UserAuthenticationAssertionAttribute": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "UserAuthenticationAssertionAttribute", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
911917
"UserIdResourceAttribute": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "UserI${d:D}ResourceAttribute", "wlst_path": "WP001", "default_value": "id", "wlst_type": "string" } ],
912918
"UserIdTokenClaim": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "UserI${d:D}TokenClaim", "wlst_path": "WP001", "default_value": "user_id", "wlst_type": "string" } ],

0 commit comments

Comments
 (0)