trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r938979 [1/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
Author: zwoop
Date: Wed Apr 28 13:54:17 2010
New Revision: 938979

URL: http://svn.apache.org/viewvc?rev=938979&view=rev
Log:
TS-89: Remove the last remnants of NNTP.
       Tested / reviewed by georgep

Removed:
    incubator/trafficserver/traffic/trunk/doc/man/config_nntp.1
    incubator/trafficserver/traffic/trunk/doc/man/show_nntp-stats.1
    incubator/trafficserver/traffic/trunk/doc/man/show_nntp.1
    incubator/trafficserver/traffic/trunk/libinktomi++/Overview.cc
    incubator/trafficserver/traffic/trunk/proxy/config/nntp_auth.config
    incubator/trafficserver/traffic/trunk/proxy/config/nntp_config.xml
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_nntp_auth.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_nntp_cachability.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_nntp_general.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_nntp_parent_servers.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_nntp_timeout.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/f_nntp_access_config.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/f_nntp_servers_config.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/m_nntp.ink
Modified:
    incubator/trafficserver/traffic/trunk/doc/man/Makefile.am
    incubator/trafficserver/traffic/trunk/doc/man/config_cache.1
    incubator/trafficserver/traffic/trunk/doc/man/config_logging.1
    incubator/trafficserver/traffic/trunk/doc/man/config_reset-stats.1
    incubator/trafficserver/traffic/trunk/doc/man/show_cache.1
    incubator/trafficserver/traffic/trunk/doc/man/show_logging.1
    incubator/trafficserver/traffic/trunk/iocore/cache/Cache.cc
    incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h
    incubator/trafficserver/traffic/trunk/iocore/cache/Notes
    incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
    incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
    incubator/trafficserver/traffic/trunk/libinktomi++/InkErrno.h
    incubator/trafficserver/traffic/trunk/libinktomi++/ink_lockfile.h
    incubator/trafficserver/traffic/trunk/libinktomi++/mkdfa.c
    incubator/trafficserver/traffic/trunk/librecords/I_RecAlarms.h
    incubator/trafficserver/traffic/trunk/librecords/I_RecSignals.h
    incubator/trafficserver/traffic/trunk/librecords/test_RecTree.cc
    incubator/trafficserver/traffic/trunk/proxy/ConfigParse.h
    incubator/trafficserver/traffic/trunk/proxy/DynamicStats.h
    incubator/trafficserver/traffic/trunk/proxy/EventName.cc
    incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
    incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc
    incubator/trafficserver/traffic/trunk/proxy/Main.h
    incubator/trafficserver/traffic/trunk/proxy/README-stats.otl
    incubator/trafficserver/traffic/trunk/proxy/StatPages.h
    incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc
    incubator/trafficserver/traffic/trunk/proxy/StatSystem.h
    incubator/trafficserver/traffic/trunk/proxy/Update.cc
    incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h
    incubator/trafficserver/traffic/trunk/proxy/config/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/config/logs.config
    incubator/trafficserver/traffic/trunk/proxy/config/logs_xml.config
    incubator/trafficserver/traffic/trunk/proxy/config/stats.config.xml
    incubator/trafficserver/traffic/trunk/proxy/congest/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/http2/stats.memo
    incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc
    incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h
    incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
    incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.h
    incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPIStub.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/RemoteTestOem.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIconfigure.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIeventHandler.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLIhelp.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.sh
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/script_configs.tcl
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_logging_splitting.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/uistats
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
    incubator/trafficserver/traffic/trunk/proxy/ts-instantiate.pl
    incubator/trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c

Modified: incubator/trafficserver/traffic/trunk/doc/man/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/doc/man/Makefile.am?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/doc/man/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/doc/man/Makefile.am Wed Apr 28 13:54:17 2010
@@ -33,7 +33,6 @@ man_MANS = \
   config_logging.1 \
   config_name.1 \
   config_network.1 \
-  config_nntp.1 \
   config_ntlm.1 \
   config_parent.1 \
   config_port-tunnels.1 \
@@ -79,8 +78,6 @@ man_MANS = \
   show_logging.1 \
   show_logging-stats.1 \
   show_network.1 \
-  show_nntp.1 \
-  show_nntp-stats.1 \
   show_ntlm.1 \
   show_ntlm-stats.1 \
   show_parent.1 \

Modified: incubator/trafficserver/traffic/trunk/doc/man/config_cache.1
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/doc/man/config_cache.1?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/doc/man/config_cache.1 (original)
+++ incubator/trafficserver/traffic/trunk/doc/man/config_cache.1 Wed Apr 28 13:54:17 2010
@@ -20,7 +20,7 @@ caching parameters.
 .SH SYNOPSIS
 config:cache [options]
 .SH DESCRIPTION
-Use the config:cache command to enable caching for HTTP, NNTP, and FTP 
+Use the config:cache command to enable caching for HTTP based 
 protocols. Also use this command to configure general caching parameters, 
 including storage, freshness, bypass, and alternates. When you execute the 
 config:cache command, you must use one of the options described below.
@@ -29,9 +29,6 @@ The following options are supported for 
 .SS "http <on | off>"
 Enables (on) or disables (off) the caching of HTTP requests. (The default value 
 is on.)
-.SS "nntp <on | off>"
-Enables (on) or disables (off) the caching of NNTP requests. (The default value 
-is on.)
 .SS "ftp <on | off>"
 Enables (on) or disables (off) the caching of FTP requests sent by HTTP. (The 
 default value is on.)

Modified: incubator/trafficserver/traffic/trunk/doc/man/config_logging.1
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/doc/man/config_logging.1?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/doc/man/config_logging.1 (original)
+++ incubator/trafficserver/traffic/trunk/doc/man/config_logging.1 Wed Apr 28 13:54:17 2010
@@ -82,10 +82,10 @@ Netscape Extended2 ---------------------
   File Name   ---------------------------- extended2
   File Header ---------------------------- NULL
 
-.SS "splitting <nntp | icp | http> <on | off>"
-Enables (on) or disables (off) log splitting for NNTP, ICP, and HTTP. When 
+.SS "splitting <icp | http> <on | off>"
+Enables (on) or disables (off) log splitting for ICP, and HTTP. When 
 enabled, the proxy stores the transactions for the protocol you choose in a 
-separate log file. (The default value is off for NNTP, ICP and HTTP.)
+separate log file. (The default value is off for ICP and HTTP.)
 .SS"custom <on | off> format <traditional | xml>"
 Enables (on) or disables (off) custom logging. When you enable custom logging, 
 you must specify the format, traditional or XML. (The default values are off for 
@@ -144,17 +144,12 @@ traffic_shell> 
 .nf
 traffic_shell> config:log format squid on type ascii file squid.log
 traffic_shell> 
-.SS "Example 9. Separating log files for NNTP transactions"
-.PP
-.nf
-traffic_shell> config:logging splitting nntp on 
-traffic_shell> 
-.SS "Example 10. Enabling custom XML logging"
+.SS "Example 9. Enabling custom XML logging"
 .PP
 .nf
 traffic_shell> config:logging custom on format xml
 traffic_shell> 
-.SS "Example 11. Enabling log rolling, to begin rolling at "
+.SS "Example 10. Enabling log rolling, to begin rolling at "
 .SS "            midnight, with an interval of 60 seconds and"
 .SS "            no automatic deletion of rolled files"
 .PP

Modified: incubator/trafficserver/traffic/trunk/doc/man/config_reset-stats.1
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/doc/man/config_reset-stats.1?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/doc/man/config_reset-stats.1 (original)
+++ incubator/trafficserver/traffic/trunk/doc/man/config_reset-stats.1 Wed Apr 28 13:54:17 2010
@@ -42,6 +42,6 @@ ts_shell>config:reset-stats
 ts_shell>
 
 .SH "SEE ALSO"
-show:cache-stats, show:dns-stats, show:hostdb-stats, show:http-stats, show:nntp-
-stats, show:ftp-stats, show:proxy-stats, show:http-trans-stats, show:icp-stats, 
+show:cache-stats, show:dns-stats, show:hostdb-stats, show:http-stats, 
+show:ftp-stats, show:proxy-stats, show:http-trans-stats, show:icp-stats, 
 show:logging-stats

Modified: incubator/trafficserver/traffic/trunk/doc/man/show_cache.1
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/doc/man/show_cache.1?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/doc/man/show_cache.1 (original)
+++ incubator/trafficserver/traffic/trunk/doc/man/show_cache.1 Wed Apr 28 13:54:17 2010
@@ -19,8 +19,8 @@ show:cache \- This command displays cach
 .SH SYNOPSIS
 show:cache [rules | storage]
 .SH DESCRIPTION
-Execute the show:cache command to view basic NNTP configuration information, or type the servers 
-or access options with the show:nntp command to display access.
+Execute the show:cache command to view basic cache configuration information, or type the servers 
+or access options to display access.
 .SH OPTIONS
 The following options are supported for the show:cache command:
 .SS rules
@@ -36,7 +36,6 @@ hard disk partitions that make up the ca
 traffic_shell> show:cache
 HTTP Caching --------------------------- on
 FTP Caching ---------------------------- on
-NNTP Caching --------------------------- on
 Ignore User Requests To Bypass Cache --- off
 Maximum HTTP/FTP Object Size ----------- NONE
 Freshness

Modified: incubator/trafficserver/traffic/trunk/doc/man/show_logging.1
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/doc/man/show_logging.1?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/doc/man/show_logging.1 (original)
+++ incubator/trafficserver/traffic/trunk/doc/man/show_logging.1 Wed Apr 28 13:54:17 2010
@@ -56,7 +56,6 @@ Netscape Extended2 ---------------------
   File Name   ---------------------------- extended2
   File Header ---------------------------- NULL
 Splitting
-  NNTP Log Splitting --------------------- off
   ICP Log Splitting ---------------------- off
   HTTP Host Log Splitting ---------------- off
 Custom Logs ------------------------------ off

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/Cache.cc Wed Apr 28 13:54:17 2010
@@ -692,11 +692,9 @@ CacheProcessor::cacheInitialized()
     } else {
       caches_ready = caches_ready | CACHE_FRAG_TYPE_HTTP;
       caches_ready = caches_ready | CACHE_FRAG_TYPE_NONE;
-      caches_ready = caches_ready | CACHE_FRAG_TYPE_NNTP;
       caches_ready = caches_ready | CACHE_FRAG_TYPE_FTP;
       caches[CACHE_FRAG_TYPE_HTTP] = theCache;
       caches[CACHE_FRAG_TYPE_NONE] = theCache;
-      caches[CACHE_FRAG_TYPE_NNTP] = theCache;
       caches[CACHE_FRAG_TYPE_FTP] = theCache;
     }
   }
