trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r938979 [3/5] - in /incubator/trafficserver/traffic/trunk: doc/man/ iocore/cache/ iocore/cluster/ iocore/eventsystem/ libinktomi++/ librecords/ proxy/ proxy/api/include/ proxy/config/ proxy/congest/ proxy/http2/ proxy/logging/ proxy/mgmt2/ ...
Date Wed, 28 Apr 2010 13:54:20 GMT
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc Wed Apr 28 13:54:17 2010
@@ -59,9 +59,6 @@ CliCreateCommands()
 
   createCommand("show:http", Cmd_ShowHttp, NULL, CLI_COMMAND_EXTERNAL, "show:http", "HTTP protocol configuration");
 
-  createCommand("show:nntp", Cmd_ShowNntp, CmdArgs_ShowNntp, CLI_COMMAND_EXTERNAL,
-                "show:nntp [config-xml]", "NNTP protocol configuration");
-
   createCommand("show:ftp", Cmd_ShowFtp, NULL, CLI_COMMAND_EXTERNAL, "show:ftp", "FTP protocol configuration");
 
   createCommand("show:icp", Cmd_ShowIcp, CmdArgs_ShowIcp, CLI_COMMAND_EXTERNAL,
@@ -117,8 +114,6 @@ CliCreateCommands()
 
   createCommand("show:http-stats", Cmd_ShowHttpStats, NULL, CLI_COMMAND_EXTERNAL, "show:http-stats", "HTTP statistics");
 
-  createCommand("show:nntp-stats", Cmd_ShowNntpStats, NULL, CLI_COMMAND_EXTERNAL, "show:nntp-stats", "NNTP statistics");
-
   createCommand("show:ftp-stats", Cmd_ShowFtpStats, NULL, CLI_COMMAND_EXTERNAL, "show:ftp-stats", "FTP statistics");
 
   createCommand("show:icp-stats", Cmd_ShowIcpStats, NULL, CLI_COMMAND_EXTERNAL, "show:icp-stats", "ICP statistics");
@@ -247,7 +242,7 @@ CliCreateCommands()
 
 
   createCommand("config:cache", Cmd_ConfigCache, CmdArgs_ConfigCache, CLI_COMMAND_EXTERNAL,
-                "config:cache <http | nntp | ftp> <on | off>\n"
+                "config:cache <http | ftp> <on | off>\n"
                 "config:cache ignore-bypass <on | off>\n"
                 "config:cache <max-object-size | max-alternates> <int>\n"
                 "config:cache file <url-config-file>\n"
@@ -274,7 +269,7 @@ CliCreateCommands()
                 "config:logging collation secret <string> tagged <on | off> orphan-limit <int>\n"
                 "config:logging format <squid | netscape-common | netscape-ext | netscape-ext2> <on | off>\n"
                 "               type <ascii | binary> file <string> header <string>\n"
-                "config:logging splitting <nntp | icp | http> <on | off>\n"
+                "config:logging splitting <icp | http> <on | off>\n"
                 "config:logging custom <on | off> format <traditional | xml>\n"
                 "config:logging rolling <on | off> offset <hour> interval <hours>\n"
                 "               auto-delete <on | off>", "Configure Logging");
@@ -306,25 +301,6 @@ CliCreateCommands()
                 "config:network int <interface> netmask <x.x.x.x>\n"
                 "config:network int <interface> gateway <x.x.x.x | default>\n", "Configure Network Settings");
 
-  createCommand("config:nntp", Cmd_ConfigNNTP, CmdArgs_ConfigNNTP, CLI_COMMAND_EXTERNAL,
-                "config:nntp status <on | off>\n"
-#if 0
-                "config:nntp port <int>\n"
-                "config:nntp connect-msg <posting | non-posting> <string>\n"
-                "config:nntp <posting-status | access-control | v2-auth | local-auth> <on | off>\n"
-                "config:nntp <clustering | allow-feeds | background-posting> <on | off>\n"
-#endif
-                "config:nntp <obey-cancel | obey-newgroups | obey-rmgroups> <on | off>\n"
-                "config:nntp <inactive-timeout | check-new-groups | check-cancelled> <seconds>\n"
-                "config:nntp <check-parent | check-pull> <seconds>\n"
-#if 0
-                "config:nntp <check-parent | check-cluster | check-pull> <seconds>\n"
-                "config:nntp auth-server <string>\n"
-                "config:nntp auth-port <seconds>\n"
-                "config:nntp auth-timeout <seconds>\n" "config:nntp client-throttle <bytes per second | 0>\n"
-#endif
-                "config:nntp <nntp-servers | nntp-access> <url-config-file>", "NNTP Configuration");
-
   createCommand("config:alarms", Cmd_ConfigAlarm, CmdArgs_ConfigAlarm, CLI_COMMAND_EXTERNAL,
                 "config:alarms resolve-name <string>\n"
                 "config:alarms resolve-number <int>\n"

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Wed Apr 28 13:54:17 2010
@@ -844,7 +844,6 @@ Cmd_ConfigPorts(ClientData clientData, T
       case CMD_CONFIG_PORTS_CLUSTER:
       case CMD_CONFIG_PORTS_CLUSTER_RS:
       case CMD_CONFIG_PORTS_CLUSTER_MC:
-      case CMD_CONFIG_PORTS_NNTP_SERVER:
       case CMD_CONFIG_PORTS_FTP_SERVER:
       case CMD_CONFIG_PORTS_SOCKS_SERVER:
       case CMD_CONFIG_PORTS_ICP:
@@ -853,7 +852,7 @@ Cmd_ConfigPorts(ClientData clientData, T
     }
   }
   Cli_Error(ERR_COMMAND_SYNTAX,
-            "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n nntp-server | ftp-server | ssl | \n socks-server | icp > \n <port | ports list>\n");
+            "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n ftp-server | ssl | \n socks-server | icp > \n <port | ports list>\n");
   return CMD_ERROR;
 
 }
@@ -880,8 +879,6 @@ CmdArgs_ConfigPorts()
                  (char *) NULL, CMD_CONFIG_PORTS_CLUSTER_RS, "Set Ports for cluster-rs", (char *) NULL);
   createArgument("cluster-mc", 1, CLI_ARGV_OPTION_INT_VALUE,
                  (char *) NULL, CMD_CONFIG_PORTS_CLUSTER_MC, "Set Ports for cluster-mc", (char *) NULL);
-  createArgument("nntp-server", 1, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_PORTS_NNTP_SERVER, "Set Ports for nntp-server", (char *) NULL);
   createArgument("ftp-server", 1, CLI_ARGV_OPTION_INT_VALUE,
                  (char *) NULL, CMD_CONFIG_PORTS_FTP_SERVER, "Set Ports for ftp-server", (char *) NULL);
   createArgument("ssl", 1, CLI_ARGV_OPTION_NAME_VALUE,
@@ -1050,293 +1047,6 @@ CmdArgs_ConfigLdap()
 }
 
 
