Skip to content

Commit 19fa013

Browse files
rakillenrakillen
authored
Merge pull request #185 from oracle/Issue#163-weblogic-19-support
Issue#163 weblogic 19 support
2 parents 008772b + f5994ab commit 19fa013

File tree

15 files changed

+221
-165
lines changed

15 files changed

+221
-165
lines changed

‎core/src/main/python/wlsdeploy/tool/create/domain_typedef.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ def __match_version_typedef(self, versions_dict):
197197

198198
wls_helper = WebLogicHelper(self._logger)
199199
wls_version = wls_helper.get_actual_weblogic_version()
200+
self._logger.fine('WLSDPLY-12310', wls_version, class_name=self.__class_name, method_name=_method_name)
200201

201202
result = None
202203
if wls_version in versions_dict:

‎core/src/main/python/wlsdeploy/util/weblogic_helper.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ def get_next_higher_order_version_number(self, version_number):
241241
periods = version_number.count('.')
242242
result = None
243243
if periods > 0:
244-
result = string_utils.rsplit(version_number, '.', 1)[0]
244+
rsplit = string_utils.rsplit(version_number, '.', 1)
245+
if len(rsplit) > 0:
246+
result = rsplit[0]
245247
return result
246248

247249
def encrypt(self, plain_text, domain_directory):

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

Lines changed: 49 additions & 47 deletions
Large diffs are not rendered by default.

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