@@ -1663,7 +1661,6 @@ AIO_Callback_handler::handle_disk_failur
     unsigned int caches_ready = 0;
     caches_ready = caches_ready | CACHE_FRAG_TYPE_HTTP;
     caches_ready = caches_ready | CACHE_FRAG_TYPE_NONE;
-    caches_ready = caches_ready | CACHE_FRAG_TYPE_NNTP;
     caches_ready = caches_ready | CACHE_FRAG_TYPE_FTP;
     caches_ready = ~caches_ready;
     CacheProcessor::cache_ready &= caches_ready;

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h Wed Apr 28 13:54:17 2010
@@ -115,9 +115,8 @@ enum CacheFragType
 {
   CACHE_FRAG_TYPE_NONE = 1 << 0,
   CACHE_FRAG_TYPE_HTTP = 1 << 1,
-  CACHE_FRAG_TYPE_NNTP = 1 << 2,
-  CACHE_FRAG_TYPE_FTP = 1 << 3,
-  CACHE_FRAG_TYPE_RTSP = 1 << 4
+  CACHE_FRAG_TYPE_FTP = 1 << 2,
+  CACHE_FRAG_TYPE_RTSP = 1 << 3
 };
 
 #define CacheKey INK_MD5

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/Notes
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/Notes?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/Notes (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/Notes Wed Apr 28 13:54:17 2010
@@ -1,7 +1,7 @@
 proxy/cluster/Cluster.h is now iocore/cluster/P_ClusterCache.h
 Clustering compiles but only works if this module is compiled with the entire
-TS because there are a lot of stuff required for clustering in proxy/http2 
-and proxy/NNTP.cc
+TS because there are a lot of stuff required for clustering in proxy/http2.
+
 
 cache ifdefs
 FIXME_NONMODULAR -> this flaf needs to be turned on when compiling along 

Modified: incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h Wed Apr 28 13:54:17 2010
@@ -895,9 +895,6 @@ ClusterFuncToQpri(int cluster_func)
 #define CACHE_OP_MALLOCED_CLUSTER_FUNCTION           8
 #define CACHE_OP_CLUSTER_FUNCTION                    9
 #define CACHE_OP_RESULT_CLUSTER_FUNCTION             10
-#define NNTP_GROUP_CLUSTER_FUNCTION                  11 // OBSOLETE
-#define NNTP_OVERVIEW_CLUSTER_FUNCTION               12 // OBSOLETE
-#define NNTP_OVERVIEW_MALLOCED_CLUSTER_FUNCTION      13 // OBSOLETE
 #define SET_CHANNEL_DATA_CLUSTER_FUNCTION      	     14
 #define SET_CHANNEL_PIN_CLUSTER_FUNCTION      	     15
 #define SET_CHANNEL_PRIORITY_CLUSTER_FUNCTION  	     16

Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/I_Event.h Wed Apr 28 13:54:17 2010
@@ -70,7 +70,6 @@
 #define HTTP_NET_CONNECTION_EVENT_EVENTS_START    1400
 #define HTTP_NET_VCONNECTION_EVENT_EVENTS_START   1500
 #define GC_EVENT_EVENTS_START                     1600
-#define NNTP_EVENT_EVENTS_START                   1700
 #define ICP_EVENT_EVENTS_START                    1800
 #define RNI_EVENT_EVENTS_START                    1900
 #define TRANSFORM_EVENTS_START                    2000
@@ -104,7 +103,7 @@
 
 /*
 enum EventType { ET_SPAWN = 0, ET_CALL, ET_NET, ET_CLUSTER, ET_AUTH,
-		 ET_DNS, ET_FTP, ET_CACHE , ET_GC, ET_LOG, ET_ICP, ET_NNTP,
+		 ET_DNS, ET_FTP, ET_CACHE , ET_GC, ET_LOG, ET_ICP,
                  ET_UDP, ET_SSL, ET_NET_9x, ET_REMAP, ET_LAST};
 const int N_EVENT_TYPES = ET_LAST;
 */

Modified: incubator/trafficserver/traffic/trunk/libinktomi++/InkErrno.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/InkErrno.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/InkErrno.h (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/InkErrno.h Wed Apr 28 13:54:17 2010
@@ -38,7 +38,6 @@
 #define CLUSTER_ERRNO                     INK_START_ERRNO+200
 #define FTP_ERRNO                         INK_START_ERRNO+300
 #define CACHE_ERRNO                       INK_START_ERRNO+400
-#define NNTP_ERRNO                        INK_START_ERRNO+500
 #define HTTP_ERRNO                        INK_START_ERRNO+600
 
 #define ENET_THROTTLING                   (NET_ERRNO+1)
@@ -83,8 +82,6 @@
 #define ECACHE_ALT_MISS                   (CACHE_ERRNO+8)
 #define ECACHE_BAD_READ_REQUEST           (CACHE_ERRNO+9)
 
-#define ENNTP_ERROR                       (NNTP_ERRNO+0)
-
 #define EHTTP_ERROR                       (HTTP_ERRNO+0)
 
 #endif

Modified: incubator/trafficserver/traffic/trunk/libinktomi++/ink_lockfile.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_lockfile.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/ink_lockfile.h (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/ink_lockfile.h Wed Apr 28 13:54:17 2010
@@ -44,7 +44,6 @@
 #define COP_LOCK       "cop.lock"
 #define MANAGER_LOCK   "manager.lock"
 #define SERVER_LOCK    "server.lock"
-#define NNTP_AUTH_LOCK "nntp_auth.lock"
 #endif
 
 class Lockfile

Modified: incubator/trafficserver/traffic/trunk/libinktomi++/mkdfa.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/mkdfa.c?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/mkdfa.c (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/mkdfa.c Wed Apr 28 13:54:17 2010
@@ -155,7 +155,6 @@ info_t schemes[] = {
   {"https", "URL_SCHEME_HTTPS", 0},
   {"mailto", "URL_SCHEME_MAILTO", 0},
   {"news", "URL_SCHEME_NEWS", 0},
-  {"nntp", "URL_SCHEME_NNTP", 0},
   {"prospero", "URL_SCHEME_PROSPERO", 0},
   {"telnet", "URL_SCHEME_TELNET", 0},
   {"wais", "URL_SCHEME_WAIS", 0},
@@ -273,43 +272,6 @@ info_t cache_controls[] = {
   {NULL, "HTTP_CACHE_DIRECTIVE_CACHE_EXTENSION", -1},
 };
 
-info_t nntp[] = {
-  {"AUTHINFO", "NNTP_SERVER_CMD_AUTHINFO", -1},
-  {"ARTICLE", "NNTP_SERVER_CMD_ARTICLE", -1},
-  {"BODY", "NNTP_SERVER_CMD_BODY", -1},
-  {"CHECK", "NNTP_SERVER_CMD_CHECK", -1},
-  {"DATE", "NNTP_SERVER_CMD_DATE", -1},
-  {"GROUP", "NNTP_SERVER_CMD_GROUP", -1},
-  {"HEAD", "NNTP_SERVER_CMD_HEAD", -1},
-  {"HELP", "NNTP_SERVER_CMD_HELP", -1},
-  {"IHAVE", "NNTP_SERVER_CMD_IHAVE", -1},
-  {"LAST", "NNTP_SERVER_CMD_LAST", -1},
-  {"LIST", "NNTP_SERVER_CMD_LIST", -1},
-  {"LISTGROUP", "NNTP_SERVER_CMD_LISTGROUP", -1},
-  {"MODE", "NNTP_SERVER_CMD_MODE", -1},
-  {"NEWGROUPS", "NNTP_SERVER_CMD_NEWGROUPS", -1},
-  {"NEWNEWS", "NNTP_SERVER_CMD_NEWNEWS", -1},
-  {"NEXT", "NNTP_SERVER_CMD_NEXT", -1},
-  {"OVER", "NNTP_SERVER_CMD_OVER", -1},
-  {"PAT", "NNTP_SERVER_CMD_PAT", -1},
-  {"POST", "NNTP_SERVER_CMD_POST", -1},
-  {"QUIT", "NNTP_SERVER_CMD_QUIT", -1},
-  {"SLAVE", "NNTP_SERVER_CMD_SLAVE", -1},
-  {"STAT", "NNTP_SERVER_CMD_STAT", -1},
-  {"TAKETHIS", "NNTP_SERVER_CMD_TAKETHIS", -1},
-  {"XDATE", "NNTP_SERVER_CMD_XDATE", -1},
-  {"XGTITLE", "NNTP_SERVER_CMD_XGTITLE", -1},
-  {"XHDR", "NNTP_SERVER_CMD_XHDR", -1},
-  {"XINKTOMI", "NNTP_SERVER_CMD_XINKTOMI", -1},
-  {"XLISTGROUP", "NNTP_SERVER_CMD_XLISTGROUP", -1},
-  {"XMODE", "NNTP_SERVER_CMD_XMODE", -1},
-  {"XOVER", "NNTP_SERVER_CMD_XOVER", -1},
-  {"XPAT", "NNTP_SERVER_CMD_XPAT", -1},
-  {"XPATH", "NNTP_SERVER_CMD_XPATH", -1},
-  {"XREPLIC", "NNTP_SERVER_CMD_XREPLIC", -1},
-  {NULL, "NNTP_SERVER_CMD_NONE", -1}
-};
-
 
 state_t *start = NULL;
 int state_count = 0;
@@ -714,8 +676,6 @@ main(int argc, char *argv[])
     mkdfa(connections, SIZEOF(connections), 0, (argc == 3));
   else if (strcmp(argv[1], "cache-controls") == 0)
     mkdfa(cache_controls, SIZEOF(cache_controls), 0, (argc == 3));
-  else if (strcmp(argv[1], "nntp") == 0)
-    mkdfa(nntp, SIZEOF(nntp), 0, (argc == 3));
 
   return 0;
 }

Modified: incubator/trafficserver/traffic/trunk/librecords/I_RecAlarms.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/I_RecAlarms.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/I_RecAlarms.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/I_RecAlarms.h Wed Apr 28 13:54:17 2010
@@ -36,7 +36,7 @@
 #define REC_ALARM_PROXY_CACHE_WARNING           9
 #define REC_ALARM_PROXY_LOGGING_ERROR           10
 #define REC_ALARM_PROXY_LOGGING_WARNING         11
-#define REC_ALARM_PROXY_NNTP_ERROR	        12
+// Currently unused: 12
 #define REC_ALARM_REC_TEST                      13
 #define REC_ALARM_CONFIG_UPDATE_FAILED          14
 #define REC_ALARM_WEB_ERROR                     15

Modified: incubator/trafficserver/traffic/trunk/librecords/I_RecSignals.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/I_RecSignals.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/I_RecSignals.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/I_RecSignals.h Wed Apr 28 13:54:17 2010
@@ -36,7 +36,7 @@
 #define REC_SIGNAL_CACHE_WARNING                8
 #define REC_SIGNAL_LOGGING_ERROR                9
 #define REC_SIGNAL_LOGGING_WARNING              10
-#define REC_SIGNAL_NNTP_ERROR                   11
+// Currently unused: 11
 #define REC_SIGNAL_PLUGIN_CONFIG_REG            12
 #define REC_SIGNAL_PLUGIN_ADD_REC               13
 #define REC_SIGNAL_PLUGIN_SET_CONFIG            14

Modified: incubator/trafficserver/traffic/trunk/librecords/test_RecTree.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/test_RecTree.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/test_RecTree.cc (original)
+++ incubator/trafficserver/traffic/trunk/librecords/test_RecTree.cc Wed Apr 28 13:54:17 2010
@@ -54,8 +54,6 @@ main(int argc, char **argv)
   printf("\n");
   new_rec_tree->rec_tree_insert("proxy.node.http.hitrate");
   printf("\n");
-  new_rec_tree->rec_tree_insert("proxy.node.nntp.bandwidth_saving");
-  printf("\n");
   new_rec_tree->rec_tree_insert("proxy.node.rni.client.connections");
   printf("\n");
   new_rec_tree->rec_tree_insert("proxy.node.rni.server.connections");

Modified: incubator/trafficserver/traffic/trunk/proxy/ConfigParse.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ConfigParse.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ConfigParse.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ConfigParse.h Wed Apr 28 13:54:17 2010
@@ -37,9 +37,5 @@ char *SocksParser(FILE * fp);
 char *SocksParser(int fd);
 char *parseRemapFile(FILE * fp);
 char *parseRemapFile(int fd);
-char *parseNNTPServersFile(FILE * fp);
-char *parseNNTPServersFile(int fd);
-char *parseNNTPAccessFile(FILE * fp);
-char *parseNNTPAccessFile(int fd);
 
 #endif

Modified: incubator/trafficserver/traffic/trunk/proxy/DynamicStats.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/DynamicStats.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/DynamicStats.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/DynamicStats.h Wed Apr 28 13:54:17 2010
@@ -27,37 +27,6 @@ _HEADER
   //
   // this one's in the state machine currently
   //
-  // Dynamic NNTP Stats
-  //
-_D(nntp_client_connections_currently_open_stat)
-_D(nntp_client_bytes_read_stat)
-_D(nntp_client_bytes_written_stat)
-_D(nntp_server_connections_currently_open_stat)
-_D(nntp_server_bytes_read_stat)
-_D(nntp_server_article_bytes_read_stat)
-_D(nntp_server_overview_bytes_read_stat)
-_D(nntp_server_bytes_written_stat)
-_D(nntp_control_cancels_stat)
-_D(nntp_control_newgroups_stat)
-_D(nntp_control_rmgroups_stat)
-_D(nntp_cache_connections_currently_open_stat)
-    // NNTP Stats which could be Transaction Stats
-_D(nntp_client_connections_stat)
-_D(nntp_client_commands_stat)
-_D(nntp_server_connections_stat)
-_D(nntp_server_commands_stat)
-_D(nntp_article_hits_stat)
-_D(nntp_article_hits_ms_stat)
-_D(nntp_article_misses_stat)
-_D(nntp_article_misses_ms_stat)
-_D(nntp_overview_hits_stat)
-_D(nntp_overview_refreshes_stat)
-_D(nntp_group_hits_stat)
-_D(nntp_group_refreshes_stat)
-_D(nntp_posts_stat)
-_D(nntp_post_bytes_stat)
-_D(nntp_pull_bytes_stat)
-_D(nntp_feed_bytes_stat)
     //
     // Dynamic Cluster Stats
     //

Modified: incubator/trafficserver/traffic/trunk/proxy/EventName.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/EventName.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/EventName.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/EventName.cc Wed Apr 28 13:54:17 2010
@@ -28,7 +28,6 @@
 
 #include "P_EventSystem.h"
 // #include "I_Disk.h" unused
-// #include "I_NNTP.h" unavailable
 // #include "I_FTP.h" unavailable
 #include "I_Cache.h"
 #include "I_Net.h"
@@ -137,20 +136,6 @@ event_int_to_string(int event, char buff
     case HTTP_EVENT_WRITE_COMPLETE: return "HTTP_EVENT_WRITE_COMPLETE";
     case HTTP_EVENT_EOS: return "HTTP_EVENT_EOS";
     case HTTP_EVENT_CLOSED: return "HTTP_EVENT_CLOSED";
-
-    case NNTP_EVENT_CMD: return "NNTP_EVENT_CMD";
-    case NNTP_EVENT_CALL: return "NNTP_EVENT_CALL";
-    case NNTP_EVENT_CALL_DONE: return "NNTP_EVENT_CALL_DONE";
-    case NNTP_EVENT_ACQUIRE: return "NNTP_EVENT_ACQUIRE";
-    case NNTP_EVENT_ACQUIRE_FAILED: return "NNTP_EVENT_ACQUIRE_FAILED";
-    case NNTP_EVENT_SLAVE_RESPONSE: return "NNTP_EVENT_SLAVE_RESPONSE";
-    case NNTP_EVENT_SLAVE_INITIAL_ERROR: return "NNTP_EVENT_SLAVE_INITIAL_ERROR";
-    case NNTP_EVENT_SLAVE_ERROR: return "NNTP_EVENT_SLAVE_ERROR";
-    case NNTP_EVENT_SLAVE_DONE: return "NNTP_EVENT_SLAVE_DONE";
-    case NNTP_EVENT_TUNNEL_DONE: return "NNTP_EVENT_TUNNEL_DONE";
-    case NNTP_EVENT_TUNNEL_ERROR: return "NNTP_EVENT_TUNNEL_ERROR";
-    case NNTP_EVENT_TUNNEL_CONT: return "NNTP_EVENT_TUNNEL_CONT";
-    case NNTP_EVENT_CLUSTER_MSG: return "NNTP_EVENT_CLUSTER_MSG";
 #endif
 
     case MGMT_EVENT_SHUTDOWN: return "MGMT_EVENT_SHUTDOWN";

Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc Wed Apr 28 13:54:17 2010
@@ -4634,9 +4634,6 @@ INKCacheKeyDataTypeSet(INKCacheKey key, 
   case INK_CACHE_DATA_TYPE_HTTP:
     ((CacheInfo *) key)->frag_type = CACHE_FRAG_TYPE_HTTP;
     break;
-  case INK_CACHE_DATA_TYPE_NNTP:
-    ((CacheInfo *) key)->frag_type = CACHE_FRAG_TYPE_NNTP;
-    break;
   case INK_CACHE_DATA_TYPE_FTP:
     ((CacheInfo *) key)->frag_type = CACHE_FRAG_TYPE_FTP;
     break;
@@ -6962,9 +6959,6 @@ INKCacheDataTypeReady(INKCacheDataType t
   case INK_CACHE_DATA_TYPE_HTTP:
     frag_type = CACHE_FRAG_TYPE_HTTP;
     break;
-  case INK_CACHE_DATA_TYPE_NNTP:
-    frag_type = CACHE_FRAG_TYPE_NNTP;
-    break;
   case INK_CACHE_DATA_TYPE_FTP:
     frag_type = CACHE_FRAG_TYPE_FTP;
     break;

Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc Wed Apr 28 13:54:17 2010
@@ -6707,7 +6707,6 @@ typedef enum
 {
   ORIG_INK_CACHE_DATA_TYPE_NONE,
   ORIG_INK_CACHE_DATA_TYPE_HTTP,
-  ORIG_INK_CACHE_DATA_TYPE_NNTP,
   ORIG_INK_CACHE_DATA_TYPE_MIXT_RTSP,
   ORIG_INK_CACHE_DATA_TYPE_MIXT_WMT,
   ORIG_INK_CACHE_DATA_TYPE_MIXT_QTIME,
@@ -6877,7 +6876,6 @@ REGRESSION_TEST(SDK_API_INKConstant) (Re
 
   PRINT_DIFF(INK_CACHE_DATA_TYPE_NONE);
   PRINT_DIFF(INK_CACHE_DATA_TYPE_HTTP);
-  PRINT_DIFF(INK_CACHE_DATA_TYPE_NNTP);
   PRINT_DIFF(INK_CACHE_DATA_TYPE_MIXT_RTSP);
   PRINT_DIFF(INK_CACHE_DATA_TYPE_MIXT_WMT);
   PRINT_DIFF(INK_CACHE_DATA_TYPE_MIXT_QTIME);

Modified: incubator/trafficserver/traffic/trunk/proxy/Main.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Main.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Main.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Main.h Wed Apr 28 13:54:17 2010
@@ -63,7 +63,6 @@ extern int accept_till_done;
 //extern int ssl_enabled;       
 extern int http_accept_port_number;
 extern int http_accept_file_descriptor;
-extern int nntp_accept_file_descriptor;
 extern int ftp_accept_file_descriptor;
 extern int command_flag;
 extern int auto_clear_hostdb_flag;

Modified: incubator/trafficserver/traffic/trunk/proxy/README-stats.otl
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/README-stats.otl?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/README-stats.otl (original)
+++ incubator/trafficserver/traffic/trunk/proxy/README-stats.otl Wed Apr 28 13:54:17 2010
@@ -292,23 +292,6 @@ proxy.process.icp.invalid_icp_query_resp
 (UI) proxy.process.icp.total_icp_request_time
   - Overall avg response time of locally generated ICP request
 ---------------------------------------------------------------------------------
-* nntp stats
-		*** number of open client connections
-		*** number of open server connections
-		*** total number of client connections 
-		*** total number of server connections 
-		*** total # of client bytes
-		*** total # of server bytes
-		*** total # of client ops
-		*** total # of server ops
-		*** client ops/sec ??? is this computable??
-		*** high watermark number of simultaneous client connections
-		*** high watermark client connection time
-
-   we can add more of these as we see fit, perhaps you could send
-   me the new HTTP list, then I could see if we could make the NNTP
-   stats cover similar things.
----------------------------------------------------------------------------------
 * hostdb/dns stats
 	** hostdb
 		*** total entries
@@ -490,7 +473,7 @@ total/max active server connections
 total/max active cache connections
 total/max active parent proxy connections
 average transaction rate
-total transaction count per protocol {dns, http, nntp, ftp, rtsp}
+total transaction count per protocol {dns, http, ftp, rtsp}
 total bytes served to clients
 total bytes from origin servers
 total bytes from parent proxies
@@ -524,7 +507,7 @@ total/max active server connections
 total/max active cache connections
 number of active connections by connection status: ESTABLISHED, CLOSE_WAIT,
 TIME_WAIT, ...
-total transaction count per protocol {dns, http, nntp, ftp, rtsp}
+total transaction count per protocol {dns, http, ftp, rtsp}
 total/max active parent proxy connections
 total bytes served to clients
 total bytes from origin servers

Modified: incubator/trafficserver/traffic/trunk/proxy/StatPages.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/StatPages.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/StatPages.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/StatPages.h Wed Apr 28 13:54:17 2010
@@ -47,26 +47,17 @@
 //
 //    Running Example:
 //
-//      http://{nntp}/groups/dump?comp.compilers
+//      http://{http}/groups/dump?comp.compilers
 //
 // 2. What sort of things should be available?
 //
 //    A. The type of data should default to HTML or match the
 //       extension type e.g.:
 //
-//         http://{nntp}/groups/use_graph.gif?august
+//         http://{http}/groups/use_graph.gif?august
 //  
 //    B. Each protocol/sybsystem should have their own information.
 //       For example
-//
-//      1. NNTP 
-//
-//        - the user can find out the status of/dump the various
-//          databases (group, overview, articles).
-//
-//        - the user can find out the status of the connections
-//
-//        etc.
 
 #define STAT_PAGE_SUCCESS           STAT_PAGES_EVENTS_START+0
 #define STAT_PAGE_FAILURE           STAT_PAGES_EVENTS_START+1

Modified: incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc Wed Apr 28 13:54:17 2010
@@ -50,8 +50,6 @@ time_t last_http_local_time;
 #endif
 ink_stat_lock_t global_http_trans_stat_lock;
 ink_unprot_global_stat_t global_http_trans_stats[MAX_HTTP_TRANS_STATS];
-ink_stat_lock_t global_nntp_trans_stat_lock;
-ink_unprot_global_stat_t global_nntp_trans_stats[MAX_NNTP_TRANS_STATS];
 inkcoreapi ink_stat_lock_t global_rni_trans_stat_lock;
 inkcoreapi ink_unprot_global_stat_t global_rni_trans_stats[MAX_RNI_TRANS_STATS];
 #ifndef USE_LOCKS_FOR_DYN_STATS
@@ -81,9 +79,6 @@ static int persistent_stats[] = {
 };
 #else
 static int non_persistent_stats[] = {
-  nntp_client_connections_currently_open_stat,
-  nntp_server_connections_currently_open_stat,
-  nntp_cache_connections_currently_open_stat,
   ////////////////////////////
   // Start of Cluster stats
   ////////////////////////////
@@ -226,13 +221,6 @@ clear_stats()
       global_http_trans_stats[i].count = 0;
     }
   }
-  stats_size = MAX_NNTP_TRANS_STATS - NO_NNTP_TRANS_STATS - 1;
-  for (i = 0; i < stats_size; i++) {
-    if (persistent_stat(i + NO_NNTP_TRANS_STATS)) {
-      global_nntp_trans_stats[i].sum = 0;
-      global_nntp_trans_stats[i].count = 0;
-    }
-  }
   stats_size = MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS - 1;
   for (i = 0; i < stats_size; i++) {
     if (persistent_stat(i + NO_RNI_TRANS_STATS)) {
@@ -275,7 +263,6 @@ read_stats_snap()
     goto Lmissmatch;
   stats_size =
     MAX_HTTP_TRANS_STATS - NO_HTTP_TRANS_STATS +
-    MAX_NNTP_TRANS_STATS - NO_NNTP_TRANS_STATS +
     MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS + MAX_DYN_STATS - NO_DYN_STATS;
   if (socketManager.read(fd, (char *) &count, sizeof(count)) != sizeof(count))
     goto Lmissmatch;
@@ -291,15 +278,6 @@ read_stats_snap()
         != sizeof(global_http_trans_stats[i].count))
       goto Lmissmatch;
   }
-  stats_size = MAX_NNTP_TRANS_STATS - NO_NNTP_TRANS_STATS;
-  for (i = 0; i < stats_size; i++) {
-    if (socketManager.read(fd, (char *) &global_nntp_trans_stats[i].sum, sizeof(global_nntp_trans_stats[i].sum))
-        != sizeof(global_nntp_trans_stats[i].sum))
-      goto Lmissmatch;
-    if (socketManager.read(fd, (char *) &global_nntp_trans_stats[i].count, sizeof(global_nntp_trans_stats[i].count))
-        != sizeof(global_nntp_trans_stats[i].count))
-      goto Lmissmatch;
-  }
   stats_size = MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS;
   for (i = 0; i < stats_size; i++) {
     if (socketManager.read(fd, (char *) &global_rni_trans_stats[i].sum, sizeof(global_rni_trans_stats[i].sum))
@@ -344,7 +322,6 @@ write_stats_snap()
   {
     int stats_size =
       MAX_HTTP_TRANS_STATS - NO_HTTP_TRANS_STATS +
-      MAX_NNTP_TRANS_STATS - NO_NNTP_TRANS_STATS +
       MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS + MAX_DYN_STATS - NO_DYN_STATS;
     int buf_size = sizeof(unsigned int) * 3 +
       stats_size * (sizeof(global_dyn_stats[0].sum) + sizeof(global_dyn_stats[0].count));
@@ -366,15 +343,6 @@ write_stats_snap()
       p += sizeof(global_http_trans_stats[i].count);
     }
     STAT_LOCK_RELEASE(&(global_http_trans_stat_lock));
-    stats_size = MAX_NNTP_TRANS_STATS - NO_NNTP_TRANS_STATS;
-    STAT_LOCK_ACQUIRE(&(global_nntp_trans_stat_lock));
-    for (i = 0; i < stats_size; i++) {
-      memcpy(p, (char *) &global_nntp_trans_stats[i].sum, sizeof(global_nntp_trans_stats[i].sum));
-      p += sizeof(global_nntp_trans_stats[i].sum);
-      memcpy(p, (char *) &global_nntp_trans_stats[i].count, sizeof(global_nntp_trans_stats[i].count));
-      p += sizeof(global_nntp_trans_stats[i].count);
-    }
-    STAT_LOCK_RELEASE(&(global_nntp_trans_stat_lock));
     stats_size = MAX_RNI_TRANS_STATS - NO_RNI_TRANS_STATS;
     STAT_LOCK_ACQUIRE(&(global_rni_trans_stat_lock));
     for (i = 0; i < stats_size; i++) {
@@ -633,7 +601,6 @@ initialize_all_global_stats()
   take_rusage_snap();           // fill in _old as well
 
   STAT_LOCK_INIT(&(global_http_trans_stat_lock), "Global Http Stats Lock");
-  STAT_LOCK_INIT(&(global_nntp_trans_stat_lock), "Global Nntp Stats Lock");
   STAT_LOCK_INIT(&(global_rni_trans_stat_lock), "Global Rni Stats Lock");
 
   for (istat = NO_HTTP_TRANS_STATS; istat < MAX_HTTP_TRANS_STATS; istat++) {
@@ -642,12 +609,6 @@ initialize_all_global_stats()
     }
   }
 
-  for (istat = NO_NNTP_TRANS_STATS; istat < MAX_NNTP_TRANS_STATS; istat++) {
-    if (!persistent_stat(istat)) {
-      INITIALIZE_GLOBAL_TRANS_STATS(global_nntp_trans_stats[istat]);
-    }
-  }
-
   for (istat = NO_RNI_TRANS_STATS; istat < MAX_RNI_TRANS_STATS; istat++) {
     if (!persistent_stat(istat)) {
       INITIALIZE_GLOBAL_TRANS_STATS(global_rni_trans_stats[istat]);

Modified: incubator/trafficserver/traffic/trunk/proxy/StatSystem.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/StatSystem.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/StatSystem.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/StatSystem.h Wed Apr 28 13:54:17 2010
@@ -169,18 +169,6 @@ struct HttpTransactionStatsString_t
   char *name;
 };
 
-//
-// NNTP Transaction Stats
-//
-typedef enum
-{
-  NO_NNTP_TRANS_STATS = 0,
-  //
-  // What do I put here?
-  //
-  MAX_NNTP_TRANS_STATS
-} NntpTransactionStat_t;
-
 
 //
 // RNI Transaction Stats
@@ -394,11 +382,6 @@ struct ink_unprot_global_stat_t
     ink_assert (!(X & DYN_STAT_MASK)); \
     READ_GLOBAL_HTTP_TRANS_STAT(X,C,S); \
 }
-#define READ_NNTP_TRANS_STAT(X,C,S) \
-{ \
-    ink_assert (!(X & DYN_STAT_MASK)); \
-    READ_GLOBAL_NNTP_TRANS_STAT(X,C,S); \
-}
 #define READ_RNI_TRANS_STAT(X,C,S) \
 { \
     ink_assert (!(X & DYN_STAT_MASK)); \
@@ -440,17 +423,6 @@ struct ink_unprot_global_stat_t
     STAT_LOCK_RELEASE(&(global_http_trans_stat_lock)); \
 }
 
-#define UPDATE_NNTP_TRANS_STATS(local_stat_struct_) \
-{ \
-    int i; \
-    STAT_LOCK_ACQUIRE(&(global_nntp_trans_stat_lock)); \
-    for (i=NO_NTTP_TRANS_STATS; i<MAX_NTTP_TRANS_STATS; i++) { \
-	global_nntp_trans_stats[i].count += (ink_statval_t)1; \
-	global_nntp_trans_stats[i].sum += local_stat_struct_[i].value; \
-    } \
-    STAT_LOCK_RELEASE(&(global_nntp_trans_stat_lock)); \
-}
-
 #define UPDATE_RNI_TRANS_STATS(local_stat_struct_) \
 { \
     int i; \
@@ -559,11 +531,6 @@ global_dyn_stats[X].sum = 0
     C = global_http_trans_stats[X].count; \
     S = global_http_trans_stats[X].sum; \
 }
-#define READ_GLOBAL_NNTP_TRANS_STAT(X,C,S) \
-{ \
-    C = global_nntp_trans_stats[X].count; \
-    S = global_nntp_trans_stats[X].sum; \
-}
 #define READ_GLOBAL_RNI_TRANS_STAT(X,C,S) \
 { \
     C = global_rni_trans_stats[X].count; \
@@ -619,11 +586,6 @@ S = global_dyn_stats[X].sum;
     C = global_http_trans_stats[X].count; \
     S = global_http_trans_stats[X].sum; \
 }
-#define READ_GLOBAL_NNTP_TRANS_STAT(X,C,S) \
-{ \
-    C = global_nntp_trans_stats[X].count; \
-    S = global_nntp_trans_stats[X].sum; \
-}
 #define READ_GLOBAL_RNI_TRANS_STAT(X,C,S) \
 { \
     C = global_rni_trans_stats[X].count; \
@@ -693,11 +655,6 @@ global_dyn_stats[X].sum = S
     C = global_http_trans_stats[X].count; \
     S = global_http_trans_stats[X].sum; \
 }
-#define READ_GLOBAL_NNTP_TRANS_STAT(X,C,S) \
-{ \
-    C = global_nntp_trans_stats[X].count; \
-    S = global_nntp_trans_stats[X].sum; \
-}
 #define READ_GLOBAL_RNI_TRANS_STAT(X,C,S) \
 { \
     C = global_rni_trans_stats[X].count; \
@@ -769,8 +726,6 @@ void *dyn_stats_int_msecs_to_float_secon
 //---------------------------------------------------------------------//
 extern ink_stat_lock_t global_http_trans_stat_lock;
 extern ink_unprot_global_stat_t global_http_trans_stats[MAX_HTTP_TRANS_STATS];
-extern ink_stat_lock_t global_nntp_trans_stat_lock;
-extern ink_unprot_global_stat_t global_nntp_trans_stats[MAX_NNTP_TRANS_STATS];
 extern inkcoreapi ink_stat_lock_t global_rni_trans_stat_lock;
 extern inkcoreapi ink_unprot_global_stat_t global_rni_trans_stats[MAX_RNI_TRANS_STATS];
 #ifndef USE_LOCKS_FOR_DYN_STATS

Modified: incubator/trafficserver/traffic/trunk/proxy/Update.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Update.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Update.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Update.cc Wed Apr 28 13:54:17 2010
@@ -119,7 +119,6 @@ struct schemes_descriptor proto_schemes[
   {"mailto:", 0},
   {"mid:", 0},
   {"news:", 0},
-  {"nntp:", 0},
   {"path:", 0},
   {"prospero:", 0},
   {"rlogin:", 0},

Modified: incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/api/include/ts.h Wed Apr 28 13:54:17 2010
@@ -374,7 +374,6 @@ extern "C"
   {
     INK_CACHE_DATA_TYPE_NONE,
     INK_CACHE_DATA_TYPE_HTTP,
-    INK_CACHE_DATA_TYPE_NNTP,
     INK_CACHE_DATA_TYPE_MIXT_RTSP,
     INK_CACHE_DATA_TYPE_MIXT_WMT,
     INK_CACHE_DATA_TYPE_MIXT_QTIME,

Modified: incubator/trafficserver/traffic/trunk/proxy/config/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/Makefile.am?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/Makefile.am Wed Apr 28 13:54:17 2010
@@ -36,7 +36,6 @@ dist_sysconf_DATA =	\
   logs_xml.config \
   mgmt_allow.config \
   mgr.cnf \
-  nntp_config.xml \
   parent.config \
   partition.config \
   plugin.config \

Modified: incubator/trafficserver/traffic/trunk/proxy/config/logs.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/logs.config?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/logs.config (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/logs.config Wed Apr 28 13:54:17 2010
@@ -37,7 +37,7 @@
 # =======
 #
 # An event log format specifies which fields are to be gathered from each
-# Http/ICP/NNTP access event and placed into the log file as a log entry.
+# Http/ICP access event and placed into the log file as a log entry.
 # For each new custom log format type, the following information is needed:
 #
 #   the word "format"

Modified: incubator/trafficserver/traffic/trunk/proxy/config/logs_xml.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/logs_xml.config?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/logs_xml.config (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/logs_xml.config Wed Apr 28 13:54:17 2010
@@ -170,7 +170,7 @@ Example2: do not log requests for domain
   <Protocols = "list of protocols"/>
       The list of protocols to log is a comma separated list of the
       protocols that the object logs. Valid protocol names are http 
-      (which includes ftp), nntp, icp, and mco. If the object has
+      (which includes ftp), icp, and mco. If the object has
       no Protocol tag, then it logs all protocols. The Protocol tag
       simply provides an easy way to create a filter that accepts the
       specified protocols.

Modified: incubator/trafficserver/traffic/trunk/proxy/config/stats.config.xml
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/stats.config.xml?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/stats.config.xml (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/stats.config.xml Wed Apr 28 13:54:17 2010
@@ -66,47 +66,6 @@
     </statistics>
 
 
-    <!-- NNTP -->
-    <statistics
-	minimum="0">
-        <destination>proxy.node.nntp.user_agents_total_documents_served</destination>
-        <destination scope="cluster">proxy.cluster.nntp.user_agents_total_documents_served</destination>
-        <expression>
-            proxy.process.nntp.incoming_requests
-        </expression>
-    </statistics>
-
-
-    <statistics
-	minimum="0">
-        <destination>proxy.node.nntp.current_server_connections</destination>
-        <destination scope="cluster">proxy.cluster.nntp.current_server_connections</destination>
-       <expression>
-            proxy.process.nntp.current_server_connections
-        </expression>
-    </statistics>
-
-
-    <statistics
-	minimum="0">
-        <destination>proxy.node.nntp.current_client_connections</destination>
-        <destination scope="cluster">proxy.cluster.nntp.current_client_connections</destination>
-        <expression>
-            proxy.process.nntp.current_client_connections
-        </expression>
-    </statistics>
-
-
-    <statistics
-	minimum="0">
-        <destination>proxy.node.nntp.current_cache_connections</destination>
-        <destination scope="cluster">proxy.cluster.nntp.current_cache_connections</destination>
-        <expression>
-            proxy.process.nntp.current_cache_connections
-        </expression>
-    </statistics>
-
-
     <!-- FTP -->
     <statistics
 	minimum="0">
@@ -605,19 +564,6 @@
     <statistics
         interval="10"
 	minimum="0">
-        <destination>proxy.node.nntp.user_agent_xacts_per_second</destination>
-        <destination scope="cluster">proxy.cluster.nntp.user_agent_xacts_per_second</destination>
-        <expression>
-            #proxy.process.nntp.incoming_requests *
-            $HRTIME_SECOND                  /
-            _DIFFTIME
-        </expression>
-    </statistics>
-
-  
-    <statistics
-        interval="10"
-	minimum="0">
         <destination>proxy.node.ftp.user_agent_xacts_per_second</destination>
         <destination scope="cluster">proxy.cluster.ftp.user_agent_xacts_per_second</destination>
         <expression>
@@ -687,7 +633,6 @@
         <destination scope="cluster">proxy.cluster.user_agent_xacts_per_second</destination>
         <expression>
             proxy.node.http.user_agent_xacts_per_second  +
-            proxy.node.nntp.user_agent_xacts_per_second  +
             proxy.node.ftp.user_agent_xacts_per_second   +
             proxy.node.rni.user_agent_xacts_per_second   +
             proxy.node.wmt.user_agent_xacts_per_second   +
@@ -705,7 +650,6 @@
         <destination>proxy.node.user_agents_total_documents_served</destination>
         <expression>
             proxy.node.http.user_agents_total_documents_served +
-            proxy.node.nntp.user_agents_total_documents_served +
             proxy.node.ftp.user_agents_total_documents_served  +
             proxy.node.rni.user_agents_total_documents_served  +
             proxy.node.wmt.user_agents_total_documents_served  +
@@ -803,17 +747,6 @@
 
     <statistics
 	minimum="0">
-        <destination>proxy.node.nntp.downstream_total_bytes</destination>
-        <destination scope="cluster">proxy.cluster.nntp.downstream_total_bytes</destination>
-        <expression>
-            proxy.process.nntp.downstream.request_bytes +
-            proxy.process.nntp.downstream.response_bytes
-        </expression>
-    </statistics>
-
-
-    <statistics
-	minimum="0">
         <destination>proxy.node.ftp.downstream_total_bytes</destination>
         <destination scope="cluster">proxy.cluster.ftp.downstream_total_bytes</destination>
         <expression>
@@ -913,17 +846,6 @@
 
     <statistics
 	minimum="0">
-        <destination>proxy.node.nntp.upstream_total_bytes</destination>
-        <destination scope="cluster">proxy.cluster.nntp.upstream_total_bytes</destination>
-        <expression>
-            proxy.process.nntp.upstream.request_bytes +
-            proxy.process.nntp.upstream.response_bytes
-        </expression>
-    </statistics>
-
-
-    <statistics
-	minimum="0">
         <destination>proxy.node.ftp.upstream_total_bytes</destination>
         <destination scope="cluster">proxy.cluster.ftp.upstream_total_bytes</destination>
         <expression>
@@ -985,7 +907,6 @@
         <expression>
             proxy.node.http.user_agent_total_request_bytes  +
             proxy.node.http.user_agent_total_response_bytes +
-            proxy.node.nntp.downstream_total_bytes          +
             proxy.node.ftp.downstream_total_bytes           +
             proxy.node.rni.downstream_total_bytes           +
             proxy.node.wmt.downstream_total_bytes           +
@@ -1004,7 +925,6 @@
             proxy.node.http.origin_server_total_response_bytes +
             proxy.node.http.parent_proxy_total_request_bytes   +
             proxy.node.http.parent_proxy_total_response_bytes  +
-            proxy.node.nntp.upstream_total_bytes               +
             proxy.node.ftp.upstream_total_bytes                +
             proxy.node.rni.upstream_total_bytes                +
             proxy.node.wmt.upstream_total_bytes                +
@@ -1099,7 +1019,6 @@
         <expression>
             (
             #proxy.node.http.user_agent_total_response_bytes +
-            #proxy.node.nntp.downstream_total_bytes          +
             #proxy.node.ftp.downstream_total_bytes           +
             #proxy.node.rni.downstream_total_bytes           +
             #proxy.node.wmt.downstream_total_bytes           +
@@ -1188,16 +1107,6 @@
     <statistics
 	minimum="0"
         interval="10">
-        <destination>proxy.node.nntp.cache_hit_fresh_avg_10s</destination>
-        <expression>
-            #proxy.process.nntp.cache_hit_fresh
-        </expression>
-    </statistics>
-
-
-    <statistics
-	minimum="0"
-        interval="10">
         <destination>proxy.node.rni.block_hit_count_avg_10s</destination>
         <expression>
             #proxy.process.rni.block_hit_count
@@ -1318,16 +1227,6 @@
     <statistics
 	minimum="0"
         interval="10">
-        <destination>proxy.node.nntp.cache_miss_cold_avg_10s</destination>
-        <expression>
-            #proxy.process.nntp.cache_miss_cold
-        </expression>
-    </statistics>
-
-
-    <statistics
-	minimum="0"
-        interval="10">
         <destination>proxy.node.rni.block_miss_count_avg_10s</destination>
         <expression>
             #proxy.process.rni.block_miss_count
@@ -1377,7 +1276,6 @@
             proxy.node.http.cache_hit_stale_served_avg_10s +
             proxy.node.ftp.cache_hits_avg_10s              +
 	    proxy.node.ftp.cache_hit_fresh_avg_10s         +
-            proxy.node.nntp.cache_hit_fresh_avg_10s        +
             proxy.node.rni.block_hit_count_avg_10s         +
             proxy.node.wmt.block_hit_count_avg_10s         +
             proxy.node.qt.block_hit_count_avg_10s          +
@@ -1400,7 +1298,6 @@
             proxy.node.http.cache_read_error_avg_10s           +
             proxy.node.ftp.cache_misses_avg_10s                +
 	    proxy.node.ftp.cache_miss_cold_avg_10s             +
-            proxy.node.nntp.cache_miss_cold_avg_10s            +
             proxy.node.rni.block_miss_count_avg_10s            +
             proxy.node.wmt.block_miss_count_avg_10s            +
             proxy.node.qt.block_miss_count_avg_10s             +
@@ -1448,7 +1345,6 @@
             proxy.process.http.cache_hit_stale_served +
             proxy.process.ftp.cache_hits              +
 	    proxy.process.ftp.cache_hit_fresh         +
-            proxy.process.nntp.cache_hit_fresh        +
             proxy.process.rni.block_hit_count         +
             proxy.process.wmt.block_hit_count         +
             proxy.process.qt.block_hit_count          +
@@ -1470,7 +1366,6 @@
             proxy.process.http.cache_read_error           +
             proxy.process.ftp.cache_misses                +
 	    proxy.process.ftp.cache_miss_cold             +
-            proxy.process.nntp.cache_miss_cold            +
             proxy.process.rni.block_miss_count            +
             proxy.process.wmt.block_miss_count            +
             proxy.process.qt.block_miss_count             +
@@ -2481,7 +2376,6 @@
         <destination scope="cluster">proxy.cluster.current_client_connections</destination>
         <expression>
             proxy.node.http.user_agent_current_connections_count +
-            proxy.node.nntp.current_client_connections           +
             proxy.node.ftp.current_client_connections            +
             proxy.node.rni.current_client_connections            +
             proxy.node.wmt.current_client_connections            +
@@ -2498,7 +2392,6 @@
         <expression>
             proxy.node.http.origin_server_current_connections_count +
             proxy.node.http.current_parent_proxy_connections        +
-            proxy.node.nntp.current_server_connections              + 
             proxy.node.ftp.current_server_connections               + 
             proxy.node.rni.current_server_connections               +
             proxy.node.wmt.current_server_connections               +
@@ -2514,7 +2407,6 @@
         <destination scope="cluster">proxy.cluster.current_cache_connections</destination>
         <expression>
             proxy.node.http.cache_current_connections_count +
-            proxy.node.nntp.current_cache_connections       +
             proxy.node.ftp.current_cache_connections        +
             proxy.node.rni.current_cache_connections	    +
             proxy.node.wmt.current_cache_connections        +

Modified: incubator/trafficserver/traffic/trunk/proxy/congest/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/congest/Makefile.am?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/congest/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/congest/Makefile.am Wed Apr 28 13:54:17 2010
@@ -20,7 +20,6 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/librecords \
   -I$(top_srcdir)/proxy \
   $(iocore_include_dirs) \
-  -I$(top_srcdir)/proxy/nntp \
   -I$(top_srcdir)/proxy/http2 \
   -I$(top_srcdir)/proxy/mgmt2 \
   -I$(top_srcdir)/proxy/mgmt2/preparse \

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/stats.memo
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/stats.memo?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/stats.memo (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/stats.memo Wed Apr 28 13:54:17 2010
@@ -13,7 +13,7 @@ Proxy Schems:
   Type          :  A bit vector. a bit per scheme. 
   Who It Affects:  HTTP Engine
   Comments      :  Current schemes are { HTTP, FTP }
-                   Future Schemes { GOPHER, HTTPS, NNTP }
+                   Future Schemes { GOPHER, HTTPS }
 
   Name          :  TunnelingEnabled
   Type          :  boolean

Modified: incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/Log.cc Wed Apr 28 13:54:17 2010
@@ -829,7 +829,6 @@ Log::init_fields()
   Ptr<LogFieldAliasTable> entry_type_map = NEW(new LogFieldAliasTable);
   entry_type_map->init(N_LOG_ENTRY_TYPES,
                        LOG_ENTRY_HTTP, "LOG_ENTRY_HTTP",
-                       LOG_ENTRY_NNTP, "LOG_ENTRY_NNTP",
                        LOG_ENTRY_FTP, "LOG_ENTRY_FTP",
                        LOG_ENTRY_ICP, "LOG_ENTRY_ICP", LOG_ENTRY_MIXT, "LOG_ENTRY_MIXT");
   field = NEW(new LogField("log_entry_type", "etype",

Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogAccess.h Wed Apr 28 13:54:17 2010
@@ -126,7 +126,6 @@
 enum LogEntryType
 {
   LOG_ENTRY_HTTP = 0,
-  LOG_ENTRY_NNTP,
   LOG_ENTRY_FTP,
   LOG_ENTRY_ICP,
   LOG_ENTRY_MIXT,

Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc Wed Apr 28 13:54:17 2010
@@ -118,7 +118,6 @@ LogConfig::setup_default_values()
   logfile_dir = xstrdup(".");
 
   separate_icp_logs = 1;
-  separate_nntp_logs = 1;
   separate_mixt_logs = -1;
   separate_host_logs = FALSE;
 
@@ -423,18 +422,13 @@ LogConfig::read_configuration_variables(
   // SPLITTING
   // 0 means no splitting
   // 1 means splitting
-  // for icp, nntp, and mixt 
+  // for icp and mixt 
   //   -1 means filter out (do not log and do not create split file)
   val = (int) LOG_ConfigReadInteger("proxy.config.log2.separate_icp_logs");
   if (val == 0 || val == 1 || val == -1) {
     separate_icp_logs = val;
   };
 
-  val = (int) LOG_ConfigReadInteger("proxy.config.log2.separate_nntp_logs");
-  if (val == 0 || val == 1 || val == -1) {
-    separate_nntp_logs = val;
-  };
-
   val = (int) LOG_ConfigReadInteger("proxy.config.log2.separate_mixt_logs");
   if (val == 0 || val == 1 || val == -1) {
     separate_mixt_logs = val;
@@ -868,7 +862,6 @@ LogConfig::display(FILE * fd)
   fprintf(fd, "   extended2_log_name = %s\n", extended2_log_name);
   fprintf(fd, "   extended2_log_header = %s\n", extended2_log_header ? extended2_log_header : "<no header defined>");
   fprintf(fd, "   separate_icp_logs = %d\n", separate_icp_logs);
-  fprintf(fd, "   separate_nntp_logs = %d\n", separate_nntp_logs);
   fprintf(fd, "   separate_mixt_logs = %d\n", separate_mixt_logs);
   fprintf(fd, "   separate_host_logs = %d\n", separate_host_logs);
   fprintf(fd, "   collation_mode = %d\n", collation_mode);
@@ -1060,17 +1053,17 @@ LogConfig::create_pre_defined_objects_wi
 LogFilter *
 LogConfig::split_by_protocol(const PreDefinedFormatInfoList & pre_def_info_list)
 {
-  if (!(separate_nntp_logs || separate_icp_logs || separate_mixt_logs)) {
+  if (!(separate_icp_logs || separate_mixt_logs)) {
     return NULL;
   }
   // http MUST be last entry
   enum
-  { nntp = 0, icp, mixt, http };
-  unsigned value[] = { LOG_ENTRY_NNTP, LOG_ENTRY_ICP,
+  { icp=0, mixt, http };
+  unsigned value[] = { LOG_ENTRY_ICP,
     LOG_ENTRY_MIXT, LOG_ENTRY_HTTP
   };
-  const char *name[] = { "nntp", "icp", "mixt", "http" };
-  const char *filter_name[] = { "__nntp__", "__icp__", "__mixt__", "__http__" };
+  const char *name[] = { "icp", "mixt", "http" };
+  const char *filter_name[] = { "__icp__", "__mixt__", "__http__" };
   unsigned filter_val[http];    // protocols to reject
   size_t n = 0;
 
@@ -1078,15 +1071,6 @@ LogConfig::split_by_protocol(const PreDe
   LogField *etype_field = Log::global_field_list.find_by_symbol("etype");
   ink_assert(etype_field);
 
-  if (separate_nntp_logs) {
-    if (separate_nntp_logs == 1) {
-      filter[0] = NEW(new LogFilterInt(filter_name[nntp], etype_field, LogFilter::ACCEPT, LogFilter::MATCH, value[nntp]));
-      create_pre_defined_objects_with_filter(pre_def_info_list, 1, filter, name[nntp]);
-      delete filter[0];
-    }
-    filter_val[n++] = value[nntp];
-  }
-
   if (separate_icp_logs) {
     if (separate_icp_logs == 1) {
       filter[0] = NEW(new LogFilterInt(filter_name[icp], etype_field, LogFilter::ACCEPT, LogFilter::MATCH, value[icp]));
@@ -1389,8 +1373,6 @@ LogConfig::register_configs()
 
   RecRegisterConfigInt(RECT_CONFIG, "proxy.config.log2.separate_icp_logs", 0, RECU_DYNAMIC, RECC_NULL, NULL);
 
-  RecRegisterConfigInt(RECT_CONFIG, "proxy.config.log2.separate_nntp_logs", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
   RecRegisterConfigInt(RECT_CONFIG, "proxy.config.log2.separate_mixt_logs", 0, RECU_DYNAMIC, RECC_NULL, NULL);
 
   RecRegisterConfigInt(RECT_CONFIG, "proxy.config.log2.separate_host_logs", 0, RECU_DYNAMIC, RECC_NULL, NULL);
@@ -1505,7 +1487,6 @@ LogConfig::register_config_callbacks()
 
   // SPLITTING
   LOG_RegisterConfigUpdateFunc("proxy.config.log2.separate_icp_logs", &LogConfig::reconfigure, NULL);
-  LOG_RegisterConfigUpdateFunc("proxy.config.log2.separate_nntp_logs", &LogConfig::reconfigure, NULL);
 //    LOG_RegisterConfigUpdateFunc ("proxy.config.log2.separate_mixt_logs",
 //                                  &LogConfig::reconfigure, NULL);
   LOG_RegisterConfigUpdateFunc("proxy.config.log2.separate_host_logs", &LogConfig::reconfigure, NULL);
@@ -2612,9 +2593,7 @@ LogConfig::read_xml_log_config(int from_
           size_t numValid = 0;
           char *t;
           while (t = tok.getNext(), t != NULL) {
-            if (strcasecmp(t, "nntp") == 0) {
-              val_array[numValid++] = LOG_ENTRY_NNTP;
-            } else if (strcasecmp(t, "icp") == 0) {
+            if (strcasecmp(t, "icp") == 0) {
               val_array[numValid++] = LOG_ENTRY_ICP;
             } else if (strcasecmp(t, "mixt") == 0) {
               val_array[numValid++] = LOG_ENTRY_MIXT;

Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogConfig.h Wed Apr 28 13:54:17 2010
@@ -221,7 +221,6 @@ public:
   int extended2_log_enabled;
   int extended2_log_is_ascii;
   int separate_icp_logs;
-  int separate_nntp_logs;
   int separate_mixt_logs;
   int separate_host_logs;
   int collation_mode;

Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc Wed Apr 28 13:54:17 2010
@@ -62,7 +62,6 @@ int command_flag = 0;
 int http_accept_port_number = 0;
 int http_accept_file_descriptor = 0;
 int remote_management_flag = 0;
-int nntp_accept_file_descriptor = -1;
 int ftp_accept_file_descriptor = -1;
 int auto_clear_hostdb_flag = 0;
 char proxy_name[256] = "unknown";

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc Wed Apr 28 13:54:17 2010
@@ -121,7 +121,6 @@ initializeRegistry()
   configFiles->addFile("splitdns.config", false);
   configFiles->addFile("ssl_multicert.config", false);
   configFiles->addFile("stats.config.xml", false);
-  configFiles->addFile("nntp_config.xml", false);
 #if defined(OEM)
   configFiles->addFile("net.config.xml", true);
   /* only if the vscan plugin is installed would this file be read */

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc Wed Apr 28 13:54:17 2010
@@ -57,7 +57,6 @@ const char *alarmText[] = {
   "Cache Warning",
   "Logging Error",
   "Logging Warning",
-  "NNTP Error",
   "Mgmt Debugging Alarm",
   "Configuration File Update Failed",
   "Unable to Establish Manager User-Interface Services",

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h Wed Apr 28 13:54:17 2010
@@ -65,7 +65,6 @@
 #define MGMT_ALARM_PROXY_CACHE_WARNING           9
 #define MGMT_ALARM_PROXY_LOGGING_ERROR           10
 #define MGMT_ALARM_PROXY_LOGGING_WARNING         11
-#define MGMT_ALARM_PROXY_NNTP_ERROR	         12
 #define MGMT_ALARM_MGMT_TEST                     13     /* to aid in debugging */
 #define MGMT_ALARM_CONFIG_UPDATE_FAILED          14
 #define MGMT_ALARM_WEB_ERROR                     15

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.h?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/BaseManager.h Wed Apr 28 13:54:17 2010
@@ -84,7 +84,7 @@
 #define MGMT_SIGNAL_CACHE_WARNING         8
 #define MGMT_SIGNAL_LOGGING_ERROR         9
 #define MGMT_SIGNAL_LOGGING_WARNING       10
-#define MGMT_SIGNAL_NNTP_ERROR            11
+// Currently unused: 11
 #define MGMT_SIGNAL_PLUGIN_CONFIG_REG     12
 #define MGMT_SIGNAL_PLUGIN_ADD_REC        13
 #define MGMT_SIGNAL_PLUGIN_SET_CONFIG     14

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Wed Apr 28 13:54:17 2010
@@ -698,9 +698,6 @@ LocalManager::handleMgmtMsgFromProcesses
   case MGMT_SIGNAL_SYSTEM_ERROR:
     alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_SYSTEM_ERROR, data_raw);
     break;
-  case MGMT_SIGNAL_NNTP_ERROR:
-    alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_NNTP_ERROR, data_raw);
-    break;
   case MGMT_SIGNAL_LOG_SPACE_CRISIS:
     alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_LOG_SPACE_CRISIS, data_raw);
     break;

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Wed Apr 28 13:54:17 2010
@@ -1431,8 +1431,6 @@ fileUpdated(char *fname)
   } else if (strcmp(fname, "proxy.config.body_factory.template_sets_dir") == 0) {
     lmgmt->signalFileChange("proxy.config.body_factory.template_sets_dir");
 
-  } else if (strcmp(fname, "nntp_config.xml") == 0) {
-    lmgmt->signalFileChange("proxy.config.nntp.config_file");
   } else if (strcmp(fname, "stats.config.xml") == 0) {
 #if defined(STATPRO)
     if (statProcessor) {

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=938979&r1=938978&r2=938979&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Wed Apr 28 13:54:17 2010
@@ -1298,56 +1298,6 @@ RecordElement RecordsConfig[] = {
   ,
   //##############################################################################
   //#
-  //# NNTP Engine
-  //#
-  //##############################################################################
-  //# WebUI
-  {CONFIG, "proxy.config.nntp.plugin_name", "", INK_STRING, "nntp.so", RU_RESTART_TS, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.config_file", "", INK_STRING, "nntp_config.xml", RU_RESTART_TS, RR_NULL, RC_NULL, NULL,
-   RA_NULL}
-  ,
-  //# NNTP module
-  {CONFIG, "proxy.config.nntp.enabled", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_INT, "[0-1]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.server_port", "", INK_INT, "119", RU_RESTART_TM, RR_REQUIRED, RC_INT, "[0-65535]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.cache_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.posting_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.logging_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_NULL, "[0-1]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.transparency_enabled", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, "[0-1]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.client_timeout", "", INK_INT, "300", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.server_timeout", "", INK_INT, "600", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.expire_group", "", INK_INT, "600", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.expire_overview", "", INK_INT, "600", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.expire_list_active", "", INK_INT, "86400", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.expire_list_atimes", "", INK_INT, "86400", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.greeting", "", INK_STRING, "200 NNTP service ready, posting allowed", RU_REREAD, RR_NULL,
-   RC_STR, ".*", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.greeting_nopost", "", INK_STRING, "201 NNTP service ready, posting prohibited", RU_REREAD,
-   RR_NULL, RC_STR, ".*", RA_NULL}
-  ,
-  //# Debgugging & finetuning; hidden from users
-  {CONFIG, "proxy.config.nntp.show_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.debug_enabled", "", INK_INT, "1", RU_REREAD, RR_NULL, RC_INT, "[0-1]", RA_NULL}
-  ,
-  {CONFIG, "proxy.config.nntp.overview_range_size", "", INK_INT, "512", RU_REREAD, RR_NULL, RC_INT, "^[0-9]+$", RA_NULL}
-  ,
-
-  //##############################################################################
-  //#
   //# Http Statistics
   //#
   //##############################################################################
@@ -2490,7 +2440,6 @@ RecordElement RecordsConfig[] = {
   //# 2 - No fingerprinting
   //# UNIMPLEMENTED CONFIG proxy.config.cache.fingerprint_method INT 2
   //# UNIMPLEMENTED: CONFIG proxy.config.cache.limits.http.quota FLOAT 1.0
-  //# UNIMPLEMENTED: CONFIG proxy.config.cache.limits.nntp.quota FLOAT 1.0
   //# UNIMPLEMENTED: CONFIG proxy.config.cache.limits.rtsp.quota FLOAT 1.0
   //
   //  #
@@ -2790,8 +2739,6 @@ RecordElement RecordsConfig[] = {
   ,
   {CONFIG, "proxy.config.log2.separate_icp_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.log2.separate_nntp_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
   {CONFIG, "proxy.config.log2.separate_mixt_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.log2.separate_host_logs", "", INK_INT, "0", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -3745,8 +3692,6 @@ RecordElement RecordsConfig[] = {
   ,
   {NODE, "proxy.node.ftp.cache_hit_fresh_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {NODE, "proxy.node.nntp.cache_hit_fresh_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
   {NODE, "proxy.node.rni.block_hit_count_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {NODE, "proxy.node.wmt.block_hit_count_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -3773,8 +3718,6 @@ RecordElement RecordsConfig[] = {
   ,
   {NODE, "proxy.node.ftp.cache_miss_cold_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  {NODE, "proxy.node.nntp.cache_miss_cold_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
   {NODE, "proxy.node.rni.block_miss_count_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
   {NODE, "proxy.node.wmt.block_miss_count_avg_10s", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -4012,22 +3955,6 @@ RecordElement RecordsConfig[] = {
   ,
   {NODE, "proxy.node.http.cache_total_misses", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
-  //#NNTP
-  {NODE, "proxy.node.nntp.user_agents_total_documents_served", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL,
-   RA_NULL}
-  ,
-  {NODE, "proxy.node.nntp.user_agent_xacts_per_second", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {NODE, "proxy.node.nntp.upstream_total_bytes", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {NODE, "proxy.node.nntp.downstream_total_bytes", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {NODE, "proxy.node.nntp.current_client_connections", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {NODE, "proxy.node.nntp.current_server_connections", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {NODE, "proxy.node.nntp.current_cache_connections", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
   //#FTP
   {NODE, "proxy.node.ftp.user_agents_total_documents_served", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
   ,
@@ -4297,23 +4224,6 @@ RecordElement RecordsConfig[] = {
   {CLUSTER, "proxy.cluster.http.parent_proxy_total_response_bytes", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL,
    RA_NULL}
   ,
-  //#NNTP
-  {CLUSTER, "proxy.cluster.nntp.user_agent_xacts_per_second", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL,
-   RA_NULL}
-  ,
-  {CLUSTER, "proxy.cluster.nntp.user_agents_total_documents_served", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL,
-   RA_NULL}
-  ,
-  {CLUSTER, "proxy.cluster.nntp.upstream_total_bytes", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {CLUSTER, "proxy.cluster.nntp.downstream_total_bytes", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {CLUSTER, "proxy.cluster.nntp.current_client_connections", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {CLUSTER, "proxy.cluster.nntp.current_server_connections", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
-  {CLUSTER, "proxy.cluster.nntp.current_cache_connections", "", INK_INT, "0", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
-  ,
   //#FTP
   {CLUSTER, "proxy.cluster.ftp.user_agent_xacts_per_second", "", INK_FLOAT, "0.0", RU_NULL, RR_NULL, RC_NULL, NULL,
    RA_NULL}



Mime
View raw message