Skip to content

Commit 50233af

Browse files
committed
Merge branch '1412-alias-changes' into 'main'
fixes aliases for new 14.1.2 offline attributes See merge request weblogic-cloud/weblogic-deploy-tooling!1466
2 parents ca63e87 + 2071960 commit 50233af

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@
10711071
"AssertionEncryptionDecryptionKeyAlias": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AssertionEncryptionDecryptionKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
10721072
"AssertionEncryptionDecryptionKeyPassPhraseEncrypted": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AssertionEncryptionDecryptionKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
10731073
"AssertionEncryptionEnabled": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AssertionEncryptionEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1074-
"AssertionSubjectSessionTimeoutCheckEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "AssertionSubjectSessionTimeoutCheckEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
1074+
"AssertionSubjectSessionTimeoutCheckEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "AssertionSubjectSessionTimeoutCheckEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
10751075
"AuthnRequestMaxCacheSize": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AuthnRequestMaxCacheSize", "wlst_path": "WP001", "default_value": 10000, "wlst_type": "integer" } ],
10761076
"AuthnRequestTimeout": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AuthnRequestTimeout", "wlst_path": "WP001", "default_value": 300, "wlst_type": "integer" } ],
10771077
"BasicAuthPasswordEncrypted": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "BasicAuthPasswordEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
@@ -1108,10 +1108,10 @@
11081108
"ServiceProviderEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ServiceProviderEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11091109
"ServiceProviderPostBindingEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ServiceProviderP${ost:OST}BindingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
11101110
"ServiceProviderPreferredBinding": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ServiceProviderPreferredBinding", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "wlst_type": "string" } ],
1111-
"ServiceProviderSingleLogoutBinding": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "ServiceProviderSingleLogoutBinding", "wlst_path": "WP001", "default_value": "HTTP/Redirect", "wlst_type": "string" } ],
1111+
"ServiceProviderSingleLogoutBinding": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ServiceProviderSingleLogoutBinding", "wlst_path": "WP001", "default_value": "${__NULL__:HTTP/Redirect}", "wlst_type": "string" } ],
11121112
"ServiceProviderSingleLogoutEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ServiceProviderSingleLogoutEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
1113-
"ServiceProviderSingleLogoutRedirectURIs": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "ServiceProviderSingleLogoutRedirectURIs", "wlst_path": "WP001", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "list" } ],
1114-
"SignAuthnRequests": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "SignAuthnRequests", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1113+
"ServiceProviderSingleLogoutRedirectUri": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ServiceProviderSingleLogoutRedirect${Uri:URIs}", "wlst_path": "WP001", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "list" } ],
1114+
"SignAuthnRequests": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "SignAuthnRequests", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11151115
"SsoSigningKeyAlias": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "S${so:SO}SigningKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
11161116
"SsoSigningKeyPassPhraseEncrypted": [
11171117
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both", "wlst_name": "${Sso:SSO}SigningKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "${LSA:GET}" },

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@
10811081
"AssertionEncryptionDecryptionKeyAlias": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AssertionEncryptionDecryptionKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
10821082
"AssertionEncryptionDecryptionKeyPassPhraseEncrypted": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AssertionEncryptionDecryptionKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
10831083
"AssertionEncryptionEnabled": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "AssertionEncryptionEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1084-
"AssertionSubjectSessionTimeoutCheckEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "AssertionSubjectSessionTimeoutCheckEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
1084+
"AssertionSubjectSessionTimeoutCheckEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "AssertionSubjectSessionTimeoutCheckEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
10851085
"AuthnRequestMaxCacheSize": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AuthnRequestMaxCacheSize", "wlst_path": "WP001", "default_value": 10000, "wlst_type": "integer" } ],
10861086
"AuthnRequestTimeout": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "AuthnRequestTimeout", "wlst_path": "WP001", "default_value": 300, "wlst_type": "integer" } ],
10871087
"BasicAuthPasswordEncrypted": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "BasicAuthPasswordEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
@@ -1118,9 +1118,9 @@
11181118
"ServiceProviderEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ServiceProviderEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11191119
"ServiceProviderPostBindingEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ServiceProviderP${ost:OST}BindingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
11201120
"ServiceProviderPreferredBinding": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ServiceProviderPreferredBinding", "wlst_path": "WP001", "default_value": "${__NULL__:None}", "wlst_type": "string" } ],
1121-
"ServiceProviderSingleLogoutBinding": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "ServiceProviderSingleLogoutBinding", "wlst_path": "WP001", "default_value": "HTTP/Redirect", "wlst_type": "string" } ],
1121+
"ServiceProviderSingleLogoutBinding": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ServiceProviderSingleLogoutBinding", "wlst_path": "WP001", "default_value": "${__NULL__:HTTP/Redirect}", "wlst_type": "string" } ],
11221122
"ServiceProviderSingleLogoutEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ServiceProviderSingleLogoutEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
1123-
"ServiceProviderSingleLogoutRedirectURIs": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "ServiceProviderSingleLogoutRedirectURIs", "wlst_path": "WP001", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "list" } ],
1123+
"ServiceProviderSingleLogoutRedirectUri": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ServiceProviderSingleLogoutRedirect${Uri:URIs}", "wlst_path": "WP001", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "list" } ],
11241124
"SignAuthnRequests": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "SignAuthnRequests", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
11251125
"SsoSigningKeyAlias": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "S${so:SO}SigningKeyAlias", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
11261126
"SsoSigningKeyPassPhraseEncrypted": [

0 commit comments

Comments
 (0)