Skip to content

Issue#163 weblogic 19 support #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 30, 2018
Merged

Issue#163 weblogic 19 support #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b2f371
Add log message to show the actual weblogic version
CarolynRountree Oct 25, 2018
827b790
Prevent exception when attempting to find the base version in create
CarolynRountree Oct 25, 2018
15015a8
Prevent exception when attempting to find the base version in create
CarolynRountree Oct 25, 2018
ba193de
Temporary versioning for 19c - remove when version returns expected
CarolynRountree Oct 25, 2018
4b27939
Changes to attributes and mbeans for 19c
CarolynRountree Oct 30, 2018
f5994ab
Changes to attributes and mbeans for 19c
CarolynRountree Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/python/wlsdeploy/tool/create/domain_typedef.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ def __match_version_typedef(self, versions_dict):

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

result = None
if wls_version in versions_dict:
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/python/wlsdeploy/util/weblogic_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ def get_next_higher_order_version_number(self, version_number):
periods = version_number.count('.')
result = None
if periods > 0:
result = string_utils.rsplit(version_number, '.', 1)[0]
rsplit = string_utils.rsplit(version_number, '.', 1)
if len(rsplit) > 0:
result = rsplit[0]
return result

def encrypt(self, plain_text, domain_directory):
Expand Down
96 changes: 49 additions & 47 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/AppDeployment.json
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 38 additions & 36 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Cluster.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion ...urces/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@
}
},
"attributes": {
"ClassName": [ {"version": "[12.2.1.1,)", "wlst_mode": "online", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "get_method": "GET" } ]
"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" } ,
{"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "ClassName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string" } ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
Expand Down
33 changes: 18 additions & 15 deletions ...src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSSystemResource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,13 @@
"child_folders_type": "multiple",
"folders": {},
"attributes": {
"ConnectionHealthChecking": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionHealthChecking", "wlst_path": "WP001", "value": {"default": "enabled"}, "wlst_type": "string" } ],
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
"PasswordEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PasswordEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
"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"} ],
"Username": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Username", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "credential"} ]
"ConnectionHealthChecking": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionHealthChecking", "wlst_path": "WP001", "value": {"default": "enabled"}, "wlst_type": "string" } ],
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
"PasswordEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PasswordEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
"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"} ,
{"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" } ],
"Username": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Username", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "credential"} ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
Expand All @@ -243,9 +244,10 @@
"child_folders_type": "multiple",
"folders": {},
"attributes": {
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "restart_required": "true" } ],
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string" } ],
"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"} ]
"LocalJNDIName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LocalJNDIName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string", "restart_required": "true" } ],
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string" } ],
"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" } ,
{"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" } ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
Expand All @@ -267,12 +269,13 @@
}
},
"attributes": {
"ConnectionURL": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
"DefaultTargetingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultTargetingEnabled", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "boolean", "restart_required": "true" } ],
"InitialContextFactory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InitialContextFactory", "wlst_path": "WP001", "value": {"default": "${None:weblogic.jndi.WLInitialContextFactory}" }, "wlst_type": "string" } ],
"JNDIPropertiesCredentialEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JNDIPropertiesCredentialEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
"SubDeploymentName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SubDeploymentName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ]
"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" } ,
{"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "ConnectionURL", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
"DefaultTargetingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultTargetingEnabled", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "boolean", "restart_required": "true" } ],
"InitialContextFactory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InitialContextFactory", "wlst_path": "WP001", "value": {"default": "${None:weblogic.jndi.WLInitialContextFactory}" }, "wlst_type": "string" } ],
"JNDIPropertiesCredentialEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JNDIPropertiesCredentialEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
"SubDeploymentName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SubDeploymentName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
Expand Down
8 changes: 5 additions & 3 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JTA.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,19 @@
"PurgeResourceFromCheckpointIntervalSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PurgeResourceFromCheckpointIntervalSeconds", "wlst_path": "WP001", "value": {"default": 86400 }, "wlst_type": "integer", "get_method": "${LSA:GET}" } ],
"RecoverySiteName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RecoverySiteName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
"RecoveryThresholdMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RecoveryThresholdMillis", "wlst_path": "WP001", "value": {"default": 300000 }, "wlst_type": "long", "get_method": "${LSA:GET}" } ],
"SecurityInteropMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SecurityInteropMode", "wlst_path": "WP001", "value": {"default": "${None:default}" }, "wlst_type": "string", "restart_required": "true"} ],
"SecurityInteropMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SecurityInteropMode", "wlst_path": "WP001", "value": {"default": "${None:default}" }, "wlst_type": "string", "restart_required": "true"} ],
"SerializeEnlistmentsGCIntervalMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SerializeEnlistmentsGCIntervalMillis", "wlst_path": "WP001", "value": {"default": 30000 }, "wlst_type": "long" } ],
"ShutdownGracePeriod": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ShutdownGracePeriod", "wlst_path": "WP001", "value": {"default": 180 }, "wlst_type": "integer" } ],
"TightlyCoupledTransactionsEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "TightlyCoupledTransactionsEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
"TimeoutSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TimeoutSeconds", "wlst_path": "WP001", "value": {"default": 30 }, "wlst_type": "integer" } ],
"TlogWriteWhenDeterminerExistsEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "${Tlog:TLOG}WriteWhenDeterminerExistsEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
"TwoPhaseEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TwoPhaseEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
"UnregisterResourceGracePeriod": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UnregisterResourceGracePeriod", "wlst_path": "WP001", "value": {"default": 30 }, "wlst_type": "integer" } ],
"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" } ],
"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" } ],
"WsatIssuedTokenEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}IssuedTokenEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "get_method": "LSA" } ],
"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" },
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}TransportSecurityMode", "wlst_path": "WP001", "value": {"default": "${None:SSLNotRequired}" }, "wlst_type": "string" } ]
"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" },
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Wsat:WSAT}TransportSecurityMode", "wlst_path": "WP001", "value": {"default": "${None:SSLNotRequired}" }, "wlst_type": "string" } ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
Expand Down
Loading