Wdt support for 1411

core/src/main/java/oracle/weblogic/deploy/util/PyOrderedDict.java

@@ -280,9 +280,10 @@ public void __setitem__(PyObject key, PyObject value) {
         synchronized (this.linkedHashMap) {
             this.linkedHashMap.put(key, value);
         }
-        synchronized (super.table) {
-            super.table.put(key, value);
-        }
+        // do not access protected field directly.
+        // 2.7 version does not have table variable.
+        // Neither version has synchronization on the table.
+        super.__setitem__(key, value);
     }
 
     /**
@@ -291,7 +292,7 @@ public void __setitem__(PyObject key, PyObject value) {
     @Override
     public void clear() {
         this.linkedHashMap.clear();
-        super.table.clear();;
+        super.clear();
     }
 
     /**
@@ -503,6 +504,7 @@ private static PyObject doDeepCopy(PyObject orig, PyObject memo) {
             case "long":
             case "NoneType":
             case "str":
+            case "unicode":
                 result = orig;
                 break;
 

core/src/main/python/create.py

@@ -4,7 +4,7 @@
 
 The main module for the WLSDeploy tool to create empty domains.
 """
-import javaos as os
+import os
 import sys
 from java.io import IOException
 from java.lang import IllegalArgumentException
@@ -487,6 +487,6 @@ def main(args):
     return
 
 
-if __name__ == "main":
+if __name__ == '__main__' or __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)

core/src/main/python/deploy.py

@@ -4,7 +4,7 @@
 
 The entry point for the deployApps tool.
 """
-import javaos as os
+import os
 import sys
 
 from java.io import IOException, PrintStream
@@ -437,6 +437,6 @@ def main(args):
     return
 
 
-if __name__ == "main":
+if __name__ == '__main__' or __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)

core/src/main/python/discover.py

@@ -4,7 +4,7 @@
 
 The entry point for the discoverDomain tool.
 """
-import javaos as os
+import os
 import sys
 
 from java.io import File
@@ -525,6 +525,6 @@ def main(args):
 
     __log_and_exit(model_context, exit_code, _class_name, _method_name)
 
-if __name__ == 'main':
+if __name__ == '__main__' or __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)

core/src/main/python/encrypt.py

@@ -4,7 +4,7 @@
 
 The main module for the WLSDeploy tool to encrypt passwords.
 """
-import javaos as os
+import os
 import sys
 
 from java.io import IOException
@@ -285,6 +285,6 @@ def main(args):
     sys.exit(exit_code)
 
 
-if __name__ == "main":
+if __name__ == '__main__' or __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)

core/src/main/python/update.py

@@ -4,7 +4,7 @@
 
 The entry point for the updateDomain tool.
 """
-import javaos as os
+import os
 import sys
 
 from java.io import IOException, PrintStream
@@ -454,6 +454,6 @@ def main(args):
     return
 
 
-if __name__ == "main":
+if __name__ == '__main__' or __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)

core/src/main/python/validate.py

@@ -4,7 +4,7 @@
 
 The WLS Deploy tooling entry point for the validateModel tool.
 """
-import javaos as os
+import os
 import sys
 from java.util.logging import Level
 
@@ -254,6 +254,6 @@ def main(args):
     return
 
 
-if __name__ == "main":
+if __name__ == '__main__' or __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)

core/src/main/python/variable_inject.py

@@ -310,6 +310,6 @@ def main(args):
     __logger.exiting(result=exit_code, class_name=_class_name, method_name=_method_name)
     sys.exit(exit_code)
 
-if __name__ == 'main':
+if __name__ == '__main__' or __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
     main(sys.argv)

core/src/main/python/wlsdeploy/aliases/alias_utils.py

@@ -74,10 +74,10 @@ def merge_model_and_existing_lists(model_list, existing_list, string_list_separa
         result = model_list
     elif model_list is None or len(model_list) == 0:
         result = existing_list
-        if type(model_list) is str and type(existing_list) is not str:
+        if isinstance(model_list, basestring) and not isinstance(existing_list, basestring):
             result = string_list_separator_char.join(existing_list)
     else:
-        model_list_is_string = type(model_list) is str
+        model_list_is_string = isinstance(model_list, basestring)
         model_set = _create_set(model_list, string_list_separator_char, 'WLSDPLY-08000')
         existing_set = _create_set(existing_list, string_list_separator_char, 'WLSDPLY-08001')
 
@@ -107,7 +107,7 @@ def merge_model_and_existing_properties(model_props, existing_props, string_prop
         result = model_props
     elif model_props is None or len(model_props) == 0:
         result = existing_props
-        if type(model_props) is str and type(existing_props) is not str:
+        if isinstance(model_props, basestring) and isinstance(existing_props, basestring):
             result = _properties_to_string(existing_props, string_props_separator_char)
     else:
         model_props_is_string = False
@@ -517,7 +517,7 @@ def convert_boolean(value):
                 result = True
             elif value == 0:
                 result = False
-        elif type(value) is str:
+        elif isinstance(value, basestring):
             if value.lower() == 'true':
                 result = True
             elif value.lower() == 'false':
@@ -844,7 +844,7 @@ def _get_path_separator(value):
     _logger.entering(value, class_name=_class_name, method_name=_method_name)
 
     result = File.pathSeparator
-    if type(value) is str and len(value) > 0:
+    if isinstance(value, basestring) and len(value) > 0:
         # If the value has a windows separator or a single directory that starts with a drive letter
         if ';' in value or _windows_path_regex.match(value):
             result = ';'
@@ -972,7 +972,7 @@ def _properties_to_string(props, string_props_separator_char):
     _logger.entering(props, string_props_separator_char, class_name=_class_name, method_name=_method_name)
     if props is None:
         result = ''
-    elif type(props) is str:
+    elif isinstance(props, basestring):
         result = props
     else:
         result = ''

core/src/main/python/wlsdeploy/json/json_translator.py

@@ -4,6 +4,8 @@
 
 This model provider translation classes that convert between JSON and Python Dictionaries.
 """
+import types
+
 import java.io.FileNotFoundException as JFileNotFoundException
 import java.io.FileOutputStream as JFileOutputStream
 import java.io.IOException as JIOException
@@ -202,21 +204,22 @@ def _format_json_value(value):
     """
     import java.lang.StringBuilder as StringBuilder
     builder = StringBuilder()
-    if type(value) == bool or (type(value) == str and (value == 'true' or value == 'false')):
+    if type(value) == bool or (isinstance(value, types.StringTypes) and (value == 'true' or value == 'false')):
         builder.append(JBoolean.toString(value))
-    elif type(value) == str:
-        builder.append('"').append(_quote_embedded_quotes(value)).append('"')
+    elif isinstance(value, types.StringTypes):
+        builder.append('"').append(_quote_embedded_quotes(value.strip())).append('"')
     else:
         builder.append(value)
     return builder.toString()
 
+
 def _quote_embedded_quotes(text):
     """
     Quote all embedded double quotes in a string with a backslash.
     :param text: the text to quote
     :return: the quotes result
     """
     result = text
-    if type(text) is str and '"' in text:
+    if isinstance(text, types.StringTypes) and '"' in text:
         result = text.replace('"', '\\"')
     return result

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -2,7 +2,7 @@
 Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
-import javaos as os
+import os
 import weblogic.security.internal.SerializedSystemIni as SerializedSystemIni
 import weblogic.security.internal.encryption.ClearOrEncryptedService as ClearOrEncryptedService
 from java.io import FileOutputStream

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

@@ -2,7 +2,7 @@
 Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
-import javaos as os
+import os
 import re
 
 from java.lang import IllegalArgumentException
@@ -18,6 +18,7 @@
 
 CREATE_DOMAIN = 'createDomain'
 UPDATE_DOMAIN = 'updateDomain'
+NOT_SUPPORTED = 'NOT_SUPPORTED'
 
 
 class DomainTypedef(object):
@@ -370,6 +371,7 @@ def __get_version_typedef(self):
             raise ex
 
         self._version_typedef_name = self.__match_version_typedef(self._domain_typedefs_dict['versions'])
+
         if self._version_typedef_name in self._domain_typedefs_dict['definitions']:
             result = self._domain_typedefs_dict['definitions'][self._version_typedef_name]
         else:
@@ -417,6 +419,10 @@ def __match_version_typedef(self, versions_dict):
                                                               self._domain_typedef_filename, wls_version)
                 self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
                 raise ex
+        if result == NOT_SUPPORTED:
+            ex = exception_helper.create_create_exception('WLSDPLY-12313', self._domain_type, wls_version)
+            self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
         self._logger.exiting(self.__class_name, _method_name, result)
         return result
 

core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py

@@ -3,7 +3,7 @@
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import copy
-import javaos as os
+import os
 from java.io import ByteArrayOutputStream
 from java.io import File
 from java.io import FileNotFoundException

core/src/main/python/wlsdeploy/tool/deploy/deployer.py

@@ -2,7 +2,7 @@
 Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
-import javaos as os
+import os
 
 from array import array
 from java.lang import Class

core/src/main/python/wlsdeploy/tool/discover/custom_folder_helper.py

@@ -337,18 +337,18 @@ def equal_jarrays(array1, array2):
     return False
 
 
-def security_provider_interface_name(mbean_interface):
+def security_provider_interface_name(mbean_interface_name):
     """
     Return the name that is used to look up the custom Security Provider MBeanInfo.
 
     This is too tightly coupled to be in this class.
     This needs something more to differentiate Security Provider Interface which is formatted differently from other
     custom MBean Interface names.
-    :param mbean_interface: interface for the MBean
-    :return: massaged name specific to the Scurity Provider
+    :param mbean_interface_name: interface for the MBean
+    :return: provider class name returned from the massaged MBean name
     """
-    result = mbean_interface
-    idx = mbean_interface.rfind('MBean')
+    result = mbean_interface_name
+    idx = mbean_interface_name.rfind('MBean')
     if idx > 0:
         result = result[:idx]
     return result
@@ -422,7 +422,7 @@ def is_empty(value):
     :return: True if the attribute does not contain a value
     """
     return value is None or (type(value) in [list, dict] and len(value) == 0) or \
-        ((type(value) == str or isinstance(value, String)) and
+        ((isinstance(value, basestring) or isinstance(value, String)) and
             (len(value) == 0 or value == '[]' or value == 'null' or value == 'None'))
 
 

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -2,7 +2,7 @@
 Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
-import javaos as os
+import os
 
 from oracle.weblogic.deploy.aliases import AliasException
 from oracle.weblogic.deploy.discover import DiscoverException
@@ -612,7 +612,7 @@ def _find_mbean_interface(self, location, interfaces):
         _method_name = '_find_mbean_interface'
         mbean_name = None
         for interface in interfaces:
-            interface_name = str(interface)
+            interface_name = str(interface.getTypeName())
             if 'MBean' in interface_name:
                 _logger.finer('WLSDPLY-06126', interface_name, self._alias_helper.get_model_folder_path(location),
                               class_name=_class_name, method_name=_method_name)

core/src/main/python/wlsdeploy/tool/discover/domain_info_discoverer.py

@@ -2,7 +2,7 @@
 Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
-import javaos as os
+import os
 
 from java.io import File
 

core/src/main/python/wlsdeploy/tool/util/filter_helper.py

@@ -3,7 +3,7 @@
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 import imp
-import javaos as os
+import os
 import sys
 
 from wlsdeploy.logging.platform_logger import PlatformLogger