Lines changed: 38 additions & 36 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@
8585
}
8686
},
8787
"attributes": {
88-
"ClassName": [ {"version": "[12.2.1.1,)", "wlst_mode": "online", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "get_method": "GET" } ]
88+
"ClassName": [ {"version": "[12.2.1.1,12.2.1.4)", "wlst_mode": "online", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "get_method": "GET" } ,
89+
{"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string" } ]
8990
},
9091
"wlst_attributes_path": "WP001",
9192
"wlst_paths": {

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

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,13 @@
226226
"child_folders_type": "multiple",
227227
"folders": {},
228228
"attributes": {
229-
"ConnectionHealthChecking": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionHealthChecking", "wlst_path": "WP001", "value": {"default": "enabled"}, "wlst_type": "string" } ],
230-
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
231-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
232-
"PasswordEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PasswordEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
233-
"RemoteJndiName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Remote${Jndi:JNDI}Name", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA", "restart_required": "true"} ],
234-
"Username": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Username", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "credential"} ]
229+
"ConnectionHealthChecking": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionHealthChecking", "wlst_path": "WP001", "value": {"default": "enabled"}, "wlst_type": "string" } ],
230+
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
231+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
232+
"PasswordEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PasswordEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
233+
"RemoteJndiName": [ {"version": "[10,12.2.1.4)", "wlst_mode": "both", "wlst_name": "Remote${Jndi:JNDI}Name", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA", "restart_required": "true"} ,
234+
{"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "Remote${Jndi:JNDI}Name", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA" } ],
235+
"Username": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Username", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "credential"} ]
235236
},
236237
"wlst_attributes_path": "WP001",
237238
"wlst_paths": {
@@ -243,9 +244,10 @@
243244
"child_folders_type": "multiple",
244245
"folders": {},
245246
"attributes": {
246-
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "restart_required": "true" } ],
247-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string" } ],
248-
"RemoteJndiName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Remote${Jndi:JNDI}Name", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "get_method": "LSA", "restart_required": "true"} ]
247+
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "restart_required": "true" } ],
248+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string" } ],
249+
"RemoteJndiName": [ {"version": "[10,12.2.1.4)", "wlst_mode": "both", "wlst_name": "Remote${Jndi:JNDI}Name", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "get_method": "LSA", "restart_required": "true" } ,
250+
{"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "Remote${Jndi:JNDI}Name", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "get_method": "LSA" } ]
249251
},
250252
"wlst_attributes_path": "WP001",
251253
"wlst_paths": {
@@ -267,12 +269,13 @@
267269
}
268270
},
269271
"attributes": {
270-
"ConnectionURL": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
271-
"DefaultTargetingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultTargetingEnabled", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "boolean", "restart_required": "true" } ],
272-
"InitialContextFactory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InitialContextFactory", "wlst_path": "WP001", "value": {"default": "${None:weblogic.jndi.WLInitialContextFactory}" }, "wlst_type": "string" } ],
273-
"JNDIPropertiesCredentialEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JNDIPropertiesCredentialEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
274-
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
275-
"SubDeploymentName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SubDeploymentName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ]
272+
"ConnectionURL": [ {"version": "[10,12.2.1.4)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ,
273+
{"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
274+
"DefaultTargetingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultTargetingEnabled", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "boolean", "restart_required": "true" } ],
275+
"InitialContextFactory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InitialContextFactory", "wlst_path": "WP001", "value": {"default": "${None:weblogic.jndi.WLInitialContextFactory}" }, "wlst_type": "string" } ],
276+
"JNDIPropertiesCredentialEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JNDIPropertiesCredentialEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
277+
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
278+
"SubDeploymentName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SubDeploymentName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ]
276279
},
277280
"wlst_attributes_path": "WP001",
278281
"wlst_paths": {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,19 @@
3030
"PurgeResourceFromCheckpointIntervalSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PurgeResourceFromCheckpointIntervalSeconds", "wlst_path": "WP001", "value": {"default": 86400 }, "wlst_type": "integer", "get_method": "${LSA:GET}" } ],
3131
"RecoverySiteName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RecoverySiteName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
3232
"RecoveryThresholdMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RecoveryThresholdMillis", "wlst_path": "WP001", "value": {"default": 300000 }, "wlst_type": "long", "get_method": "${LSA:GET}" } ],
33-
"SecurityInteropMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SecurityInteropMode", "wlst_path": "WP001", "value": {"default": "${None:default}" }, "wlst_type": "string", "restart_required": "true"} ],
33+
"SecurityInteropMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SecurityInteropMode", "wlst_path": "WP001", "value": {"default": "${None:default}" }, "wlst_type": "string", "restart_required": "true"} ],
3434
"SerializeEnlistmentsGCIntervalMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SerializeEnlistmentsGCIntervalMillis", "wlst_path": "WP001", "value": {"default": 30000 }, "wlst_type": "long" } ],
3535
"ShutdownGracePeriod": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ShutdownGracePeriod", "wlst_path": "WP001", "value": {"default": 180 }, "wlst_type": "integer" } ],
3636
"TightlyCoupledTransactionsEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "TightlyCoupledTransactionsEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
3737
"TimeoutSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TimeoutSeconds", "wlst_path": "WP001", "value": {"default": 30 }, "wlst_type": "integer" } ],
3838
"TlogWriteWhenDeterminerExistsEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "${Tlog:TLOG}WriteWhenDeterminerExistsEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
3939
"TwoPhaseEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TwoPhaseEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
4040
"UnregisterResourceGracePeriod": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UnregisterResourceGracePeriod", "wlst_path": "WP001", "value": {"default": 30 }, "wlst_type": "integer" } ],
41+
"UseNonSecureAddressesForDomain": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "UseNonSecureAddressesForDomain${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${delimited_string:jarray}", "get_method": "${LSA:GET}", "preferred_model_type": "delimited_string" } ],
42+
"UsePublicAddressesForRemoteDomain": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "UsePublicAddressesForRemoteDomain${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${delimited_string:jarray}", "get_method": "${LSA:GET}", "preferred_model_type": "delimited_string" } ],
4143
"WsatIssuedTokenEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}IssuedTokenEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "get_method": "LSA" } ],
42-
"WsatTransportSecurityMode": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}TransportSecurityMode", "wlst_path": "WP001", "value": {"default": "${None:SSLNotRequired}" }, "wlst_type": "string", "restart_required": "true" },
43-
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}TransportSecurityMode", "wlst_path": "WP001", "value": {"default": "${None:SSLNotRequired}" }, "wlst_type": "string" } ]
44+
"WsatTransportSecurityMode": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}TransportSecurityMode", "wlst_path": "WP001", "value": {"default": "${None:SSLNotRequired}" }, "wlst_type": "string", "restart_required": "true" },
45+
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}TransportSecurityMode", "wlst_path": "WP001", "value": {"default": "${None:SSLNotRequired}" }, "wlst_type": "string" } ]
4446
},
4547
"wlst_attributes_path": "WP001",
4648
"wlst_paths": {

0 commit comments

Comments
 (0)