You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/02/23 23:01:55 UTC

svn commit: r1073963 - in /trafficserver/traffic/trunk/mgmt: html2/ html2/configure/ html2/monitor/ web2/

Author: igalic
Date: Wed Feb 23 22:01:55 2011
New Revision: 1073963

URL: http://svn.apache.org/viewvc?rev=1073963&view=rev
Log:
[TS-641] Remove inktomi*.css and some files only referenced by it.

Removed:
    trafficserver/traffic/trunk/mgmt/html2/configure/c_view_debug_logs.ink
    trafficserver/traffic/trunk/mgmt/html2/configure/f_configs.ink
    trafficserver/traffic/trunk/mgmt/html2/inktomi.css
    trafficserver/traffic/trunk/mgmt/html2/inktomiLarge.css
    trafficserver/traffic/trunk/mgmt/html2/monitor/m_alarm.ink
    trafficserver/traffic/trunk/mgmt/html2/navigation_tree.xml.win
Modified:
    trafficserver/traffic/trunk/mgmt/html2/Makefile.am
    trafficserver/traffic/trunk/mgmt/html2/configure/Makefile.am
    trafficserver/traffic/trunk/mgmt/html2/monitor/Makefile.am
    trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc
    trafficserver/traffic/trunk/mgmt/web2/WebHttpRender.h

Modified: trafficserver/traffic/trunk/mgmt/html2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/html2/Makefile.am?rev=1073963&r1=1073962&r2=1073963&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/html2/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/html2/Makefile.am Wed Feb 23 22:01:55 2011
@@ -35,6 +35,4 @@ uninstall-hook:
 webuidir = $(pkgdatadir)
 dist_webui_DATA = \
 	index.ink \
-	inktomi.css \
-	inktomiLarge.css \
 	resize.js

Modified: trafficserver/traffic/trunk/mgmt/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/html2/configure/Makefile.am?rev=1073963&r1=1073962&r2=1073963&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/html2/configure/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/html2/configure/Makefile.am Wed Feb 23 22:01:55 2011
@@ -22,9 +22,7 @@ dist_webui_DATA = \
 	c_net_config.ink \
 	c_net_device.ink \
 	c_tab.ink \
-	c_view_debug_logs.ink \
 	f_cache_config.ink \
-	f_configs.ink \
 	f_hosting_config.ink \
 	f_icp_config.ink \
 	f_ip_allow_config.ink \

Modified: trafficserver/traffic/trunk/mgmt/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/html2/monitor/Makefile.am?rev=1073963&r1=1073962&r2=1073963&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/html2/monitor/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/html2/monitor/Makefile.am Wed Feb 23 22:01:55 2011
@@ -16,7 +16,6 @@
 
 webuidir = $(pkgdatadir)/monitor
 dist_webui_DATA = \
-	m_alarm.ink \
 	m_net_device.ink \
 	m_net.ink \
 	m_overview_details_less.ink \

Modified: trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc?rev=1073963&r1=1073962&r2=1073963&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc Wed Feb 23 22:01:55 2011
@@ -665,20 +665,6 @@ Ldone:
 #undef BUF_SIZE
 #undef NULL_STR
 
-static int
-handle_config_files(WebHttpContext * whc, const char *file)
-{
-  NOWARN_UNUSED(file);
-  return WebHttpRender(whc, HTML_FILE_ALL_CONFIG);
-}
-
-static int
-handle_debug_logs(WebHttpContext * whc, const char *file)
-{
-  NOWARN_UNUSED(file);
-  return WebHttpRender(whc, HTML_VIEW_DEBUG_LOGS_FILE);
-}
-
 //-------------------------------------------------------------------------
 // handle_synthetic
 //-------------------------------------------------------------------------
@@ -704,19 +690,6 @@ handle_synthetic(WebHttpContext * whc, c
 }
 
 //-------------------------------------------------------------------------
-// handle_submit_alarm
-//-------------------------------------------------------------------------
-
-static int
-handle_submit_alarm(WebHttpContext * whc, const char *file)
-{
-  NOWARN_UNUSED(file);
-  resolveAlarm(whc->post_data_ht);
-  whc->top_level_render_file = xstrdup(HTML_ALARM_FILE);
-  return handle_ink_extn(whc, HTML_ALARM_FILE);
-}
-
-//-------------------------------------------------------------------------
 // handle_submit_mgmt_auth
 //-------------------------------------------------------------------------
 
@@ -1566,15 +1539,12 @@ WebHttpInit()
 
   // initialize submit bindings
   g_submit_bindings_ht = ink_hash_table_create(InkHashTableKeyType_String);
-  ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_ALARM_FILE, (void *) handle_submit_alarm);
   ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_MGMT_AUTH_FILE, (void *) handle_submit_mgmt_auth);
   //ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_SNAPSHOT_FILE, handle_submit_snapshot);
   ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_VIEW_LOGS_FILE, (void *) handle_submit_view_logs);
   // initialize file bindings
   g_file_bindings_ht = ink_hash_table_create(InkHashTableKeyType_String);
   ink_hash_table_insert(g_file_bindings_ht, HTML_CHART_FILE, (void *) handle_chart);
-  ink_hash_table_insert(g_file_bindings_ht, HTML_BACKDOOR_CONFIG_FILES, (void *) handle_config_files);
-  ink_hash_table_insert(g_file_bindings_ht, HTML_BACKDOOR_DEBUG_LOGS, (void *) handle_debug_logs);
   ink_hash_table_insert(g_file_bindings_ht, HTML_SYNTHETIC_FILE, (void *) handle_synthetic);
 
   // initialize extension bindings

Modified: trafficserver/traffic/trunk/mgmt/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebHttpRender.h?rev=1073963&r1=1073962&r2=1073963&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebHttpRender.h Wed Feb 23 22:01:55 2011
@@ -383,7 +383,6 @@
 
 #define HTML_WRAP_OFF                   "off"
 
-#define HTML_ALARM_FILE                 "/monitor/m_alarm.ink"
 #define HTML_MGMT_GENERAL_FILE          "/configure/c_mgmt_general.ink"
 #define HTML_MGMT_LOGIN_FILE            "/configure/c_mgmt_login.ink"
 #define HTML_INSPECTOR_DISPLAY_FILE     "/configure/c_inspector_display.ink"
@@ -401,7 +400,6 @@
 #define HTML_SUBMIT_INSPECTOR_FILE      "/submit_inspector.cgi"
 #define HTML_SUBMIT_INSPECTOR_DPY_FILE  "/configure/submit_inspector_display.cgi"
 #define HTML_SUBMIT_VIEW_LOGS_FILE      "/log.cgi"
-#define HTML_VIEW_DEBUG_LOGS_FILE       "/configure/c_view_debug_logs.ink"
 #define HTML_SUBMIT_UPDATE_FILE         "/submit_update.cgi"
 #define HTML_SUBMIT_UPDATE_CONFIG       "/submit_update_config.cgi"
 #define HTML_SUBMIT_CONFIG_DISPLAY      "/configure/submit_config_display.cgi"
@@ -416,7 +414,6 @@
 #define HTML_SYNTHETIC_FILE             "/synthetic.txt"
 
 #define HTML_CONFIG_FILE_TAG            "filename"
-#define HTML_FILE_ALL_CONFIG            "/configure/f_configs.ink"
 #define HTML_FILE_CACHE_CONFIG          "/configure/f_cache_config.ink"
 #define HTML_FILE_HOSTING_CONFIG        "/configure/f_hosting_config.ink"
 #define HTML_FILE_ICP_CONFIG            "/configure/f_icp_config.ink"