Merge remote-tracking branch 'origin/atptest' into atptest

# Conflicts:
#	core/src/main/python/create.py
#	core/src/main/python/wlsdeploy/tool/create/domain_creator.py

Author: Johnny

core/src/main/python/create.py

@@ -90,7 +90,6 @@ def __process_args(args):
     """
     cla_util = CommandLineArgUtil(_program_name, __required_arguments, __optional_arguments)
     required_arg_map, optional_arg_map = cla_util.process_args(args, True)
-
     __verify_required_args_present(required_arg_map)
     __process_java_home_arg(optional_arg_map)
     __process_domain_location_args(optional_arg_map)

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

@@ -871,6 +871,7 @@ def __configure_fmw_infra_database(self):
             svc_table_ds_name = self.wls_helper.get_jrf_service_table_datasource_name()
             if token_name is not None:
                 location.add_name_token(token_name, svc_table_ds_name)
+<<<<<<< HEAD
 
             location.append_location(JDBC_RESOURCE)
             location.append_location(JDBC_DRIVER_PARAMS)
@@ -894,11 +895,36 @@ def __configure_fmw_infra_database(self):
             location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
             token_name = self.alias_helper.get_name_token(location)
 
+=======
+
+            location.append_location(JDBC_RESOURCE)
+            location.append_location(JDBC_DRIVER_PARAMS)
+            wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+            self.wlst_helper.cd(wlst_path)
+
+            svc_table_driver_name = self.wls_helper.get_stb_data_source_jdbc_driver_name()
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_NAME, svc_table_driver_name)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name)
+
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, URL, fmw_database)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name)
+
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, PASSWORD_ENCRYPTED,
+                                                                    rcu_schema_pwd, masked=True)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value, JDBC_DRIVER_PARAMS, svc_table_ds_name, masked=True)
+
+            location.append_location(JDBC_DRIVER_PARAMS_PROPERTIES)
+            token_name = self.alias_helper.get_name_token(location)
+>>>>>>> origin/atptest
             if token_name is not None:
                 location.add_name_token(token_name, DRIVER_PARAMS_USER_PROPERTY)
 
             stb_user = self.wls_helper.get_stb_user_name(rcu_prefix)
             self.logger.fine('WLSDPLY-12222', stb_user, class_name=self.__class_name, method_name=_method_name)
+<<<<<<< HEAD
             wlst_path = self.alias_helper.get_wlst_attributes_path(location)
             self.wlst_helper.cd(wlst_path)
             wlst_name, wlst_value = \
@@ -910,6 +936,18 @@ def __configure_fmw_infra_database(self):
             if self.wls_helper.is_database_defaults_supported():
                 self.wlst_helper.get_database_defaults()
 
+=======
+
+            wlst_path = self.alias_helper.get_wlst_attributes_path(location)
+            self.wlst_helper.cd(wlst_path)
+            wlst_name, wlst_value = \
+                self.alias_helper.get_wlst_attribute_name_and_value(location, DRIVER_PARAMS_PROPERTY_VALUE, stb_user)
+            self.wlst_helper.set_if_needed(wlst_name, wlst_value,
+                                           JDBC_DRIVER_PARAMS_PROPERTIES, DRIVER_PARAMS_USER_PROPERTY)
+
+            self.logger.info('WLSDPLY-12223', class_name=self.__class_name, method_name=_method_name)
+            self.wlst_helper.get_database_defaults()
+>>>>>>> origin/atptest
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return

core/src/main/python/wlsdeploy/util/cla_utils.py

@@ -66,6 +66,7 @@ class CommandLineArgUtil(object):
     VARIABLE_INJECTOR_FILE_SWITCH   = '-variable_injector_file'
     VARIABLE_KEYWORDS_FILE_SWITCH   = '-variable_keywords_file'
     VARIABLE_PROPERTIES_FILE_SWITCH = '-variable_properties_file'
+
     # a slot to stash the parsed domain typedef dictionary
     DOMAIN_TYPEDEF             = 'domain_typedef'
     # a slot to stash the archive file object
@@ -969,6 +970,7 @@ def _validate_variable_properties_file_arg(self, value):
             raise ex
         return variables.getAbsolutePath()
 
+
     ###########################################################################
     # Helper methods                                                          #
     ###########################################################################