trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1057972 - in /trafficserver/traffic/trunk: ./ proxy/mgmt2/html2/ proxy/mgmt2/html2/agent-installer/ proxy/mgmt2/html2/configure/ proxy/mgmt2/html2/configure/helper/ proxy/mgmt2/html2/tune/ proxy/mgmt2/web2/
Date Wed, 12 Jan 2011 02:08:51 GMT
Author: igalic
Date: Wed Jan 12 02:08:51 2011
New Revision: 1057972

URL: http://svn.apache.org/viewvc?rev=1057972&view=rev
Log:
Removing more cruft from WebUI

Removed:
    trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/
    trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_snapshot_floppy.ink
    trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/
Modified:
    trafficserver/traffic/trunk/LAYOUT
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
    trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
    trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
    trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h

Modified: trafficserver/traffic/trunk/LAYOUT
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/LAYOUT?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/LAYOUT (original)
+++ trafficserver/traffic/trunk/LAYOUT Wed Jan 12 02:08:51 2011
@@ -19,7 +19,6 @@ The Traffic Server 2.1 Default LAYOUT
 |   `-- trafficserver
 |-- share
 |   `-- trafficserver
-|       |-- agent-installer
 |       |-- charting
 |       |-- configure
 |       |   `-- helper

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Wed Jan 12 02:08:51 2011
@@ -1233,10 +1233,8 @@ AC_CONFIG_FILES([proxy/mgmt2/cluster/Mak
 AC_CONFIG_FILES([proxy/mgmt2/cop/Makefile])
 AS_IF([test "x$enable_webui" = "xyes"],
   [AC_CONFIG_FILES([proxy/mgmt2/html2/Makefile])
-   AC_CONFIG_FILES([proxy/mgmt2/html2/agent-installer/Makefile])
    AC_CONFIG_FILES([proxy/mgmt2/html2/charting/Makefile])
    AC_CONFIG_FILES([proxy/mgmt2/html2/configure/Makefile])
-   AC_CONFIG_FILES([proxy/mgmt2/html2/configure/helper/Makefile])
    AC_CONFIG_FILES([proxy/mgmt2/html2/images/Makefile])
    AC_CONFIG_FILES([proxy/mgmt2/html2/include/Makefile])
    AC_CONFIG_FILES([proxy/mgmt2/html2/monitor/Makefile])

Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am Wed Jan 12 02:08:51 2011
@@ -17,14 +17,12 @@
 sysconfdir = $(pkgsysconfdir)
 dist_sysconf_DATA = english.dict
 
-SUBDIRS = agent-installer charting configure images include monitor mrtg tune
+SUBDIRS = charting configure images include monitor mrtg tune
 
 install-data-local:
 	$(INSTALL) -d -o $(pkgsysuser) -g $(pkgsysgroup) $(DESTDIR)$(pkgdatadir) \
-	$(DESTDIR)$(pkgdatadir)/agent-installer \
 	$(DESTDIR)$(pkgdatadir)/charting \
 	$(DESTDIR)$(pkgdatadir)/configure \
-	$(DESTDIR)$(pkgdatadir)/configure/helper \
 	$(DESTDIR)$(pkgdatadir)/images \
 	$(DESTDIR)$(pkgdatadir)/include \
 	$(DESTDIR)$(pkgdatadir)/monitor \

Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am Wed Jan 12 02:08:51
2011
@@ -14,8 +14,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = helper
-
 webuidir = $(pkgdatadir)/configure
 dist_webui_DATA = \
 	c_autoconf_pac.ink \
@@ -75,7 +73,6 @@ dist_webui_DATA = \
 	c_real_networks_general.ink \
 	c_reverse_proxy.ink \
 	c_snapshot_filesystem.ink \
-	c_snapshot_floppy.ink \
 	c_snapshot.ink \
 	c_socks_general.ink \
 	c_socks_proxy.ink \

Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml Wed Jan 12 02:08:51
2011
@@ -183,9 +183,6 @@
         <LINK name="File System" refresh="false"
               file_link="/configure/c_snapshot_filesystem.ink"
               help_link="/help/ts.ink?help=c_snap.htm"/>
-        <LINK name="Floppy Disk" refresh="false"
-              file_link="/configure/c_snapshot_floppy.ink"
-              help_link="/help/ts.ink?help=c_snap.htm"/>
       </ITEM>
       <ITEM name="Logs">
         <LINK name="System" refresh="true"

Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp Wed Jan 12 02:08:51
2011
@@ -223,11 +223,6 @@ This text will be stripped from the buil
               file_link="/configure/c_snapshot_ftpsystem.ink"
               help_link="/help/ts.ink?help=c_snap.htm"/>
 #endif
-#ifdef FTR_SNAP_FLOPPY
-        <LINK name="Floppy Disk" refresh="false"
-              file_link="/configure/c_snapshot_floppy.ink"
-              help_link="/help/ts.ink?help=c_snap.htm"/>
-#endif
       </ITEM>
       <ITEM name="Logs">
         <LINK name="System" refresh="true"

Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Wed Jan 12 02:08:51 2011
@@ -2388,75 +2388,6 @@ handle_submit_net_config(WebHttpContext 
   return WebHttpRender(whc, submit_from_page);
 }
 
-//-------------------------------------------------------------------------
-// handle_submit_otw_upgrade
-//-------------------------------------------------------------------------
-static int
-handle_submit_otw_upgrade(WebHttpContext * whc, const char *file)
-{
-  NOWARN_UNUSED(file);
-  int err = WEB_HTTP_ERR_OKAY;
-  char *action;
-  char *working_dir;
-  char *submit_from_page;
-  char tmp[MAX_TMP_BUF_LEN];
-#if TS_HAS_WEBUI
-  char *link;
-#endif
-  const char *cgi_path;
-
-  if (ink_hash_table_lookup(whc->post_data_ht, "submit_from_page", (void **) &submit_from_page))
{
-    ink_hash_table_delete(whc->post_data_ht, "submit_from_page");
-    whc->top_level_render_file = xstrdup(submit_from_page);
-  } else {
-    submit_from_page = NULL;
-  }
-
-#ifndef _WIN32
-
-  if (ink_hash_table_lookup(whc->post_data_ht, "action", (void **) &action)) {
-    if (strcmp(action, "Cancel") == 0) {
-      // upgrade cancelled = return to HTML_OTW_UPGRADE_FILE
-      if (ink_hash_table_lookup(whc->post_data_ht, "working_dir", (void **) &working_dir))
{
-        // cleanup
-        snprintf(tmp, MAX_TMP_BUF_LEN, "/bin/rm -rf %s", working_dir);
-        NOWARN_UNUSED_RETURN(system(tmp));
-      }
-      if (submit_from_page)
-        xfree(submit_from_page);
-      submit_from_page = xstrdup(HTML_OTW_UPGRADE_FILE);
-      if (whc->top_level_render_file)
-        xfree(whc->top_level_render_file);
-      whc->top_level_render_file = xstrdup(submit_from_page);
-
-    } else {
-      // start upgrade = render upgrade page + spawn traffic_shell.cgi script
-#if TS_HAS_WEBUI
-      link = WebHttpGetLink_Xmalloc(HTML_DEFAULT_MONITOR_FILE);
-      xfree(link);
-#endif
-      cgi_path = WebHttpAddDocRoot_Xmalloc(whc, HTML_OTW_UPGRADE_CGI_FILE);
-      int old_euid, old_egid;
-      Config_User_Root(&old_euid);
-      Config_Grp_Root(&old_egid);
-      spawn_cgi(whc, cgi_path, NULL, true, true);
-      Config_User_Inktomi(old_euid);
-      Config_Grp_Inktomi(old_egid);
-      if (submit_from_page)
-        xfree(submit_from_page);
-      submit_from_page = xstrdup("/upgrade.ink");
-      xfree((char *) cgi_path);
-    }
-  }
-#endif
-  if (submit_from_page) {
-    err = WebHttpRender(whc, submit_from_page);
-    xfree(submit_from_page);
-  } else {
-    err = WebHttpRender(whc, HTML_DEFAULT_CONFIGURE_FILE);
-  }
-  return err;
-}
 
 //-------------------------------------------------------------------------
 // handle_default
@@ -2886,7 +2817,6 @@ WebHttpInit()
   ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_UPDATE_CONFIG, (void *) handle_submit_update_config);
   ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_CONFIG_DISPLAY, (void *) handle_submit_config_display);
   ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_NET_CONFIG, (void *) handle_submit_net_config);
-  ink_hash_table_insert(g_submit_bindings_ht, HTML_SUBMIT_OTW_UPGRADE_FILE, (void *) handle_submit_otw_upgrade);
   // 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);

Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h?rev=1057972&r1=1057971&r2=1057972&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h Wed Jan 12 02:08:51 2011
@@ -105,9 +105,7 @@
 #define HTML_ID_PERMISSION_DENIED       "s_text_112"
 #define HTML_ID_FILE_TRUNCATED          "s_text_113"
 #define HTML_ID_SESSION_VALUE_LIMIT     "s_text_114"
-#define HTML_ID_FLOPPY_UNMOUNT_ERR	"s_text_115"
 // Currently unsused: 116
-#define HTML_ID_FLOPPY_NO_SPACE		"s_text_117"
 
 #define HTML_ID_SUBMIT_NOTE_FLG         "s_text_150"
 #define HTML_ID_RESTART_REQUIRED        "s_text_151"
@@ -394,8 +392,6 @@
 #define HTML_TREE_FOOTER_FILE           "/include/tree_footer.ink"
 #define HTML_DEFAULT_MONITOR_FILE       "/monitor/m_overview.ink"
 #define HTML_DEFAULT_CONFIGURE_FILE     "/configure/c_basic.ink"
-#define HTML_OTW_UPGRADE_FILE           "/configure/c_otw_upgrade.ink"
-#define HTML_OTW_UPGRADE_CGI_FILE       "/configure/helper/traffic_shell.cgi"
 #define HTML_FEATURE_ON_OFF_FILE        "/configure/c_basic.ink"
 #define HTML_DEFAULT_HELP_FILE          "/help/ts.ink"
 
@@ -404,8 +400,6 @@
 #define HTML_SUBMIT_MGMT_AUTH_FILE      "/submit_mgmt_auth.cgi"
 //#define HTML_SUBMIT_SNAPSHOT_FILE       "/submit_snapshot.cgi"
 #define HTML_SUBMIT_SNAPSHOT_FILESYSTEM "/submit_snapshot_filesystem.cgi"
-#define HTML_SUBMIT_SNAPSHOT_FTPSERVER  "/submit_snapshot_ftpserver.cgi"
-#define HTML_SUBMIT_SNAPSHOT_FLOPPY     "/submit_snapshot_floppy.cgi"
 #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"



Mime
View raw message