Skip to content

Commit c4ab27a

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'uses-path-tokens-cleanup' into 'main'
Cleaning up alias attributes that were or should have been using the uses_path_tokens attribute See merge request weblogic-cloud/weblogic-deploy-tooling!1847
2 parents 4aa71bd + 48acc43 commit c4ab27a

File tree

13 files changed

+35
-35
lines changed

13 files changed

+35
-35
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
"CustomConfigFileLastUpdatedTime": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "CustomConfigFileLastUpdatedTime", "wlst_path": "WP001", "default_value": 0, "wlst_type": "long", "access": "IGNORED"} ],
313313
"DeploymentOrder": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
314314
"DeploymentPrincipalName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
315-
"DescriptorFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DescriptorFileName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "${:IGNORED}" } ],
315+
"DescriptorFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DescriptorFileName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "${:IGNORED}", "uses_path_tokens": "true" } ],
316316
"FederationRemoteClusterListenPort": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationRemoteClusterListenPort", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "access": "IGNORED" } ],
317317
"FederationRemoteClusterName": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationRemoteClusterName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
318318
"FederationRemoteParticipantHost": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationRemoteParticipantHost${:s}","wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
],
2828
"ConfigurationVersion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigurationVersion", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
2929
"ConsoleContextPath": [
30-
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "console", "wlst_type": "string", "uses_path_tokens": "true" },
31-
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "retired-console", "wlst_type": "string", "uses_path_tokens": "true" }
30+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "console", "wlst_type": "string" },
31+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "retired-console", "wlst_type": "string" }
3232
],
3333
"ConsoleEnabled": [
3434
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "true", "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
@@ -151,7 +151,7 @@
151151
"ConnectionInitializationCallback": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionInitializationCallback", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
152152
"FanEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FanEnabled", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean" } ],
153153
"OnsNodeList": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OnsNodeList", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string"} ],
154-
"OnsWalletFile": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OnsWalletFile", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
154+
"OnsWalletFile": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OnsWalletFile", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
155155
"OnsWalletPasswordEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OnsWalletPasswordEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET"} ],
156156
"OracleEnableJavaNetFastPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OracleEnableJavaNetFastPath", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
157157
"OracleOptimizeUtf8Conversion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OracleOptimizeUtf8Conversion", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "derived_default": "${:true}", "wlst_type": "boolean", "get_method": "LSA"} ],
@@ -221,7 +221,7 @@
221221
},
222222
"attributes": {
223223
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
224-
"DescriptorFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DescriptorFileName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "${:IGNORED}"} ],
224+
"DescriptorFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DescriptorFileName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "${:IGNORED}", "uses_path_tokens": "true" } ],
225225
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
226226
"DeploymentPrincipalName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
227227
"ModuleType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@
278278
}
279279
},
280280
"attributes": {
281-
"ConnectionURL": [ {"version": "[10,12.2.1.4)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true", "restart_required": "true" } ,
281+
"ConnectionURL": [ {"version": "[10,12.2.1.4)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true", "restart_required": "true", "comment": "Typically the URL will not be a file URL but in theory, it could be." } ,
282282
{"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
283283
"DefaultTargetingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultTargetingEnabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean", "restart_required": "true" } ],
284284
"InitialContextFactory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InitialContextFactory", "wlst_path": "WP001", "default_value": "${__NULL__:weblogic.jndi.WLInitialContextFactory}", "wlst_type": "string" } ],
@@ -1136,7 +1136,7 @@
11361136
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
11371137
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
11381138
"DeploymentPrincipalName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1139-
"DescriptorFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DescriptorFileName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "${:IGNORED}"} ],
1139+
"DescriptorFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DescriptorFileName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "${:IGNORED}", "uses_path_tokens": "true" } ],
11401140
"ModuleType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
11411141
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
11421142
"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" } ],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "default_value": 1000, "wlst_type": "integer" } ],
1212
"FailoverAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FailoverAddress${:es}", "wlst_path": "WP001", "default_value": "[] ", "wlst_type": "${delimited_string:jarray}", "get_method": "${LSA:GET}", "preferred_model_type": "delimited_string" } ],
1313
"KeyPassPhraseEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "secret_suffix": "key" } ],
14-
"KeyStoreName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeyStoreName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
14+
"KeyStoreName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeyStoreName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
1515
"KeyStorePassPhraseEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "KeyStorePassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "secret_suffix": "keystore" } ],
1616
"MaximumPoolSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaximumPoolSize", "wlst_path": "WP001", "default_value": 1, "wlst_type": "integer" } ],
1717
"MinimumPoolSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MinimumPoolSize", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
@@ -22,8 +22,8 @@
2222
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "SecurityContextEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "secure_default": "${__NULL__:true}" },
2323
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "SecurityContextEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "secure_default": true }
2424
],
25-
"Target": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Target${:s}", "wlst_path": "WP003", "default_value": null, "wlst_type": "${delimited_string:jarray}", "preferred_model_type": "delimited_string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
26-
"TrustStoreName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TrustStoreName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
25+
"Target": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Target${:s}", "wlst_path": "WP003", "default_value": null, "wlst_type": "${delimited_string:jarray}", "preferred_model_type": "delimited_string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
26+
"TrustStoreName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TrustStoreName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
2727
"TrustStorePassPhraseEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TrustStorePassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "secret_suffix": "truststore" } ],
2828
"UserName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
2929
"UserPasswordEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserPasswordEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"NodeManagerHome": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NodeManagerHome", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ],
3030
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
3131
"PasswordEncrypted": [ {"version": "[10.3.4,)", "wlst_mode": "both", "wlst_name": "PasswordEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET"} ],
32-
"ShellCommand": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ShellCommand", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true"} ],
32+
"ShellCommand": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ShellCommand", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true", "comment": "ShellCommand is not a file/dir but theoretically could have path tokens in the command-line text provided" } ],
3333
"UserName": [ {"version": "[10.3.4,)", "wlst_mode": "both", "wlst_name": "UserName", "wlst_path": "WP001", "default_value": null, "wlst_type": "credential" } ]
3434
},
3535
"wlst_attributes_path": "WP001",

0 commit comments

Comments
 (0)