fix model_diff names (#611)

Co-authored-by: Johnny Shum <cbdream99@gmail.com>

Author: jshum2479

core/src/main/python/compare_model.py

@@ -50,8 +50,8 @@
 BLANK_LINE=""
 
 _program_name = 'compareModel'
-_class_name = 'model_diff'
-__logger = PlatformLogger('wlsdeploy.model_diff')
+_class_name = 'compare_model'
+__logger = PlatformLogger('wlsdeploy.compare_model')
 
 __required_arguments = [
     CommandLineArgUtil.ORACLE_HOME_SWITCH
@@ -595,7 +595,7 @@ def main():
             file_name = None
             if len(compare_msgs) > 0:
                 try:
-                    file_name = _outputdir + '/model_diff_stdout'
+                    file_name = _outputdir + '/compare_model_stdout'
                     fos = JFileOutputStream(file_name, False)
                     writer = JPrintWriter(fos, True)
                     writer.println(BLANK_LINE)

installer/src/main/bin/compareModel.cmd

@@ -68,7 +68,7 @@ ECHO           -oracle_home ^<oracle_home^>
 ECHO           [-output_dir ^<output_dir^> write the outputs to the directory specified]
 ECHO           [                        diffed_model.json - json output of the differences between the models]
 ECHO           [                        diffed_model.yaml - yaml output of the differences between the models]
-ECHO           [                        model_diff_stdout - stdout of the tool compareModel ]
+ECHO           [                        compare_model_stdout - stdout of the tool compareModel ]
 ECHO           [-variable_file ^<variable file^>  variable file used for macro substitution]
 ECHO           ^<new model^> ^<old model^>      Must be the last two arguments and must be same extensions (yaml or json)
 ECHO.

installer/src/main/bin/compareModel.sh

@@ -35,13 +35,13 @@ usage() {
   echo "          [-output_dir <output_dir> write the outputs to the directory specified]"
   echo "          [                        diffed_model.json - json output of the differences between the models]"
   echo "          [                        diffed_model.yaml - yaml output of the differences between the models]"
-  echo "          [                        model_diff_stdout - stdout of the tool compareModel ]"
+  echo "          [                        compare_model_stdout - stdout of the tool compareModel ]"
   echo "          [-variable_file <variable file>  variable file used for macro substitution]"
   echo "          <new model> <old model>      Must be the last two arguments and must be same extensions (yaml or json)"
   echo ""
 }
 
-WLSDEPLOY_PROGRAM_NAME="modelDiff"; export WLSDEPLOY_PROGRAM_NAME
+WLSDEPLOY_PROGRAM_NAME="compareModel"; export WLSDEPLOY_PROGRAM_NAME
 
 scriptName=`basename $0`
 scriptPath=$(dirname "$0")

site/compare.md

@@ -283,4 +283,4 @@ Comparing the new and old models:
 
     diffed_model.json
     diffed_model.yaml
-    model_diff_stdout
+    compare_model_stdout