-
-////////////////////////////////////////////////////////////////
-// Cmd_ConfigNNTP
-//
-// This is the callback function for the "config:nntp" command.
-//
-// Parameters:
-//    clientData -- information about parsed arguments
-//    interp -- the Tcl interpreter
-//    argc -- number of command arguments
-//    argv -- the command arguments
-//
-int
-Cmd_ConfigNNTP(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
-  /* call to processArgForCommand must appear at the beginning
-   * of each command's callback function
-   */
-  INKString plugin_name = NULL;
-  INKError status = INK_ERR_OKAY;
-  if (processArgForCommand(interp, argc, argv) != CLI_OK) {
-    return CMD_ERROR;
-  }
-
-  if (processHelpCommand(argc, argv) == CLI_OK)
-    return CMD_OK;
-
-  if (cliCheckIfEnabled("config:nntp") == CLI_ERROR) {
-    return CMD_ERROR;
-  }
-  Cli_Debug("Cmd_ConfigNNTP argc %d\n", argc);
-  status = Cli_RecordGetString("proxy.config.nntp.plugin_name", &plugin_name);
-  if (status != INK_ERR_OKAY) {
-    return status;
-  }
-  if (Cli_CheckPluginStatus(plugin_name) != CLI_OK) {
-    Cli_Printf("NNTP is not installed.\n\n");
-    return CMD_ERROR;
-  };
-
-  cli_cmdCallbackInfo *cmdCallbackInfo;
-  cli_parsedArgInfo *argtable, *infoPtr;
-
-  cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
-  argtable = cmdCallbackInfo->parsedArgTable;
-  infoPtr = argtable;
-
-  if (argc == 1) {
-    Cli_Error(ERR_COMMAND_SYNTAX, cmdCallbackInfo->command_usage);
-    return CMD_ERROR;
-  }
-
-  if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
-    switch (infoPtr->parsed_args) {
-    case CMD_CONFIG_NNTP_STATUS:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.enabled", argtable->arg_string));
-#if 0
-    case CMD_CONFIG_NNTP_PORT:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.server_port", argtable->arg_int));
-
-    case CMD_CONFIG_NNTP_CONNECTMSG:
-      infoPtr++;
-      if (ConfigNNTPConnectmsg(infoPtr->parsed_args, infoPtr->arg_string) == CLI_ERROR) {
-        infoPtr--;
-      }
-      break;
-
-    case CMD_CONFIG_NNTP_POSTINGSTATUS:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.posting_enabled", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_ACCESSCONTROL:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.access_control_enabled", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_v2AUTH:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.v2_authentication", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_LOCALAUTH:
-      return (Cli_RecordOnOff_Action((argc == 3),
-                                     "proxy.config.nntp.run_local_authentication_server", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_CLUSTERING:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.cluster_enabled", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_ALLOWFEEDS:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.feed_enabled", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_ACCESSLOGS:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.logging_enabled", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_BACKPOSTING:
-      return (Cli_RecordOnOff_Action((argc == 3),
-                                     "proxy.config.nntp.background_posting_enabled", argtable->arg_string));
-#endif
-    case CMD_CONFIG_NNTP_OBEYCANCEL:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.obey_control_cancel", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_OBEYNEWGROUPS:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.obey_control_newgroup", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_OBEYRMGROUPS:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.obey_control_rmgroup", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_INACTIVETIMEOUT:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.inactivity_timeout", argtable->arg_int));
-
-    case CMD_CONFIG_NNTP_CHECKNEWGROUPS:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.check_newgroups_every", argtable->arg_int));
-
-    case CMD_CONFIG_NNTP_CHECKCANCELLED:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.check_cancels_every", argtable->arg_int));
-
-    case CMD_CONFIG_NNTP_CHECKPARENT:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.group_check_parent_every", argtable->arg_int));
-#if 0
-    case CMD_CONFIG_NNTP_CHECKCLUSTER:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.group_check_cluster_every", argtable->arg_int));
-#endif
-    case CMD_CONFIG_NNTP_CHECKPULL:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.check_pull_every", argtable->arg_int));
-#if 0
-    case CMD_CONFIG_NNTP_AUTHSERVER:
-      return (Cli_RecordString_Action((argc == 3), "proxy.config.nntp.authorization_hostname", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_AUTHPORT:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.authorization_port", argtable->arg_int));
-
-    case CMD_CONFIG_NNTP_AUTHTIMEOUT:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.authorization_server_timeout", argtable->arg_int));
-
-    case CMD_CONFIG_NNTP_CLIENTTHROTTLE:
-      return (Cli_RecordInt_Action((argc == 3), "proxy.config.nntp.client_speed_throttle", argtable->arg_int));
-    case CMD_CONFIG_NNTP_SERVERS:
-      return (Cli_ConfigFileURL_Action(INK_FNAME_NNTP_SERVERS, "nntp_servers.config", argtable->arg_string));
-
-    case CMD_CONFIG_NNTP_ACCESS:
-      return (Cli_ConfigFileURL_Action(INK_FNAME_NNTP_ACCESS, "nntp_servers.config", argtable->arg_string));
-#endif
-    case CMD_CONFIG_NNTP_CONFIG_XML:
-      return (Cli_ConfigFileURL_Action(INK_FNAME_NNTP_CONFIG_XML, "nntp-config.xml", argtable->arg_string));
-    }
-  }
-  Cli_Error(ERR_COMMAND_SYNTAX, cmdCallbackInfo->command_usage);
-  return CMD_ERROR;
-}
-
-int
-ConfigNNTPConnectmsg(int option, char *string)
-{
-  INKActionNeedT action_need = INK_ACTION_UNDEFINED;
-  INKError status = INK_ERR_OKAY;
-  INKString str_val = NULL;
-  char buf[256];
-
-  Cli_Debug("ConfigNNTPConnectmsg: posting | non-posting %s\n", string);
-  if (option == CMD_CONFIG_NNTP_POSTING) {
-    if (string) {
-      status = Cli_RecordSetString("proxy.config.nntp.posting_ok_message", (INKString) string, &action_need);
-      Cli_Printf("connect-msg posting set to %s\n", string);
-    } else {
-      status = Cli_RecordGetString("proxy.config.nntp.posting_ok_message", &str_val);
-      Cli_Printf("%s\n", (char *) str_val);
-    }
-  } else if (option == CMD_CONFIG_NNTP_NONPOSTING) {
-    if (string) {
-      status = Cli_RecordSetString("proxy.config.nntp.posting_not_ok_message", (INKString) string, &action_need);
-      Cli_Printf("connect-msg non-posting set to %s\n", string);
-    } else {
-      status = Cli_RecordGetString("proxy.config.nntp.posting_not_ok_message", &str_val);
-      Cli_Printf("%s\n", (char *) str_val);
-    }
-  } else {
-    snprintf(buf, sizeof(buf), "config nntp connect-msg <posting | non-posting> <string>\n");
-    Cli_Printf(buf);
-    return CLI_ERROR;
-  }
-  if (status != INK_ERR_OKAY) {
-    Cli_ConfigEnactChanges(action_need);
-    return CLI_ERROR;
-  }
-
-  return CLI_OK;
-}
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigNNTP
-//
-// Register "config:nntp" arguments with the Tcl interpreter.
-//
-
-int
-CmdArgs_ConfigNNTP()
-{
-  createArgument("status", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_STATUS, "Set NNTP <on|off>", (char *) NULL);
-#if 0
-  createArgument("port", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_PORT, "Port <int>", (char *) NULL);
-
-  createArgument("connect-msg", CLI_ARGV_NO_POS, CLI_ARGV_CONST_OPTION,
-                 (char *) NULL, CMD_CONFIG_NNTP_CONNECTMSG, "connect-msg <posting | non-posting> <string>",
-                 (char *) NULL);
-  createArgument("posting", CMD_CONFIG_NNTP_CONNECTMSG, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_POSTING, "connect-msg posting <string>", (char *) NULL);
-  createArgument("non-posting", CMD_CONFIG_NNTP_CONNECTMSG, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_NONPOSTING, "connect-msg non-posting <string>", (char *) NULL);
-
-  createArgument("posting-status", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_POSTINGSTATUS, "Posting <on|off>", (char *) NULL);
-
-  createArgument("access-control", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_ACCESSCONTROL, "Access Control <on|off>", (char *) NULL);
-
-  createArgument("v2-auth", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_v2AUTH, "NNTP v2 Auth <on|off>", (char *) NULL);
-
-  createArgument("local-auth", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_LOCALAUTH, "Local Auth <on|off>", (char *) NULL);
-
-  createArgument("clustering", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CLUSTERING, "Clustering <on|off>", (char *) NULL);
-
-  createArgument("allow-feeds", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_ALLOWFEEDS, "Allow Feeds <on|off>", (char *) NULL);
-
-  createArgument("access-logs", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_ACCESSLOGS, "Access Logs <on|off>", (char *) NULL);
-
-  createArgument("background-posting", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_BACKPOSTING, "Background Posting <on|off>", (char *) NULL);
-#endif
-  createArgument("obey-cancel", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_OBEYCANCEL, "Obey Cancel <on|off>", (char *) NULL);
-
-  createArgument("obey-newgroups", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_OBEYNEWGROUPS, "Obey Newgroups <on|off>", (char *) NULL);
-
-  createArgument("obey-rmgroups", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_OBEYRMGROUPS, "Obey Rmgroups <on|off>", (char *) NULL);
-
-  createArgument("inactive-timeout", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_INACTIVETIMEOUT, "Inactive Timeout <seconds>", (char *) NULL);
-
-  createArgument("check-new-groups", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CHECKNEWGROUPS, "Check New Groups interval <seconds>", (char *) NULL);
-
-  createArgument("check-cancelled", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CHECKCANCELLED, "Check Cancelled interval <seconds>", (char *) NULL);
-
-  createArgument("check-parent", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CHECKPARENT, "Check Parent interval <seconds>", (char *) NULL);
-
-  createArgument("check-pull", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CHECKPULL, "Check Pull interval <seconds>", (char *) NULL);
-#if 0
-  createArgument("check-cluster", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CHECKCLUSTER, "Check Cluster interval <seconds>", (char *) NULL);
-
-  createArgument("check-pull", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CHECKPULL, "Check Pull interval <seconds>", (char *) NULL);
-
-  createArgument("auth-server", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_AUTHSERVER, "Auth Server <string>", (char *) NULL);
-
-  createArgument("auth-port", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_AUTHPORT, "Auth Port <int>", (char *) NULL);
-
-  createArgument("auth-timeout", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_AUTHTIMEOUT, "Auth Timeout <seconds>", (char *) NULL);
-
-  createArgument("client-throttle", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_INT_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CLIENTTHROTTLE,
-                 "Client Throttle <bytes per second | 0>", (char *) NULL);
-
-  createArgument("nntp-servers", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_SERVERS, "Update NNTP Servers config file <url>", (char *) NULL);
-
-  createArgument("nntp-access", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_ACCESS, "Update NNTP Access config file <url>", (char *) NULL);
-#endif
-  createArgument("config-xml", CLI_ARGV_NO_POS, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_NNTP_CONFIG_XML, "Update nntp config file <url>", (char *) NULL);
-  return 0;
-
-
-}
-
-
 ////////////////////////////////////////////////////////////////
 // Cmd_ConfigClock
 //
@@ -2144,9 +1854,6 @@ Cmd_ConfigCache(ClientData clientData, T
     case CMD_CONFIG_CACHE_HTTP:
       return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.http.cache.http", argtable->arg_string));
 
-    case CMD_CONFIG_CACHE_NNTP:
-      return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.nntp.cache_enabled", argtable->arg_string));
-
     case CMD_CONFIG_CACHE_FTP:
       return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.http.cache.ftp", argtable->arg_string));
 
@@ -2234,8 +1941,6 @@ CmdArgs_ConfigCache()
 {
   createArgument("http", 1, CLI_ARGV_OPTION_NAME_VALUE,
                  (char *) NULL, CMD_CONFIG_CACHE_HTTP, "HTTP Protocol caching <on|off>", (char *) NULL);
-  createArgument("nntp", 1, CLI_ARGV_OPTION_NAME_VALUE,
-                 (char *) NULL, CMD_CONFIG_CACHE_NNTP, "NNTP Protocol caching <on|off>", (char *) NULL);
   createArgument("ftp", 1, CLI_ARGV_OPTION_NAME_VALUE,
                  (char *) NULL, CMD_CONFIG_CACHE_FTP, "FTP Protocol caching <on|off>", (char *) NULL);
   createArgument("ignore-bypass", 1, CLI_ARGV_OPTION_NAME_VALUE,
@@ -2810,9 +2515,7 @@ CmdArgs_ConfigLogging()
 
   createArgument("splitting", 1, CLI_ARGV_CONST_OPTION,
                  (char *) NULL, CMD_CONFIG_LOGGING_SPLITTING,
-                 "Splitting of logs for protocols <nntp | icp | http>", (char *) NULL);
-  createArgument("nntp", CMD_CONFIG_LOGGING_SPLITTING, CLI_ARGV_CONST_OPTION,
-                 (char *) NULL, CMD_CONFIG_LOGGING_SPLITTING_NNTP, "Split NNTP <on | off>", (char *) NULL);
+                 "Splitting of logs for protocols <icp | http>", (char *) NULL);
   createArgument("icp", CMD_CONFIG_LOGGING_SPLITTING, CLI_ARGV_CONST_OPTION,
                  (char *) NULL, CMD_CONFIG_LOGGING_SPLITTING_ICP, "Split ICP <on | off>", (char *) NULL);
   createArgument("http", CMD_CONFIG_LOGGING_SPLITTING, CLI_ARGV_CONST_OPTION,
@@ -3371,9 +3074,6 @@ ConfigPortsSet(int arg_ref, void *valueP
   case CMD_CONFIG_PORTS_CLUSTER_MC:
     status = Cli_RecordSetInt("proxy.config.cluster.mcport", *(INKInt *) valuePtr, &action_need);
     break;
-  case CMD_CONFIG_PORTS_NNTP_SERVER:
-    status = Cli_RecordSetInt("proxy.config.nntp.server_port", *(INKInt *) valuePtr, &action_need);
-    break;
   case CMD_CONFIG_PORTS_FTP_SERVER:
     status = Cli_RecordSetInt("proxy.config.ftp.proxy_server_port", *(INKInt *) valuePtr, &action_need);
     break;
@@ -3462,13 +3162,6 @@ ConfigPortsGet(int arg_ref)
     }
     Cli_Printf("%d\n", int_val);
     break;
-  case CMD_CONFIG_PORTS_NNTP_SERVER:
-    status = Cli_RecordGetInt("proxy.config.nntp.server_port", &int_val);
-    if (status) {
-      return status;
-    }
-    Cli_Printf("%d\n", int_val);
-    break;
   case CMD_CONFIG_PORTS_FTP_SERVER:
     status = Cli_RecordGetInt("proxy.config.ftp.proxy_server_port", &int_val);
     if (status) {
@@ -3503,7 +3196,7 @@ ConfigPortsGet(int arg_ref)
     break;
   default:
     Cli_Error(ERR_COMMAND_SYNTAX,
-              "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n nntp-server | ftp-server | ssl | \n socks-server | icp > \n <port | ports list>\n");
+              "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n ftp-server | ssl | \n socks-server | icp > \n <port | ports list>\n");
 
     return CLI_ERROR;
   }
@@ -5955,16 +5648,6 @@ ConfigLoggingSplitting(int arg_ref_proto
   case 0:                      //get
 
     switch (arg_ref_protocol) {
-    case CMD_CONFIG_LOGGING_SPLITTING_NNTP:
-
-      status = Cli_RecordGetInt("proxy.config.log2.separate_nntp_logs", &int_val);
-      if (status) {
-        return status;
-      }
-      if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
-        return CLI_ERROR;
-      }
-      return CLI_OK;
     case CMD_CONFIG_LOGGING_SPLITTING_ICP:
       status = Cli_RecordGetInt("proxy.config.log2.separate_icp_logs", &int_val);
       if (status) {
@@ -6004,13 +5687,6 @@ ConfigLoggingSplitting(int arg_ref_proto
       }
 
       switch (arg_ref_protocol) {
-      case CMD_CONFIG_LOGGING_SPLITTING_NNTP:
-        status = Cli_RecordSetInt("proxy.config.log2.separate_nntp_logs", int_val, &action_need);
-        if (status) {
-          return status;
-        }
-        return (Cli_ConfigEnactChanges(action_need));
-
       case CMD_CONFIG_LOGGING_SPLITTING_ICP:
         status = Cli_RecordSetInt("proxy.config.log2.separate_icp_logs", int_val, &action_need);
         if (status) {

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h Wed Apr 28 13:54:17 2010
@@ -54,7 +54,6 @@ typedef enum
   CMD_CONFIG_PORTS_CLUSTER,
   CMD_CONFIG_PORTS_CLUSTER_RS,
   CMD_CONFIG_PORTS_CLUSTER_MC,
-  CMD_CONFIG_PORTS_NNTP_SERVER,
   CMD_CONFIG_PORTS_FTP_SERVER,
   CMD_CONFIG_PORTS_SSL,
   CMD_CONFIG_PORTS_SOCKS_SERVER,
@@ -182,7 +181,6 @@ typedef enum
   CMD_CONFIG_CACHE_ON,
   CMD_CONFIG_CACHE_OFF,
   CMD_CONFIG_CACHE_HTTP,
-  CMD_CONFIG_CACHE_NNTP,
   CMD_CONFIG_CACHE_FTP,
   CMD_CONFIG_CACHE_IGNORE_BYPASS,
   CMD_CONFIG_CACHE_MAX_OBJECT_SIZE,
@@ -265,7 +263,6 @@ typedef enum
   CMD_CONFIG_LOGGING_FILE,
   CMD_CONFIG_LOGGING_HEADER,
   CMD_CONFIG_LOGGING_SPLITTING,
-  CMD_CONFIG_LOGGING_SPLITTING_NNTP,
   CMD_CONFIG_LOGGING_SPLITTING_ICP,
   CMD_CONFIG_LOGGING_SPLITTING_HTTP,
   CMD_CONFIG_LOGGING_CUSTOM,
@@ -289,35 +286,6 @@ typedef enum
   CMD_CONFIG_NETWORK_START,
   CMD_CONFIG_NETWORK_PROTOCOL,
   CMD_CONFIG_GATEWAY,
-  CMD_CONFIG_NNTP_PORT,
-  CMD_CONFIG_NNTP_CONNECTMSG,
-  CMD_CONFIG_NNTP_POSTING,
-  CMD_CONFIG_NNTP_NONPOSTING,
-  CMD_CONFIG_NNTP_POSTINGSTATUS,
-  CMD_CONFIG_NNTP_ACCESSCONTROL,
-  CMD_CONFIG_NNTP_v2AUTH,
-  CMD_CONFIG_NNTP_LOCALAUTH,
-  CMD_CONFIG_NNTP_CLUSTERING,
-  CMD_CONFIG_NNTP_ALLOWFEEDS,
-  CMD_CONFIG_NNTP_ACCESSLOGS,
-  CMD_CONFIG_NNTP_BACKPOSTING,
-  CMD_CONFIG_NNTP_OBEYCANCEL,
-  CMD_CONFIG_NNTP_OBEYNEWGROUPS,
-  CMD_CONFIG_NNTP_OBEYRMGROUPS,
-  CMD_CONFIG_NNTP_STATUS,
-  CMD_CONFIG_NNTP_CHECKNEWGROUPS,
-  CMD_CONFIG_NNTP_CHECKCANCELLED,
-  CMD_CONFIG_NNTP_INACTIVETIMEOUT,
-  CMD_CONFIG_NNTP_CHECKPARENT,
-  CMD_CONFIG_NNTP_CHECKCLUSTER,
-  CMD_CONFIG_NNTP_CHECKPULL,
-  CMD_CONFIG_NNTP_AUTHSERVER,
-  CMD_CONFIG_NNTP_AUTHPORT,
-  CMD_CONFIG_NNTP_AUTHTIMEOUT,
-  CMD_CONFIG_NNTP_CLIENTTHROTTLE,
-  CMD_CONFIG_NNTP_SERVERS,
-  CMD_CONFIG_NNTP_ACCESS,
-  CMD_CONFIG_NNTP_CONFIG_XML,
   CMD_CONFIG_NTLM_STATUS,
   CMD_CONFIG_NTLM_DOMAIN_CTRL,
   CMD_CONFIG_NTLM_NTDOMAIN,
@@ -640,31 +608,6 @@ int Cmd_ConfigSocks(ClientData clientDat
 int CmdArgs_ConfigSocks();
 
 ////////////////////////////////////////////////////////////////
-// Cmd_ConfigNNTP
-//
-// This is the callback function for the "config:nntp" command.
-//
-// Parameters:
-//    clientData -- information about parsed arguments
-//    interp -- the Tcl interpreter
-//    argc -- number of command arguments
-//    argv -- the command arguments
-//
-int Cmd_ConfigNNTP(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigNNTP
-//
-// Register "config:nntp" arguments with the Tcl interpreter.
-//
-int CmdArgs_ConfigNNTP();
-
-///////////////////////////////////////////////////////////////
-// Functions to implement config:nntp
-//
-int ConfigNNTPConnectmsg(int option, char *string);
-
-////////////////////////////////////////////////////////////////
 // Cmd_ConfigClock
 //
 // This is the callback function for the "config:clock" command.

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc Wed Apr 28 13:54:17 2010
@@ -273,79 +273,6 @@ Cmd_ShowHttp(ClientData clientData, Tcl_
 }
 
 ////////////////////////////////////////////////////////////////
-// Cmd_ShowNntp
-//
-// This is the callback function for the "show:nntp" command.
-//
-// Parameters:
-//    clientData -- information about parsed arguments
-//    interp -- the Tcl interpreter
-//    argc -- number of command arguments
-//    argv -- the command arguments
-//
-int
-Cmd_ShowNntp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
-  INKString plugin_name = NULL;
-  INKError status = INK_ERR_OKAY;
-  /* call to processArgForCommand must appear at the beginning
-   * of each command's callback function
-   */
-  if (processArgForCommand(interp, argc, argv) != CLI_OK) {
-    return CMD_ERROR;
-  }
-
-  if (processHelpCommand(argc, argv) == CLI_OK)
-    return CMD_OK;
-
-  Cli_Debug("Cmd_ShowNntp\n");
-  status = Cli_RecordGetString("proxy.config.nntp.plugin_name", &plugin_name);
-  if (status != INK_ERR_OKAY) {
-    return status;
-  }
-  if (Cli_CheckPluginStatus(plugin_name) != CLI_OK) {
-    Cli_Printf("NNTP is not installed.\n\n");
-    return CMD_ERROR;
-  };
-
-  cli_cmdCallbackInfo *cmdCallbackInfo;
-  cli_parsedArgInfo *argtable;
-
-  cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
-  argtable = cmdCallbackInfo->parsedArgTable;
-
-  if (argtable[0].parsed_args != CLI_PARSED_ARGV_END) {
-    if (argtable[0].parsed_args == CMD_SHOW_NNTP_CONFIG) {
-      return (ShowNntpConfig());
-    }
-#if 0
-    if (argtable[0].parsed_args == CMD_SHOW_NNTP_SERVERS) {
-      return (ShowNntpServers());
-    } else if (argtable[0].parsed_args == CMD_SHOW_NNTP_ACCESS) {
-      return (ShowNntpAccess());
-    }
-#endif
-    Cli_Error(ERR_INVALID_COMMAND);
-    return CMD_ERROR;
-  }
-  return (ShowNntp());
-}
-
-int
-CmdArgs_ShowNntp()
-{
-  createArgument("config-xml", 1, CLI_ARGV_CONSTANT,
-                 (char *) NULL, CMD_SHOW_NNTP_CONFIG, "NNTP Configuration", (char *) NULL);
-#if 0
-  createArgument("servers", 1, CLI_ARGV_CONSTANT,
-                 (char *) NULL, CMD_SHOW_NNTP_SERVERS, "NNTP Server Configuration", (char *) NULL);
-  createArgument("access", 1, CLI_ARGV_CONSTANT,
-                 (char *) NULL, CMD_SHOW_NNTP_ACCESS, "NNTP Access Configuration", (char *) NULL);
-#endif
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////
 // Cmd_ShowFtp
 //
 // This is the callback function for the "show:ftp" command.
@@ -1137,46 +1064,6 @@ Cmd_ShowHttpStats(ClientData clientData,
 }
 
 ////////////////////////////////////////////////////////////////
-// Cmd_ShowNntpStats
-//
-// This is the callback function for the "show:nntp-stats" command.
-//
-// Parameters:
-//    clientData -- information about parsed arguments
-//    interp -- the Tcl interpreter
-//    argc -- number of command arguments
-//    argv -- the command arguments
-//
-int
-Cmd_ShowNntpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
-  /* call to processArgForCommand must appear at the beginning
-   * of each command's callback function
-   */
-  INKString plugin_name = NULL;
-  INKError status = INK_ERR_OKAY;
-  if (processArgForCommand(interp, argc, argv) != CLI_OK) {
-    return CMD_ERROR;
-  }
-
-  if (processHelpCommand(argc, argv) == CLI_OK)
-    return CMD_OK;
-
-  Cli_Debug("Cmd_ShowNntpStats\n");
-
-  status = Cli_RecordGetString("proxy.config.nntp.plugin_name", &plugin_name);
-  if (status != INK_ERR_OKAY) {
-    return status;
-  }
-  if (Cli_CheckPluginStatus(plugin_name) != CLI_OK) {
-    Cli_Printf("NNTP is not installed.\n\n");
-    return CMD_ERROR;
-  };
-
-  return (ShowNntpStats());
-}
-
-////////////////////////////////////////////////////////////////
 // Cmd_ShowFtpStats
 //
 // This is the callback function for the "show:ftp-stats" command.
@@ -1649,7 +1536,6 @@ ShowPorts()
   INKInt cluster = -1;
   INKInt cluster_rs = -1;
   INKInt cluster_mc = -1;
-  INKInt nntp_server = -1;
   INKInt ftp_server = -1;
   INKInt socks_server = -1;
   INKInt icp = -1;
@@ -1664,7 +1550,6 @@ ShowPorts()
   Cli_RecordGetInt("proxy.config.cluster.cluster_port", &cluster);
   Cli_RecordGetInt("proxy.config.cluster.rsport", &cluster_rs);
   Cli_RecordGetInt("proxy.config.cluster.mcport", &cluster_mc);
-  Cli_RecordGetInt("proxy.config.nntp.server_port", &nntp_server);
   Cli_RecordGetInt("proxy.config.ftp.proxy_server_port", &ftp_server);
   Cli_RecordGetString("proxy.config.http.ssl_ports", &ssl);
   Cli_RecordGetInt("proxy.config.socks.socks_server_port", &socks_server);
@@ -1679,7 +1564,6 @@ ShowPorts()
   Cli_Printf("Cluster Port ----------- %d\n", cluster);
   Cli_Printf("Cluster RS Port -------- %d\n", cluster_rs);
   Cli_Printf("Cluster MC Port -------- %d\n", cluster_mc);
-  Cli_Printf("NNTP Server Port ------- %d\n", nntp_server);
   Cli_Printf("FTP Proxy Server Port -- %d\n", ftp_server);
   Cli_Printf("SSL Ports -------------- %s\n", (ssl != NULL) ? ssl : "none");
   Cli_Printf("SOCKS Server Port ------ %d\n", socks_server);
@@ -1831,180 +1715,6 @@ ShowHttp()
   return CLI_OK;
 }
 
-// show nntp sub-command
-int
-ShowNntp()
-{
-  // declare and initialize variables
-
-  INKInt nntp_enabled = -1;
-  INKInt nntp_server = -1;
-  INKInt nntp_server_port = 119;
-  INKString connect_msg_allow = NULL;
-  INKString connect_msg_disallow = NULL;
-  INKInt nntp_posting = -1;
-  INKInt nntp_access_control = -1;
-  INKInt nntp_v2_auth = -1;
-  INKInt nntp_run_local_auth_server = -1;
-  INKInt nntp_clustering = -1;
-  INKInt nntp_allow_feeds = -1;
-  INKInt nntp_access_logs = -1;
-  INKInt nntp_bg_posting = -1;
-  INKInt nntp_obey_control_cancel = -1;
-  INKInt nntp_obey_control_newgroup = -1;
-  INKInt nntp_obey_control_rmgroup = -1;
-  INKInt nntp_inactivity_timeout = 600;
-  INKInt nntp_check_newgrp_every = 86400;
-  INKInt nntp_check_cancelled_articles_every = 3600;
-  INKInt nntp_check_parent_server_every = 300;
-  INKInt nntp_check_cluster_every = 60;
-  INKInt nntp_check_pull_groups_every = 600;
-  INKString nntp_auth_server_hostname = NULL;
-  INKInt nntp_auth_server_port = 0;
-  INKInt nntp_local_authserver_timeout = 50000;
-  INKInt nntp_client_speed_throttle = 0;
-
-  // Since so much code is ifdef'ed out, we get tons of warnings here.
-  // Lets avoid those for now ... /leif
-  NOWARN_UNUSED(nntp_server);
-  NOWARN_UNUSED(nntp_server_port);
-  NOWARN_UNUSED(connect_msg_allow);
-  NOWARN_UNUSED(connect_msg_disallow);
-  NOWARN_UNUSED(nntp_posting);
-  NOWARN_UNUSED(nntp_access_control);
-  NOWARN_UNUSED(nntp_v2_auth);
-  NOWARN_UNUSED(nntp_run_local_auth_server);
-  NOWARN_UNUSED(nntp_clustering);
-  NOWARN_UNUSED(nntp_allow_feeds);
-  NOWARN_UNUSED(nntp_access_logs);
-  NOWARN_UNUSED(nntp_bg_posting);
-  NOWARN_UNUSED(nntp_check_cluster_every);
-  NOWARN_UNUSED(nntp_auth_server_hostname);
-  NOWARN_UNUSED(nntp_auth_server_port);
-  NOWARN_UNUSED(nntp_local_authserver_timeout);
-  NOWARN_UNUSED(nntp_client_speed_throttle);
-
-  // retrieve values
-
-  Cli_RecordGetInt("proxy.config.nntp.cache_enabled", &nntp_enabled);
-#if 0
-  Cli_RecordGetInt("proxy.config.nntp.enabled", &nntp_server);
-  Cli_RecordGetInt("proxy.config.nntp.server_port", &nntp_server_port);
-  Cli_RecordGetString("proxy.config.nntp.posting_ok_message", &connect_msg_allow);
-  Cli_RecordGetString("proxy.config.nntp.posting_not_ok_message", &connect_msg_disallow);
-  Cli_RecordGetInt("proxy.config.nntp.posting_enabled", &nntp_posting);
-  Cli_RecordGetInt("proxy.config.nntp.access_control_enabled", &nntp_access_control);
-  Cli_RecordGetInt("proxy.config.nntp.v2_authentication", &nntp_v2_auth);
-  Cli_RecordGetInt("proxy.config.nntp.run_local_authentication_server", &nntp_run_local_auth_server);
-  Cli_RecordGetInt("proxy.config.nntp.cluster_enabled", &nntp_clustering);
-  Cli_RecordGetInt("proxy.config.nntp.feed_enabled", &nntp_allow_feeds);
-  Cli_RecordGetInt("proxy.config.nntp.logging_enabled", &nntp_access_logs);
-  Cli_RecordGetInt("proxy.config.nntp.background_posting_enabled", &nntp_bg_posting);
-#endif
-  Cli_RecordGetInt("proxy.config.nntp.obey_control_cancel", &nntp_obey_control_cancel);
-  Cli_RecordGetInt("proxy.config.nntp.obey_control_newgroup", &nntp_obey_control_newgroup);
-  Cli_RecordGetInt("proxy.config.nntp.obey_control_rmgroup", &nntp_obey_control_rmgroup);
-  Cli_RecordGetInt("proxy.config.nntp.inactivity_timeout", &nntp_inactivity_timeout);
-  Cli_RecordGetInt("proxy.config.nntp.check_newgroups_every", &nntp_check_newgrp_every);
-  Cli_RecordGetInt("proxy.config.nntp.check_cancels_every", &nntp_check_cancelled_articles_every);
-  Cli_RecordGetInt("proxy.config.nntp.group_check_parent_every", &nntp_check_parent_server_every);
-  Cli_RecordGetInt("proxy.config.nntp.check_pull_every", &nntp_check_pull_groups_every);
-#if 0
-  Cli_RecordGetInt("proxy.config.nntp.group_check_cluster_every", &nntp_check_cluster_every);
-  Cli_RecordGetString("proxy.config.nntp.authorization_hostname", &nntp_auth_server_hostname);
-  Cli_RecordGetInt("proxy.config.nntp.authorization_port", &nntp_auth_server_port);
-  Cli_RecordGetInt("proxy.config.nntp.authorization_server_timeout", &nntp_local_authserver_timeout);
-  Cli_RecordGetInt("proxy.config.nntp.client_speed_throttle", &nntp_client_speed_throttle);
-#endif
-  // display results
-
-  Cli_Printf("\n");
-  Cli_PrintEnable("NNTP Caching --------------------------- ", nntp_enabled);
-#if 0
-  Cli_PrintEnable("NNTP Server  --------------------------- ", nntp_server);
-  if (nntp_enabled == 1)
-    Cli_Printf("NNTP Server Port ----------------------- %d\n", nntp_server_port);
-  if (connect_msg_allow)
-    Cli_Printf("Connect Message ------------------------ %s\n", connect_msg_allow);
-  if (connect_msg_disallow)
-    Cli_Printf("Connect Message ------------------------ %s\n", connect_msg_disallow);
-#endif
-  Cli_Printf("NNTP Options:\n");
-#if 0
-  Cli_PrintEnable("  Posting ------------------------------ ", nntp_posting);
-  Cli_PrintEnable("  Access Control ----------------------- ", nntp_access_control);
-  Cli_PrintEnable("  V2 Authentication -------------------- ", nntp_v2_auth);
-  Cli_PrintEnable("  Local Auth. Server ------------------- ", nntp_run_local_auth_server);
-  Cli_PrintEnable("  Clustering --------------------------- ", nntp_clustering);
-  Cli_PrintEnable("  Allow feeds -------------------------- ", nntp_allow_feeds);
-  Cli_PrintEnable("  Access Logs -------------------------- ", nntp_access_logs);
-  Cli_PrintEnable("  Background Posting ------------------- ", nntp_bg_posting);
-#endif
-  Cli_PrintEnable("  Obey Cancel Control ------------------ ", nntp_obey_control_cancel);
-  Cli_PrintEnable("  Obey NewGroups Control --------------- ", nntp_obey_control_newgroup);
-  Cli_PrintEnable("  Obey RmGroups Control ---------------- ", nntp_obey_control_rmgroup);
-  Cli_PrintEnable("Inactivity Timeout --------------------- ", nntp_inactivity_timeout);
-  Cli_Printf("Check for New Groups Every ------------- %d s\n", nntp_check_newgrp_every);
-  Cli_Printf("Check for Cancelled Articles Every------ %d s\n", nntp_check_cancelled_articles_every);
-  Cli_Printf("Check Parent NNTP Server Every---------- %d s\n", nntp_check_parent_server_every);
-  Cli_Printf("Check Pull Groups Every ---------------- %d s\n", nntp_check_pull_groups_every);
-#if 0
-  Cli_Printf("Check Cluster Every -------------------- %d s\n", nntp_check_cluster_every);
-  if (nntp_auth_server_hostname) {
-    Cli_Printf("Authentication Server Host ------------- %s\n", nntp_auth_server_hostname);
-    Cli_Printf("Authentication Server Port ------------- %d\n", nntp_auth_server_port);
-  }
-  Cli_Printf("Local Authentication Server Timeout ---- %d ms\n", nntp_local_authserver_timeout);
-  Cli_Printf("Client Speed Throttle ------------------ %d bytes/s\n", nntp_client_speed_throttle);
-#endif
-  Cli_Printf("\n");
-
-  return CLI_OK;
-}
-
-// show nntp config sub-command
-int
-ShowNntpConfig()
-{
-  INKError status = INK_ERR_OKAY;
-  Cli_Printf("\n");
-  // display nntp_config.xml
-  Cli_Printf("nntp_config.xml\n" "-------------------\n");
-  status = Cli_DisplayRules(INK_FNAME_NNTP_CONFIG_XML);
-  Cli_Printf("\n");
-  return CLI_OK;
-}
-
-#if 0
-// show nntp servers sub-command
-int
-ShowNntpServers()
-{
-  INKError status = INK_ERR_OKAY;
-  Cli_Printf("\n");
-  // display rules from nntp_servers.config
-  Cli_Printf("nntp_servers.config rules\n" "-------------------\n");
-  status = Cli_DisplayRules(INK_FNAME_NNTP_SERVERS);
-  Cli_Printf("\n");
-
-  return status;
-}
-
-// show nntp access sub-command
-int
-ShowNntpAccess()
-{
-  INKError status = INK_ERR_OKAY;
-  Cli_Printf("\n");
-  // display rules from nntp_access.config
-  Cli_Printf("nntp_access.config rules\n" "-------------------\n");
-  status = Cli_DisplayRules(INK_FNAME_NNTP_ACCESS);
-  Cli_Printf("\n");
-
-  return status;
-}
-#endif
-
 // show ftp sub-command
 int
 ShowFtp()
@@ -2120,7 +1830,6 @@ ShowCache()
 
   INKInt cache_http = -1;
   INKInt cache_ftp = -1;
-  INKInt cache_nntp = -1;
   INKInt cache_bypass = -1;
   INKInt max_doc_size = -1;
   INKInt when_to_reval = -1;
@@ -2139,8 +1848,6 @@ ShowCache()
 
   Cli_RecordGetInt("proxy.config.http.cache.http", &cache_http);
   Cli_RecordGetInt("proxy.config.http.cache.ftp", &cache_ftp);
-  Cli_RecordGetInt("proxy.config.nntp.cache_enabled", &cache_nntp);
-  Cli_RecordGetInt("proxy.config.http.cache.ignore_client_no_cache", &cache_bypass);
   Cli_RecordGetInt("proxy.config.cache.max_doc_size", &max_doc_size);
   Cli_RecordGetInt("proxy.config.http.cache.when_to_revalidate", &when_to_reval);
   Cli_RecordGetInt("proxy.config.http.cache.required_headers", &reqd_headers);
@@ -2163,8 +1870,6 @@ ShowCache()
 
   Cli_PrintEnable("FTP Caching ---------------------------- ", cache_ftp);
 
-  Cli_PrintEnable("NNTP Caching --------------------------- ", cache_nntp);
-
   Cli_PrintEnable("Ignore User Requests To Bypass Cache --- ", cache_bypass);
 
   if (max_doc_size == 0)
@@ -2407,7 +2112,6 @@ ShowLogging()
   INKString extended2_file_name = NULL;
   INKString extended2_file_header = NULL;
 
-  INKInt nntp_log = 0;
   INKInt icp_log = 0;
   INKInt http_host_log = 0;
   INKInt custom_log = 0;
@@ -2448,7 +2152,6 @@ ShowLogging()
   Cli_RecordGetString("proxy.config.log2.extended2_log_name", &extended2_file_name);
   Cli_RecordGetString("proxy.config.log2.extended2_log_header", &extended2_file_header);
 
-  Cli_RecordGetInt("proxy.config.log2.separate_nntp_logs", &nntp_log);
   Cli_RecordGetInt("proxy.config.log2.separate_icp_logs", &icp_log);
   Cli_RecordGetInt("proxy.config.log2.separate_host_logs", &http_host_log);
   Cli_RecordGetInt("proxy.config.log2.separate_host_logs", &custom_log);
@@ -2533,7 +2236,6 @@ ShowLogging()
   Cli_Printf("  File Header ---------------------------- %s\n", extended2_file_header);
 
   Cli_Printf("\nSplitting\n");
-  Cli_PrintEnable("  NNTP Log Splitting --------------------- ", nntp_log);
   Cli_PrintEnable("  ICP Log Splitting ---------------------- ", icp_log);
   Cli_PrintEnable("  HTTP Host Log Splitting ---------------- ", http_host_log);
   Cli_PrintEnable("\nCustom Logs ------------------------------ ", custom_log);
@@ -3069,72 +2771,6 @@ ShowHttpStats()
 
 // show proxy-stats sub-command
 int
-ShowNntpStats()
-{
-  INKInt client_open_connections = -1;
-  INKInt client_bytes_read = -1;
-  INKInt client_bytes_written = -1;
-  INKInt server_open_connections = -1;
-  INKInt server_bytes_read = -1;
-  INKInt server_bytes_written = -1;
-  INKInt article_hits = -1;
-  INKInt article_misses = -1;
-  INKInt overview_hits = -1;
-  INKInt overview_refreshes = -1;
-  INKInt group_hits = -1;
-  INKInt group_refreshes = -1;
-  INKInt posts = -1;
-  INKInt post_bytes = -1;
-  INKInt pull_bytes = -1;
-  INKInt feed_bytes = -1;
-
-  // get values
-
-  Cli_RecordGetInt("proxy.process.nntp.client_connections_currently_open", &client_open_connections);
-  Cli_RecordGetInt("proxy.process.nntp.client_bytes_read", &client_bytes_read);
-  Cli_RecordGetInt("proxy.process.nntp.client_bytes_written", &client_bytes_written);
-  Cli_RecordGetInt("proxy.process.nntp.server_connections_currently_open", &server_open_connections);
-  Cli_RecordGetInt("proxy.process.nntp.server_bytes_read", &server_bytes_read);
-  Cli_RecordGetInt("proxy.process.nntp.server_bytes_written", &server_bytes_written);
-  Cli_RecordGetInt("proxy.process.nntp.article_hits", &article_hits);
-  Cli_RecordGetInt("proxy.process.nntp.article_misses", &article_misses);
-  Cli_RecordGetInt("proxy.process.nntp.overview_hits", &overview_hits);
-  Cli_RecordGetInt("proxy.process.nntp.overview_refreshes", &overview_refreshes);
-  Cli_RecordGetInt("proxy.process.nntp.group_hits", &group_hits);
-  Cli_RecordGetInt("proxy.process.nntp.group_refreshes", &group_refreshes);
-  Cli_RecordGetInt("proxy.process.nntp.posts", &posts);
-  Cli_RecordGetInt("proxy.process.nntp.post_bytes", &post_bytes);
-  Cli_RecordGetInt("proxy.process.nntp.pull_bytes", &pull_bytes);
-  Cli_RecordGetInt("proxy.process.nntp.feed_bytes", &feed_bytes);
-
-  // display results
-  Cli_Printf("\n");
-  Cli_Printf("--Client--\n");
-  Cli_Printf("Open Connections ---- %d\n", client_open_connections);
-  Cli_Printf("Bytes Read ---------- %d\n", client_bytes_read);
-  Cli_Printf("Bytes Written ------- %d\n", client_bytes_written);
-  Cli_Printf("--Server--\n");
-  Cli_Printf("Open Connections ---- %d\n", server_open_connections);
-  Cli_Printf("Bytes Read ---------- %d\n", server_bytes_read);
-  Cli_Printf("Bytes Written ------- %d\n", server_bytes_written);
-  Cli_Printf("--Operations--\n");
-  Cli_Printf("Article Hits -------- %d\n", article_hits);
-  Cli_Printf("Article Misses ------ %d\n", article_misses);
-  Cli_Printf("Overview Hits ------- %d\n", overview_hits);
-  Cli_Printf("Overview Refreshes -- %d\n", overview_refreshes);
-  Cli_Printf("Group Hits ---------- %d\n", group_hits);
-  Cli_Printf("Group Refreshes ----- %d\n", group_refreshes);
-  Cli_Printf("Posts --------------- %d\n", posts);
-  Cli_Printf("Post Bytes ---------- %d\n", post_bytes);
-  Cli_Printf("Pull Bytes ---------- %d\n", pull_bytes);
-  Cli_Printf("Feed Bytes ---------- %d\n", feed_bytes);
-  Cli_Printf("\n");
-
-  return CLI_OK;
-}
-
-// show proxy-stats sub-command
-int
 ShowFtpStats()
 {
   //variable declaration

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h Wed Apr 28 13:54:17 2010
@@ -44,10 +44,6 @@ typedef enum
   CMD_SHOW_CLUSTER,
   CMD_SHOW_SECURITY,
   CMD_SHOW_HTTP,
-  CMD_SHOW_NNTP,
-  CMD_SHOW_NNTP_SERVERS,
-  CMD_SHOW_NNTP_ACCESS,
-  CMD_SHOW_NNTP_CONFIG,
   CMD_SHOW_FTP,
   CMD_SHOW_ICP,
   CMD_SHOW_ICP_PEER,
@@ -76,7 +72,6 @@ typedef enum
   CMD_SHOW_PROXY_STATS,
   CMD_SHOW_HTTP_TRANS_STATS,
   CMD_SHOW_HTTP_STATS,
-  CMD_SHOW_NNTP_STATS,
   CMD_SHOW_FTP_STATS,
   CMD_SHOW_ICP_STATS,
   CMD_SHOW_CACHE_STATS,
@@ -112,8 +107,6 @@ int Cmd_ShowPorts(ClientData clientData,
 int Cmd_ShowCluster(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowSecurity(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowHttp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int Cmd_ShowNntp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int CmdArgs_ShowNntp();
 int Cmd_ShowFtp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowIcp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int CmdArgs_ShowIcp();
@@ -142,7 +135,6 @@ int CmdArgs_ShowScheduledUpdate();
 int Cmd_ShowProxyStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowHttpTransStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowHttpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int Cmd_ShowNntpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowFtpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowIcpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
 int Cmd_ShowCacheStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
@@ -184,18 +176,6 @@ int ShowSecurity();
 // show http sub-command
 int ShowHttp();
 
-// show nntp sub-command
-int ShowNntp();
-
-// show nntp config sub-command
-int ShowNntpConfig();
-
-// show nntp servers sub-command
-int ShowNntpServers();
-
-// show nntp access sub-command
-int ShowNntpAccess();
-
 // show ftp sub-command
 int ShowFtp();
 
@@ -285,9 +265,6 @@ int ShowHttpTransStats();
 int ShowHttpStats();
 
 // show proxy-stats sub-command
-int ShowNntpStats();
-
-// show proxy-stats sub-command
 int ShowFtpStats();
 
 // show proxy-stats sub-command

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt Wed Apr 28 13:54:17 2010
@@ -384,57 +384,6 @@ http			HTTP Configuration
       Remove       (proxy.config.http.anonymize_remove_client_ip)
     ts>
     
-nntp			NNTP Configuration
-			(feeds, access control, servers, access)
-  syntax: show:nntp [ servers | access ]
-  args:   optional arg is either "servers" or "access"
-          
-  behavior:  with no args, Display basic NNTP Configuration
-
-    ts> show:nntp
-    NNTP Caching ---------------- on          (proxy.config.nntp.cache_enabled)
-    NNTP Server ----------------- off         (proxy.config.nntp.enabled)
-    NNTP Server Port ------------ 119         (proxy.config.nntp.server_port)
-    Connect Message (posting allowed) (proxy.config.nntp.posting_ok_message)
-      Inktomi NNTP server ready. posting ok
-    Connect Message (posting not allowed)  (proxy.config.nntp.posting_not_ok_message)
-      Inktomi NNTP server ready. no posting
-    NNTP Options:
-      Posting --------------------------- on  (proxy.config.nntp.posting_enabled)
-      Access Control -------------------- off (proxy.config.nntp.access_control_enabled)
-      NNTP V2 Authentication ------------ off (proxy.config.nntp.v2_authentication)
-      Run Local Authentication Server --- off (proxy.config.nntp.run_local_authentication_server)
-      Clustering ------------------------ on  (proxy.config.nntp.cluster_enabled)
-      Allow Feeds ----------------------- on  (proxy.config.nntp.feed_enabled)
-      Access Logs ----------------------- on  (proxy.config.nntp.logging_enabled)
-      Background Posting ---------------- off (proxy.config.nntp.background_posting_enabled)
-      Obey Cancel Control Messages ------ off (proxy.config.nntp.obey_control_cancel)
-      Obey NewGroups Control Messages --- off (proxy.config.nntp.obey_control_newgroup)
-      Obey RmGroups Control Messages ---- off (proxy.config.nntp.obey_control_rmgroup)
-    Inactivity Timeout ------------------ 600 s    (proxy.config.nntp.inactivity_timeout)
-    Check for New Groups Every ---------- 86400 s  (proxy.config.nntp.check_newgroups_every)
-    Check for Cancelled Articles Every -- 3600 s   (proxy.config.nntp.check_cancels_every)
-    Check Parent NNTP Server Every ------ 300 s    (proxy.config.nntp.group_check_parent_every)
-    Check Cluster Every ----------------- 60 s     (proxy.config.nntp.group_check_cluster_ever)
-    Check Pull Groups Every ------------- 600 s    (proxy.config.nntp.check_pull_every)
-    Authentication Server Host ---------- NULL     (proxy.config.nntp.authorization_hostname)
-    Authentication Server Port ---------- 0        (proxy.config.nntp.authorization_port)
-    Local Authentication Server Timeout - 50000 ms  (proxy.config.nntp.authorization_server_timeout)
-    Client Speed Throttle --------------- 0 bytes/sec  (proxy.config.nntp.client_speed_throttle)
-    ts>
-
-    ts> show:nntp servers
-    nntp_servers.config rules
-    -------------------------
-    (Display nntp_servers.config rules)
-    ts>
-
-    ts> show:nntp access
-    nntp_access.config rules
-    ------------------------
-    (Display nntp_access.config rules)
-    ts>
-
 ftp			FTP Configuration
   syntax: show:ftp
   args:   none
@@ -486,7 +435,6 @@ cache			Cache Configuration
   ts> show:cache
   HTTP Caching ------------------- on    (proxy.config.http.cache.http)
   FTP Caching -------------------- on    (proxy.config.http.cache.ftp)
-  NNTP Caching ------------------- on    (proxy.config.nntp.cache_enabled)
   Ignore User Requests To Bypass Cache --- off  (proxy.config.http.cache.ignore_client_no_cache)
   Maximum HTTP/FTP Object Size --- NONE        (proxy.config.cache.max_doc_size)
 
@@ -600,7 +548,6 @@ logging			Logging Configuration
     File Header ------- NULL      (proxy.config.log2.extended2_log_header)
 
   Splitting
-    NNTP Log Splitting -- off       (proxy.config.log2.separate_nntp_logs)
     ICP Log Splitting -- off        (proxy.config.log2.separate_icp_logs)
     HTTP Host Log Splitting -- off  (proxy.config.log2.separate_host_logs)
 
@@ -859,33 +806,6 @@ http-stats		HTTP Protocol Summary
   Transactions In Progress -- 0         (current_server_transactions)
   ts>
 
-nntp-stats		NNTP Statistics
-  syntax: show:nntp-stats
-  args:   none
-  behavior:  Display NNTP statistics.
-
-  ts> show:nntp-stats
-  --Client--                          (proxy.process.nntp.*)
-  Open Connections ---- 0               (client_connections_currently_open)
-  Bytes Read ---------- 538.2 MB        (client_bytes_read)
-  Bytes Written ------- 559.5 GB        (client_bytes_written)
-  --Server--
-  Open Connections ---- 0               (server_connections_currently_open)
-  Bytes Read ---------- 145.2 GB        (server_bytes_read)
-  Bytes Written ------- 143.1 MB        (server_bytes_written)
-  --Operations--
-  Article Hits ------ 17,434,502      (article_hits)
-  Article Misses ---- 6,053,508       (article_misses)
-  Overview Hits ------- 0               (overview_hits)
-  Overview Refreshes -- 0               (overview_refreshes)
-  Group Hits ---------- 0               (group_hits)
-  Group Refreshes ----- 0               (group_refreshes)
-  Posts --------------- 0               (posts)
-  Post Bytes ---------- 0               (post_bytes)
-  Pull Bytes ---------- 0               (pull_bytes)
-  Feed Bytes ---------- 0               (feed_bytes)
-  ts>
-
 ftp-stats		FTP Statistics
   syntax: show:ftp-stats
   args:   none
@@ -1225,75 +1145,6 @@ ssl			SSL Configuration
     ts#
    
 
-nntp			NNTP Configuration
-			(feeds, access control, servers, access)
-  syntax: config:nntp status <on | off>
-  record: (proxy.config.nntp.enabled)
-
-    ts# config:nntp status on
-    ts#
-
-  syntax: config:nntp port <portnum>
-  record: (proxy.config.nntp.server_port)
-
-    ts# config:nntp port 119
-    ts#
-
-  syntax: config:nntp connect-msg <posting | non-posting> <string>
-  record: <posting>      (proxy.config.nntp.posting_ok_message)
-          <non-posting>  (proxy.config.nntp.posting_not_ok_message)
-
-    ts# config:nntp connect-msg posting "Inktomi NNTP server. posting ok"
-    ts#
-
-  syntax: config:nntp <option> <on | off>
-  args:   <option> can be one of the following
-            <posting>            (proxy.config.nntp.posting_enabled)
-            <access-control>     (proxy.config.nntp.access_control_enabled)
-            <v2-auth>            (proxy.config.nntp.v2_authentication)
-            <local-auth>         (proxy.config.nntp.run_local_authentication_server)
-            <clustering>         (proxy.config.nntp.cluster_enabled)
-            <allow-feeds>        (proxy.config.nntp.feed_enabled)
-            <access-logs>        (proxy.config.nntp.logging_enabled)
-            <background-posting> (proxy.config.nntp.background_posting_enabled)
-            <obey-cancel>        (proxy.config.nntp.obey_control_cancel)
-            <obey-newgroups>     (proxy.config.nntp.obey_control_newgroup)
-            <obey-rmgroups>      (proxy.config.nntp.obey_control_rmgroup)
-
-    ts# config:nntp posting on v2-auth off access-logs on obey-rmgroups on
-    ts#
-
-  syntax: config:nntp <time_record> <seconds>
-  args:   <time_record> can be one of the following
-            <inactive-timeout>   (proxy.config.nntp.inactivity_timeout)
-            <check-new-groups>   (proxy.config.nntp.check_newgroups_every)
-            <check-cancelled>    (proxy.config.nntp.check_cancels_every)
-            <check-parent>       (proxy.config.nntp.group_check_parent_every)
-            <check-cluster>      (proxy.config.nntp.group_check_cluster_every)
-            <check-pull>         (proxy.config.nntp.check_pull_every)
-
-    ts# config:nntp inactive-timeout 10 check-parent 50 check-pull 100
-    ts#
-
-  syntax: config:nntp auth-server <servername> auth-port <portnum> auth-timeout <ms>
-  record: (proxy.config.nntp.authorization_hostname)
-          (proxy.config.nntp.authorization_port)
-          (proxy.config.nntp.authorization_server_timeout)
-
-    ts# config:nntp auth-server nntpserver.example.com auth-port 100 auth-timeout 5000
-    ts#
-
-  syntax: config:nntp client-throttle <bytespersecond>
-  record: (proxy.config.nntp.client_speed_throttle)
-
-    ts# config:nntp client-throttle 0
-
-  syntax: config:nntp <nntp-servers | nntp-access> <url>
-  behavior:  Retrieve nntp_servers.config or nntp_access.config file from URL.
-
-    ts# config:nntp-servers http://example.com/nntp_servers.config
-    ts#
-
 ftp			FTP Configuration
   syntax: config:ftp mode <pasv-port | pasv | port>
   record: (proxy.config.ftp.data_connection_mode value) 
@@ -1358,7 +1209,7 @@ cache			Cache Configuration
 			(active protocols, bypass, storage, freshness, 
                          expires, variable content, rules, clear)
   syntax: config:cache <protocol> <on | off>
-  args:   <protocol> = <http | nntp | ftp>
+  args:   <protocol> = <http | ftp>
           <on | off> specifies the given protocol is cached
   behavior:  Enable/Disable caching of various protocols.
 
@@ -1370,14 +1221,6 @@ cache			Cache Configuration
     on
     ts#
 
-    ts# config:cache nntp on      (proxy.config.nntp.cache_enabled)
-    +OK
-    ts#
-
-    ts# config:cache nntp
-    on
-    ts#
-
     ts# config:cache ftp on       (proxy.config.http.cache.ftp)
     +OK
     ts#
@@ -1661,12 +1504,11 @@ logging			Logging Configuration
     +OK
     ts#
 
-  syntax:  config:logging splitting <nntp | icp | http> <on | off>
-  records:  proxy.config.log2.separate_nntp_logs <nntp>
-            proxy.config.log2.separate_icp_logs  <icp>
+  syntax:  config:logging splitting <icp | http> <on | off>
+  records:  proxy.config.log2.separate_icp_logs  <icp>
             proxy.config.log2.separate_host_logs <http>
 
-    ts# config:log split nntp on
+    ts# config:log split icp on
     +OK
     ts#
 
@@ -1740,7 +1582,7 @@ ports			Ports used by Traffic Server
 *** config:ports command is not implemented or supported ***
 			(including mgmt port)
   syntax: config:ports <http-server | http-other | webui | overseer | cluster
-                        cluster-rs | cluster-mc | nntp-server | ftp-server |
+                        cluster-rs | cluster-mc | ftp-server |
                         ssl | socks-server | icp> <port | ports>
   args:   some variables are single-port while other can be a list of ports
           <http-server>     (proxy.config.http.server_port) single
@@ -1750,7 +1592,6 @@ ports			Ports used by Traffic Server
           <cluster>         (proxy.config.cluster_port) single
           <cluster-rs>      (proxy.config.cluster.rsport) single
           <cluster-mc>      (proxy.config.cluster.mcport) single
-          <nntp-server>     (proxy.config.nntp.server_port) single
           <ftp-server>      (proxy.config.ftp.proxy_server_port) single
           <ssl>             (proxy.config.http.ssl_ports) list
           <socks-server>    (proxy.config.socks.socks_server_port) single

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt Wed Apr 28 13:54:17 2010
@@ -88,7 +88,6 @@ show:status                  Proxy statu
 show:version                 Version information
 show:security                Security information
 show:http                    HTTP protocol configuration
-show:nntp [servers|access]   NNTP protocol configuration
 show:ftp                     FTP protocol configuration
 show:icp [peer]              ICP protocol configuration
 show:proxy                   Proxy configuration
@@ -109,7 +108,6 @@ show:scheduled-update        Scheduled u
 show:proxy-stats             Proxy statistics
 show:http-trans-stats        HTTP transaction statistics
 show:http-stats              HTTP statistics
-show:nntp-stats              NNTP statistics
 show:ftp-stats               FTP statistics
 show:icp-stats               ICP statistics
 show:cache-stats             Cache statistics
@@ -184,7 +182,7 @@ config:socks timeout <seconds>      
     
     
 config:cache <on | off>
-config:cache <http | nntp | ftp> <on | off>
+config:cache <http | ftp> <on | off>
 config:cache ignore-bypass <on | off>
 config:cache <max-object-size | max-alternates> <int>
 config:cache file <url-config-file>
@@ -210,7 +208,7 @@ config:logging collation-host <string>
 config:logging collation secret <string> tagged <on | off> orphan-limit <int>
 config:logging format <squid | netscape-common | netscape-ext | netscape-ext2>
                type <ascii | binary> file <string> header <string>
-config:logging splitting <nntp | icp | http> <on | off>
+config:logging splitting <icp | http> <on | off>
 config:logging custom <on | off> format <traditional | xml>
 config:logging rolling <on | off> offset <hour> interval <hours>
                auto-delete <on | off>,
@@ -229,20 +227,6 @@ config:network domainname <string>      
 config:network dns-ip <x.x.x.x>          (Linux only)
 config:network defaultrouter <x.x.x.x>   (Linux only)
 
-config:nntp <on | off>
-config:nntp port <int>
-config:nntp connect-msg <posting | non-posting> <string>
-config:nntp <posting-status | access-control | v2-auth | local-auth> <on | off>
-config:nntp <clustering | allow-feeds | background-posting> <on | off>
-config:nntp <obey-cancel | obey-newgroups | obey-rmgroups> <on | off>
-config:nntp <inactive-timeout | check-new-groups | check-cancelled> <seconds>
-config:nntp <check-parent | check-cluster | check-pull> <seconds>
-config:nntp auth-server <string>
-config:nntp auth-port <seconds>
-config:nntp auth-timeout <seconds>
-config:nntp client-throttle <bytes per second | 0>
-config:nntp <nntp-servers | nntp-access> <url-config-file>,
-
 config:alarms resolve-name <string>
 config:alarms resolve-number <int>
 config:alarms resolve-all

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh Wed Apr 28 13:54:17 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
 
 export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
 
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config nntp_servers.config nntp_access.config remap.config snmpd.cnf snmpinfo.dat mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config remap.config snmpd.cnf snmpinfo.dat mgr.cnf update.config ${MAIN_CONFIG_FILE}"
 
 
 export FLOPPY_DEVICE="/dev/fd0"

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl Wed Apr 28 13:54:17 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
 
 export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
 
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config nntp_servers.config nntp_access.config remap.config snmpd.cnf snmpinfo.dat mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config remap.config snmpd.cnf snmpinfo.dat mgr.cnf update.config ${MAIN_CONFIG_FILE}"
 
 
 export FLOPPY_DEVICE="/dev/fd0"

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am Wed Apr 28 13:54:17 2010
@@ -72,11 +72,6 @@ dist_webui_DATA = \
 	c_net_device.ink \
 	c_net_driver.ink \
 	c_net_nic.ink \
-	c_nntp_auth.ink \
-	c_nntp_cachability.ink \
-	c_nntp_general.ink \
-	c_nntp_parent_servers.ink \
-	c_nntp_timeout.ink \
 	c_ntlm_general.ink \
 	c_phonehome.ink \
 	c_proxy_access.ink \
@@ -116,12 +111,10 @@ dist_webui_DATA = \
 	f_ip_allow_config.ink \
 	f_ipnat_config.ink \
 	f_mgmt_allow_config.ink \
-	f_nntp_access_config.ink \
-	f_nntp_servers_config.ink \
 	f_parent_config.ink \
 	f_partition_config.ink \
 	f_remap_config.ink \
 	f_socks_config.ink \
 	f_split_dns_config.ink \
 	f_update_config.ink \
-	f_vaddrs_config.ink
\ No newline at end of file
+	f_vaddrs_config.ink

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink Wed Apr 28 13:54:17 2010
@@ -33,7 +33,6 @@
 
 <@include /configure/c_buttons.ink>
 
-<@nntp_plugin_status>
 <@submit_error_msg>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="10"> 
@@ -129,15 +128,6 @@
           <td height="2" colspan="3" class="configureLabelSmall">Protocols</td>
         </tr>
         <tr> 
-          <td class="bodyText" align=left>&nbsp;&nbsp;<@submit_error_flg proxy.config.nntp.enabled>NNTP</td>
-          <td>
-            <input type="radio" name="proxy.config.nntp.enabled" value="1" <@checked proxy.config.nntp.enabled\1>>
-          </td>
-          <td>
-            <input type="radio" name="proxy.config.nntp.enabled" value="0" <@checked proxy.config.nntp.enabled\0>>
-          </td>
-        </tr>
-        <tr> 
           <td class="bodyText" align=left>&nbsp;&nbsp;<@submit_error_flg proxy.config.ftp.ftp_enabled>FTP</td>
           <td>
             <input type="radio" name="proxy.config.ftp.ftp_enabled" value="1" <@checked proxy.config.ftp.ftp_enabled\1>>

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_logging_splitting.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_logging_splitting.ink?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_logging_splitting.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_logging_splitting.ink Wed Apr 28 13:54:17 2010
@@ -55,24 +55,6 @@
 
 <!--
   <tr> 
-    <td height="2" colspan="2" class="configureLabel"><@submit_error_flg proxy.config.log2.separate_nntp_logs>Split NNTP Logs</td>
-  </tr>
-  <tr> 
-    <td nowrap class="bodyText">
-      <input type="radio" name="proxy.config.log2.separate_nntp_logs" value="1" <@checked proxy.config.log2.separate_nntp_logs\1>>
-        Enabled <br>
-      <input type="radio" name="proxy.config.log2.separate_nntp_logs" value="0" <@checked proxy.config.log2.separate_nntp_logs\0>>
-        Disabled <br>
-    </td>
-    <td class="configureHelp" valign="top" align="left"> 
-      <ul>
-        <li>Enables/Disables splitting of NNTP logs.
-      </ul>
-    </td>
-  </tr>
--->
-<!--
-  <tr> 
     <td height="2" colspan="2" class="configureLabel"><@submit_error_flg proxy.config.log2.separate_mixt_logs>Split Streaming Media Logs</td>
   </tr>
   <tr> 

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict Wed Apr 28 13:54:17 2010
@@ -77,7 +77,6 @@ s_text_112=Warning: Permission denied.  
 s_text_113=Warning: The selected log file is too large.  Log file would be truncated.
 s_text_114=Warning: Invalid session timeout value. Must be > 30 seconds (!).
 s_text_115=Warning: Could not unmount floppy. Device is busy. Please try later.
-s_text_116=Warning: NNTP caching is not installed. You will not be able to enable and configure this function.
 s_text_117=Warning: Could not save snapshot. Please check free space available on floppy drive.
 
 s_text_150=*
@@ -329,7 +328,6 @@ s_text_852=Select 'deny' to prevent the 
 s_text_853=Client Group Type
 s_text_854=Specifies the type of the client group.
 
-s_text_860=NNTP Server Hostname
 s_text_861=Specifies the hostname or IP address and the port of the news server.  Specifies '.block' token to block access to specific newsgroups.
 s_text_862=Example:  1.1.1.1:9999 or news.com:9999 or .block
 s_text_863=Newsgroup Names
@@ -339,7 +337,6 @@ s_text_866=Treatment Type (Optional)
 s_text_867=Defines how <@record proxy.config.product_name> treats the specified host and newsgroups.
 s_text_868=Priority (Optional) 
 s_text_869=Specifies the priority <@record proxy.config.product_name> uses to retrieve articles on demand from the specified server. If no positive integer is specified, the default priority is 0. 
-s_text_870=Specifies the network interface used to contact the NNTP server.
 
 s_text_875=Specifies whether IP addresses below are allowed/denied to access <@record proxy.config.product_name>.
 s_text_876=Specifies a single or range of IP addresses to allow/deny access to <@record proxy.config.product_name>.

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am Wed Apr 28 13:54:17 2010
@@ -35,7 +35,6 @@ dist_webui_DATA = \
 	m_mpeg4.ink \
 	m_net_device.ink \
 	m_net.ink \
-	m_nntp.ink \
 	m_node.ink \
 	m_ntlm.ink \
 	m_overview_details_less.ink \
@@ -46,4 +45,4 @@ dist_webui_DATA = \
 	m_socks.ink \
 	m_tab.ink \
 	m_virtual_ip.ink \
-	m_windows_media.ink
\ No newline at end of file
+	m_windows_media.ink

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink Wed Apr 28 13:54:17 2010
@@ -559,45 +559,6 @@
 <!-- realmem end -->
 
         <!--------------------------- PROTOCOLS -------------------------->
-		<!-- NNTP -->
-        <tr> 
-          <td height="2" colspan="2" class="configureLabel">Protocols</td>
-        </tr>
-<!-- nccon start -->
-        <tr align="center"> 
-          <td align=center class="bodyText">
-            NNTP Client Connections:<BR>
-            <A HREF="nccon.html"><IMG HEIGHT=135 WIDTH=500 SRC="nccon-<@query mrtg>.png"></A>
-          </td>
-          <td align=left class="bodyText">
-            This is an instantaneous snapshot of the NNTP client/server connection count.
-            The blue curve and the orange line represent the client/server connection count, respectively.
-          </td>
-        </tr>
-<!-- nccon end -->
-<!-- ndoc start -->
-        <tr align="center"> 
-          <td align=center class="bodyText">
-            NNTP Hit Rate:<BR>
-            <A HREF="ndoc.html"><IMG HEIGHT=135 WIDTH=500 SRC="ndoc-<@query mrtg>.png"></A>
-          </td>
-          <td align=left class="bodyText">
-            The blue curve shows the 5 minute average NNTP hit rate.
-          </td>
-        </tr>
-<!-- ndoc end -->
-<!-- nbw start -->
-        <tr align="center"> 
-          <td align=center class="bodyText">
-            NNTP Bandwidth Savings:<BR>
-            <A HREF="nbw.html"><IMG HEIGHT=135 WIDTH=500 SRC="nbw-<@query mrtg>.png"></A>
-          </td>
-          <td align=left class="bodyText">
-            This shows the NNTP bandwidth savings percentage.
-          </td>
-        </tr>
-<!-- nbw end -->
-
 		<!-- FTP -->
 <!-- fccon start -->
         <tr align="center"> 
@@ -606,7 +567,7 @@
             <A HREF="fccon.html"><IMG HEIGHT=135 WIDTH=500 SRC="fccon-<@query mrtg>.png"></A>
           </td>
           <td align=left class="bodyText">
-            This is an instantaneous snapshot of the NNTP client/server connection count.
+            This is an instantaneous snapshot of the FTP client/server connection count.
             The blue curve and the orange line represent the client/server connection count, respectively. <i>(not including FTP over HTTP traffic)</i>
           </td>
         </tr>

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink Wed Apr 28 13:54:17 2010
@@ -103,16 +103,6 @@
         </tr>
         <tr align="center"> 
           <td align=center class="bodyText">
-            NNTP Client / Server Connections:<BR>
-            <A HREF="nccon.html"><IMG HEIGHT=88 WIDTH=325 SRC="nccon-day.png"></A>
-          </td>
-          <td align=center class="bodyText">
-            NNTP Hit Rate:<BR>
-            <A HREF="ndoc.html"><IMG HEIGHT=88 WIDTH=325 SRC="ndoc-day.png"></A>
-          </td>
-        </tr>
-        <tr align="center"> 
-          <td align=center class="bodyText">
             FTP Client / Server Connections:<BR>
             <A HREF="fccon.html"><IMG HEIGHT=88 WIDTH=325 SRC="fccon-day.png"></A>
           </td>

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml Wed Apr 28 13:54:17 2010
@@ -89,11 +89,6 @@
               file_link="/monitor/m_ftp.ink"
               help_link="/help/ts.ink?help=s_ftp.htm"/>
       </ITEM>
-      <ITEM name="NNTP" enable_record="proxy.config.nntp.enabled">
-        <LINK refresh="true"
-              file_link="/monitor/m_nntp.ink"
-              help_link="/help/ts.ink?help=s_nntp.htm"/>
-      </ITEM>
     </MENU>
 
     <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
@@ -304,20 +299,6 @@
               file_link="/configure/c_ftp_timeout.ink"
               help_link="/help/ts.ink?help=c_ftp.htm"/>
       </ITEM>
-      <ITEM name="NNTP" enable_record="proxy.config.nntp.enabled">
-        <LINK name="General" refresh="false"
-              file_link="/configure/c_nntp_general.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-        <LINK name="Cacheability" refresh="false"
-              file_link="/configure/c_nntp_cachability.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-        <LINK name="Parent Servers" refresh="false"
-              file_link="/configure/c_nntp_parent_servers.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-	<LINK name="Timeouts" refresh="false"
-              file_link="/configure/c_nntp_timeout.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-      </ITEM>
     </MENU>
     <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
       <ITEM name="Shared Settings">

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win Wed Apr 28 13:54:17 2010
@@ -90,13 +90,6 @@
               file_link="/monitor/m_ftp.ink"
               help_link="/help/ts.ink?help=s_ftp.htm"/>
       </ITEM>
-<!-- BZ49743
-      <ITEM name="NNTP" enable_record="proxy.config.nntp.enabled">
-        <LINK refresh="true"
-              file_link="/monitor/m_nntp.ink"
-              help_link="/help/ts.ink?help=s_nntp.htm"/>
-      </ITEM>
--->
     </MENU>
 
     <MENU name="Streaming Media" enable_record="proxy.config.wmt.enabled">
@@ -283,22 +276,6 @@
               file_link="/configure/c_ftp_timeout.ink"
               help_link="/help/ts.ink?help=c_ftp.htm"/>
       </ITEM>
-<!-- BZ49743
-      <ITEM name="NNTP" enable_record="proxy.config.nntp.enabled">
-        <LINK name="General" refresh="false"
-              file_link="/configure/c_nntp_general.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-        <LINK name="Cacheability" refresh="false"
-              file_link="/configure/c_nntp_cachability.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-        <LINK name="Parent Servers" refresh="false"
-              file_link="/configure/c_nntp_parent_servers.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-	<LINK name="Timeouts" refresh="false"
-              file_link="/configure/c_nntp_timeout.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-      </ITEM>
--->
     </MENU>
     <MENU name="Streaming Media" enable_record="proxy.config.wmt.enabled">
       <ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
@@ -396,13 +373,6 @@
               file_link="/configure/c_socks_server.ink"
               help_link="/help/ts.ink?help=c_soks.htm"/>
       </ITEM>
-<!-- BZ49743
-      <ITEM name="NNTP Authentication" enable_record="proxy.config.nntp.enabled">
-        <LINK name="General" refresh="false"
-              file_link="/configure/c_nntp_auth.ink"
-              help_link="/help/ts.ink?help=c_nntpau.htm"/>
-      </ITEM>
--->
     </MENU>
 
     <MENU name="Subsystems">

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp Wed Apr 28 13:54:17 2010
@@ -117,11 +117,6 @@ This text will be stripped from the buil
               file_link="/monitor/m_ftp.ink"
               help_link="/help/ts.ink?help=s_ftp.htm"/>
       </ITEM>
-      <ITEM name="NNTP" enable_record="proxy.config.nntp.enabled">
-        <LINK refresh="true"
-              file_link="/monitor/m_nntp.ink"
-              help_link="/help/ts.ink?help=s_nntp.htm"/>
-      </ITEM>
     </MENU>
 
     <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
@@ -360,20 +355,6 @@ This text will be stripped from the buil
               file_link="/configure/c_ftp_timeout.ink"
               help_link="/help/ts.ink?help=c_ftp.htm"/>
       </ITEM>
-      <ITEM name="NNTP" enable_record="proxy.config.nntp.enabled">
-        <LINK name="General" refresh="false"
-              file_link="/configure/c_nntp_general.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-        <LINK name="Cacheability" refresh="false"
-              file_link="/configure/c_nntp_cachability.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-        <LINK name="Parent Servers" refresh="false"
-              file_link="/configure/c_nntp_parent_servers.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-	<LINK name="Timeouts" refresh="false"
-              file_link="/configure/c_nntp_timeout.ink"
-              help_link="/help/ts.ink?help=c_nntpc.htm"/>
-      </ITEM>
     </MENU>
     <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
       <ITEM name="Shared Settings">



Mime
View raw message