Skip to content

Commit f327da8

Browse files
CarolynRountreeCarolynRountree
committed
continued fixes for alias definitions
1 parent 6497833 commit f327da8

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

‎core/src/main/python/wlsdeploy/aliases/alias_constants.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,11 @@
111111
PASSWORD,
112112
STRING
113113
]
114-
ALIAS_OTHER_TYPES = [OBJECT]
115114

116115
ALIAS_DATA_TYPES = list()
117116
ALIAS_DATA_TYPES.extend(ALIAS_PRIMITIVE_DATA_TYPES)
118117
ALIAS_DATA_TYPES.extend(ALIAS_LIST_TYPES)
119118
ALIAS_DATA_TYPES.extend(ALIAS_MAP_TYPES)
120-
ALIAS_DATA_TYPES.extend(ALIAS_OTHER_TYPES)
121119

122120

123121
def __build_security_provider_data_structures(name_map, base_path):

‎core/src/main/python/wlsdeploy/tool/validate/validation_utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ def is_compatible_data_type(expected_data_type, actual_data_type):
148148
retval = (actual_data_type in ["<type 'str'>"])
149149
elif 'delimited_' in expected_data_type:
150150
retval = (actual_data_type in ["<type 'str'>", "<type 'list'>"])
151-
elif 'object' in expected_data_type:
152-
retval = (actual_data_type in ["<type 'str'>"])
153151

154152
return retval
155153

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"AltDescriptorPath": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "AltDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
1010
"AltWLSDescriptorPath": [ {"version": "[10,10.3.6)", "wlst_mode": "offline", "wlst_name": "AltWlsDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
1111
{"version": "[10.3.6,)", "wlst_mode": "offline", "wlst_name": "AltWLSDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
12-
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${RO}" } ],
13-
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${RO}" } ],
12+
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "RO" } ],
13+
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "RO" } ],
1414
"CacheInAppDirectory": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
1515
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1616
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": {"default": 100 }, "wlst_type": "integer" } ],
@@ -25,13 +25,13 @@
2525
"SecurityDDModel": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "Security${Dd:DD}Model", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
2626
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" }],
2727
"SourcePath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}", "uses_path_tokens": "true" } ],
28-
"StagingMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
28+
"StagingMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" }],
2929
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "delimited_string" },
3030
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
3131
"Untargeted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Untargeted", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
3232
"ValidateDDSecurityData": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "Validate${Dd:DD}SecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "get_method": "${:GET}"},
3333
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
34-
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${RO}" } ]
34+
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "RO" } ]
3535
},
3636
"wlst_attributes_path": "WP001",
3737
"wlst_paths": {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"AltDescriptorPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AltDescriptorPath", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],
2929
"AltWlsDescriptorPath": [ {"version": "[10,10.3.6)", "wlst_mode": "both", "wlst_name": "AltWlsDescriptorPath", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],
3030
"AltWLSDescriptorPath": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "AltWLSDescriptorPath", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],
31-
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "access": "${RO}" } ],
32-
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "access": "${RO}" } ],
31+
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "access": "RO" } ],
32+
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "access": "RO" } ],
3333
"CacheInAppDirectory": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "boolean" } ],
3434
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string" } ],
3535
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": { "default": 100 }, "wlst_type": "integer" } ],
@@ -49,9 +49,9 @@
4949
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "delimited_string" },
5050
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": { "default": "None" }, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
5151
"Untargeted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Untargeted", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "boolean" } ],
52-
"ValidateDDSecurityData": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "Validate${Dd:DD}SecurityData", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "boolean", "access": "${:RO}"},
53-
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "boolean", "access": "${:RO}"} ],
54-
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "access": "${RO}" } ]
52+
"ValidateDDSecurityData": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "Validate${Dd:DD}SecurityData", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "boolean", "get_method": "LSA"},
53+
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": { "default": "false" }, "wlst_type": "boolean" } ],
54+
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": { "default": "None" }, "wlst_type": "string", "access": "RO" } ]
5555
},
5656
"wlst_attributes_path": "WP001",
5757
"wlst_paths": {

0 commit comments

Comments
 (0)