diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json index 1284df1ba6..b1e200547f 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Log.json @@ -1,5 +1,5 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "Log", "child_folders_type": "single_unpredictable", @@ -33,8 +33,7 @@ "LogMonitoringThrottleThreshold": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleThreshold", "wlst_path": "WP001", "value": {"default": 1500 }, "wlst_type": "integer"} ], "LoggerSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverity", "wlst_path": "WP001", "value": {"default": "${None:Info}" }, "wlst_type": "string" } ], "LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], - "MemoryBufferFilter": [ {"version": "[10,12.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean"} , - {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean"} ], + "MemoryBufferFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean"} ], "MemoryBufferSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "value": {"default": "${None:Trace}"}, "wlst_type": "string" } ], "MemoryBufferSize": [ {"version": "[10,12.2.1.3)","wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": 10 }, "wlst_type": "integer"} , {"version": "[12.2.1.3,)","wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": "${10:500}"}, "wlst_type": "integer"} ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json index 12160b5cce..08bd8aceab 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/SecurityConfiguration.json @@ -1,5 +1,5 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "SecurityConfiguration", "child_folders_type": "single_unpredictable", @@ -160,7 +160,7 @@ "DynamicMemberUrlAttribute": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DynamicMemberUrlAttribute", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "EnableCacheStatistics": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "EnableCacheStatistics", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], "EnableGroupMembershipLookupHierarchyCaching": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EnableGroupMembershipLookupHierarchyCaching", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], - "EnableSIDtoGroupLookupCaching": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EnableSIDtoGroupLookupCaching", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], + "EnableSIDtoGroupLookupCaching": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EnableSIDtoGroupLookupCaching", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], "FollowReferrals": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FollowReferrals", "wlst_path": "WP001", "value": {"default": true }, "wlst_type": "boolean" } ], "GroupBaseDN": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "GroupBaseDN", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "GroupFromNameFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "GroupFromNameFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], @@ -179,7 +179,7 @@ "ParallelConnectDelay": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ParallelConnectDelay", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ], "Port": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Port", "wlst_path": "WP001", "value": {"default": 389 }, "wlst_type": "integer" } ], "Principal": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Principal", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], - "PropagateCauseForLoginException": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PropagateCauseForLoginException", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], + "PropagateCauseForLoginException": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PropagateCauseForLoginException", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], "ResultsTimeLimit": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ResultsTimeLimit", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ], "RetrievePrincipalFromUserDn": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "RetrievePrincipalFromUserDn", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean", "get_method": "LSA" } ], "RetrieveUserAccountControl": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "RetrieveUserAccountControl", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], @@ -189,7 +189,7 @@ "StaticGroupObjectClass": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StaticGroupObjectClass", "wlst_path": "WP001", "value": {"default": "groupofuniquenames" }, "wlst_type": "string" } ], "StaticMemberDNAttribute": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StaticMemberDNAttribute", "wlst_path": "WP001", "value": {"default": "uniquemember" }, "wlst_type": "string" } ], "UseRetrievedUserNameAsPrincipal": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UseRetrievedUserNameAsPrincipal", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], - "UseTokenGroupsForGroupMembershipLookup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UseTokenGroupsForGroupMembershipLookup", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean" } ], + "UseTokenGroupsForGroupMembershipLookup": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UseTokenGroupsForGroupMembershipLookup", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "java.lang.Boolean", "wlst_read_type": "boolean", "set_method": "MBEAN.set_attribute_with_cmo" } ], "UserBaseDn": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserBaseDn", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "UserDynamicGroupDnAttribute": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserDynamicGroupDnAttribute", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], "UserFromNameFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UserFromNameFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ], diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index 03dca88cbc..e060ab9d43 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -1,5 +1,5 @@ { - "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates. All rights reserved.", + "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.", "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl", "wlst_type": "Server${:s}", "child_folders_type": "multiple", @@ -259,8 +259,7 @@ "LogMonitoringThrottleThreshold": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleThreshold", "wlst_path": "WP001", "value": {"default": 1500 }, "wlst_type": "integer"} ], "LoggerSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverity", "wlst_path": "WP001", "value": {"default": "${None:Info}"}, "wlst_type": "string" } ], "LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ], - "MemoryBufferFilter": [ {"version": "[10,12.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } , - {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], + "MemoryBufferFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ], "MemoryBufferSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "value": {"default": "${None:Trace}"}, "wlst_type": "string" } ], "MemoryBufferSize": [ {"version": "[10,12.2.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": 10 }, "wlst_type": "integer"} , {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": "${10:500}"}, "wlst_type": "integer"} ], diff --git a/core/src/test/python/aliases_test.py b/core/src/test/python/aliases_test.py index 187b18463a..9fc2f7110d 100644 --- a/core/src/test/python/aliases_test.py +++ b/core/src/test/python/aliases_test.py @@ -1,5 +1,5 @@ """ -Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved. +Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. """ from org.python.modules import jarray @@ -900,6 +900,19 @@ def testGetWlstAttributeJavaBoolean(self): self.assertEqual(value, Boolean('true')) return + def testGetWlstAttributeJavaBooleanNewIssue157(self): + location = LocationContext().append_location(FOLDERS.SECURITY_CONFIGURATION) + token = self.aliases.get_name_token(location) + location.add_name_token(token, 'my-domain') + location.append_location(FOLDERS.REALM, REALM="myrealm"). \ + append_location(FOLDERS.AUTHENTICATION_PROVIDER, PROVIDER='myprovider'). \ + append_location(FOLDERS.ACTIVE_DIRECTORY_AUTHENTICATOR) + name, value = self.aliases.get_wlst_attribute_name_and_value(location, 'UseTokenGroupsForGroupMembershipLookup', + 'true') + self.assertEqual(name, 'UseTokenGroupsForGroupMembershipLookup') + self.assertEqual(value, Boolean('true')) + return + def testSecurityProviderTypeHandling(self): location = LocationContext().append_location(FOLDERS.SECURITY_CONFIGURATION) token = self.aliases.get_name_token(location)