Skip to content

Commit 86649bd

Browse files
CarolynRountreeCarolynRountree
committed
fix for new nomenclature in alias definitions
1 parent a0074da commit 86649bd

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

‎core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,10 @@ def _get_virtual_hosts(self):
490490
location.append_location(model_top_folder_name)
491491
vhosts = self._find_names_in_folder(location)
492492
if vhosts is not None:
493-
_logger.info('WLSDPLY-06647', len(vhosts), class_name=_class_name, method_name=_method_name)
493+
_logger.info('WLSDPLY-06649', len(vhosts), class_name=_class_name, method_name=_method_name)
494494
name_token = self._aliases.get_name_token(location)
495495
for vhost in vhosts:
496-
_logger.info('WLSDPLY-06648', vhost, class_name=_class_name, method_name=_method_name)
496+
_logger.info('WLSDPLY-06650', vhost, class_name=_class_name, method_name=_method_name)
497497
location.add_name_token(name_token, vhost)
498498
result[vhost] = OrderedDict()
499499
self._populate_model_parameters(result[vhost], location)

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"child_folders_type": "multiple",
1717
"folders": {},
1818
"attributes": {
19-
"EncryptValueRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "boolean" } ],
20-
"EncryptedValueEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
21-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
22-
"Value": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
19+
"EncryptValueRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ],
20+
"EncryptedValueEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET" } ],
21+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
22+
"Value": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
2323
},
2424
"wlst_attributes_path": "WP001",
2525
"wlst_paths": {
@@ -28,31 +28,31 @@
2828
}
2929
},
3030
"attributes": {
31-
"ClassName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
32-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
33-
"TokenType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TokenType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
31+
"ClassName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
32+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
33+
"TokenType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TokenType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
3434
},
3535
"wlst_attributes_path": "WP001",
3636
"wlst_paths": {
3737
"WP001": "/WebserviceSecurit${y:ies}/%WEBSERVICE%/WebserviceCredentialProvider${:s}/%WSCREDENTIAL%"
3838
}
3939
},
4040
"WebserviceSecurityToken" : {
41-
"wlst_type": "WebserviceSecurityToken{:s}",
41+
"wlst_type": "WebserviceSecurityToken${:s}",
4242
"version": "[10,)",
4343
"child_folders_type": "multiple",
4444
"folders": {
4545
"ConfigurationProperty" :
4646
{
47-
"wlst_type": "ConfigurationPropert{y:ies}",
47+
"wlst_type": "ConfigurationPropert${y:ies}",
4848
"version": "[10,)",
4949
"child_folders_type": "multiple",
5050
"folders": {},
5151
"attributes": {
52-
"EncryptValueRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "boolean" } ],
53-
"EncryptedValueEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "password", "get_method": "GET" } ],
54-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
55-
"Value": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
52+
"EncryptValueRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ],
53+
"EncryptedValueEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "default_value": false, "wlst_type": "password", "get_method": "GET" } ],
54+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
55+
"Value": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
5656

5757
},
5858
"wlst_attributes_path": "WP001",
@@ -62,9 +62,9 @@
6262
}
6363
},
6464
"attributes": {
65-
"ClassName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
66-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
67-
"TokenType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TokenType", "wlst_path": "WP001", "value": {"default": "NONE" }, "wlst_type": "string" } ]
65+
"ClassName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
66+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
67+
"TokenType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TokenType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
6868
},
6969
"wlst_attributes_path": "WP001",
7070
"wlst_paths": {
@@ -77,33 +77,33 @@
7777
"default_name_value": "${NO_NAME_0:%WEBSERVICE%}",
7878
"folders": {},
7979
"attributes": {
80-
"ClockSkew": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClockSkew", "wlst_path": "WP001", "value": {"default": 60000 }, "wlst_type": "integer" } ],
81-
"ClockSynchronized": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClockSynchronized", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ],
82-
"MaxProcessingDelay": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxProcessingDelay", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
83-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
84-
"ValidityPeriod": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ValidityPeriod", "wlst_path": "WP001", "value": {"default": 60 }, "wlst_type": "integer" } ]
80+
"ClockSkew": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClockSkew", "wlst_path": "WP001", "default_value": 60000, "wlst_type": "integer" } ],
81+
"ClockSynchronized": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClockSynchronized", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],
82+
"MaxProcessingDelay": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxProcessingDelay", "wlst_path": "WP001", "default_value": -1, "wlst_type": "integer" } ],
83+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
84+
"ValidityPeriod": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ValidityPeriod", "wlst_path": "WP001", "default_value": 60, "wlst_type": "integer" } ]
8585
},
8686
"wlst_attributes_path": "WP001",
8787
"wlst_paths": {
88-
"WP001": "/WebserviceSecurit${y:ies}/%WEBSERVICE%/WebserviceTimestamp/%WEBSERVICE%"
88+
"WP001": "/WebserviceSecurit${y:ies}/%WEBSERVICE%/WebserviceTimestamp/%WEBSERVICETIMESTAMP%"
8989
}
9090
},
9191
"WebserviceTokenHandler" : {
92-
"wlst_type": "WebserviceTokenHandler{:s}",
92+
"wlst_type": "WebserviceTokenHandler${:s}",
9393
"version": "[10,)",
9494
"child_folders_type": "multiple",
9595
"folders": {
9696
"ConfigurationProperty" :
9797
{
98-
"wlst_type": "ConfigurationPropert{y:ies}",
98+
"wlst_type": "ConfigurationPropert${y:ies}",
9999
"version": "[10,)",
100100
"child_folders_type": "multiple",
101101
"folders": {},
102102
"attributes": {
103-
"EncryptValueRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "boolean" } ],
104-
"EncryptedValueEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "password", "get_method": "GET" } ],
105-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
106-
"Value": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
103+
"EncryptValueRequired": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptValueRequired", "wlst_path": "WP001", "default_value": null, "wlst_type": "boolean" } ],
104+
"EncryptedValueEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EncryptedValueEncrypted", "wlst_path": "WP001", "default_value": false, "wlst_type": "password", "get_method": "GET" } ],
105+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
106+
"Value": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Value", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
107107

108108
},
109109
"wlst_attributes_path": "WP001",
@@ -113,10 +113,10 @@
113113
}
114114
},
115115
"attributes": {
116-
"ClassName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
117-
"HandlingOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HandlingOrder", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
118-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
119-
"TokenType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TokenType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string " } ]
116+
"ClassName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
117+
"HandlingOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HandlingOrder", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
118+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
119+
"TokenType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TokenType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
120120
},
121121
"wlst_attributes_path": "WP001",
122122
"wlst_paths": {
@@ -125,11 +125,11 @@
125125
}
126126
},
127127
"attributes": {
128-
"CompatibilityOrderingPreference": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityOrderingPreference", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
129-
"CompatibilityPreference": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityPreference", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
130-
"DefaultCredentialProviderSTSURI": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultCredentialProviderSTSURI", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
131-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
132-
"PolicySelectionPreference": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PolicySelectionPreference", "wlst_path": "WP001", "value": {"default": "NONE" }, "wlst_type": "string" } ]
128+
"CompatibilityOrderingPreference": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityOrderingPreference", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
129+
"CompatibilityPreference": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityPreference", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
130+
"DefaultCredentialProviderSTSURI": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultCredentialProviderSTSURI", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
131+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
132+
"PolicySelectionPreference": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PolicySelectionPreference", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
133133
},
134134
"wlst_attributes_path": "WP001",
135135
"wlst_paths": {

0 commit comments

Comments
 (0)