removing deprectaed code

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConfig.java

@@ -36,10 +36,6 @@ public class WLSDeployLoggingConfig {
     private static final String HANDLERS_PROP = "handlers";
     private static final String CONFIG_PROP = "config";
 
-    // Deprecated
-    private static final String WLSDEPLOY_CONSOLE_HANDLER =
-            "oracle.weblogic.deploy.logging.WLSDeployLoggingConsoleHandler";
-
     private static final String WLSDEPLOY_STDOUT_CONSOLE_HANDLER =
             "oracle.weblogic.deploy.logging.WLSDeployLoggingStdoutHandler";
     private static final String WLSDEPLOY_STDERR_CONSOLE_HANDLER =
@@ -172,16 +168,6 @@ public static synchronized File getLoggingPropertiesFile() {
         return new File(loggingPropertiesFile.getAbsolutePath());
     }
 
-    /**
-     * @deprecated as of 1.2.1. Replace call with {@link #getStdoutHandler()}
-     *
-     * @return ConsoleHandler implementation
-     */
-    @Deprecated
-    public static String getConsoleHandler() {
-        return WLSDEPLOY_CONSOLE_HANDLER;
-    }
-
     /**
      * Return the console handler that writes log records to STDOUT.
      * @return Class name of the console handler that writes to STDOUT

core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConsoleHandler.java

@@ -31,9 +31,7 @@
 __optional_arguments = [
     CommandLineArgUtil.ATTRIBUTES_ONLY_SWITCH,
     CommandLineArgUtil.FOLDERS_ONLY_SWITCH,
-    CommandLineArgUtil.RECURSIVE_SWITCH,
-    # deprecated
-    CommandLineArgUtil.MODEL_SAMPLE_SWITCH
+    CommandLineArgUtil.RECURSIVE_SWITCH
 ]
 
 __output_types = [
@@ -66,10 +64,6 @@ def __process_args(args):
                 raise ex
             found = True
 
-    if CommandLineArgUtil.MODEL_SAMPLE_SWITCH in argument_map:
-        __logger.warning('WLSDPLY-10106', CommandLineArgUtil.MODEL_SAMPLE_SWITCH,
-                         class_name=_class_name, method_name=_method_name)
-
     return model_context_helper.create_context(_program_name, argument_map)
 
 

core/src/main/python/model_help.py

@@ -84,8 +84,6 @@ class CommandLineArgUtil(object):
     TRAILING_ARGS_SWITCH       = '-trailing_arguments'
     ATTRIBUTES_ONLY_SWITCH     = '-attributes_only'
     FOLDERS_ONLY_SWITCH        = '-folders_only'
-    # deprecated
-    MODEL_SAMPLE_SWITCH        = '-model_sample'
     RECURSIVE_SWITCH           = '-recursive'
     UPDATE_RCU_SCHEMA_PASS_SWITCH = '-updateRCUSchemaPassword'
     VALIDATION_METHOD          = '-method'
@@ -105,7 +103,6 @@ class CommandLineArgUtil(object):
         ATTRIBUTES_ONLY_SWITCH,
         ENCRYPT_MANUAL_SWITCH,
         FOLDERS_ONLY_SWITCH,
-        MODEL_SAMPLE_SWITCH,
         SKIP_ARCHIVE_FILE_SWITCH,
         RECURSIVE_SWITCH,
         CANCEL_CHANGES_IF_RESTART_REQ_SWITCH,