trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r910767 - in /incubator/trafficserver/traffic/trunk: ./ proxy/mgmt2/cop/ proxy/mgmt2/html2/ proxy/mgmt2/html2/agent-installer/ proxy/mgmt2/html2/charting/ proxy/mgmt2/html2/configure/ proxy/mgmt2/html2/configure/helper/ proxy/mgmt2/html2/im...
Date Tue, 16 Feb 2010 23:34:09 GMT
Author: georgep
Date: Tue Feb 16 23:34:08 2010
New Revision: 910767

URL: http://svn.apache.org/viewvc?rev=910767&view=rev
Log:
Ts-150: This patch '0001-TS150_patch1.diff.patch' fixes the startup errors from Traffic Manager
Web UI. Also the default now is to disable the Web UI until it can be worked on. The Web UI
can be re-enabled at configure time via the configure flag '--enable-webui'.
Review: Leif H.

Added:
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
Modified:
    incubator/trafficserver/traffic/trunk/configure.ac
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc
    incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc

Modified: incubator/trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/configure.ac?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/configure.ac (original)
+++ incubator/trafficserver/traffic/trunk/configure.ac Tue Feb 16 23:34:08 2010
@@ -206,6 +206,22 @@
 AC_SUBST([enable_remote_cov_commit])
 
 #
+# WebUI
+#
+AC_MSG_CHECKING([whether to enable Web UI])
+AC_ARG_ENABLE([webui],
+  [AS_HELP_STRING([--enable-webui],[enable Web UI])],
+  [],
+  [enable_webui=no]
+)
+AC_MSG_RESULT([$enable_webui])
+AS_IF([test "x$enable_webui" = "xno"],
+  [AC_DEFINE([NO_WEBUI])
+  ]
+)
+
+
+#
 # API
 #
 
@@ -671,6 +687,15 @@
 AC_CONFIG_FILES([proxy/mgmt2/cluster/Makefile])
 AC_CONFIG_FILES([proxy/mgmt2/cop/Makefile])
 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])
+AC_CONFIG_FILES([proxy/mgmt2/html2/mrtg/Makefile])
+AC_CONFIG_FILES([proxy/mgmt2/html2/tune/Makefile])
 AC_CONFIG_FILES([proxy/mgmt2/Makefile])
 AC_CONFIG_FILES([proxy/mgmt2/preparse/Makefile])
 AC_CONFIG_FILES([proxy/mgmt2/stats/Makefile])

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cop/TrafficCop.cc Tue Feb 16 23:34:08
2010
@@ -1560,7 +1560,7 @@
   return test_http_port(http_backdoor_port, request, server_timeout * 1000, ip, ip);
 }
 
-#ifndef OEM_NO_WEBUI
+#ifndef NO_WEBUI
 static int
 test_manager_http_port()
 {
@@ -1603,7 +1603,7 @@
 #endif
     return err;
   }
-#ifndef OEM_NO_WEBUI
+#ifndef NO_WEBUI
   start = milliseconds();
   err = test_manager_http_port();
 //     fprintf (stderr, "heartbeat_manager[http]() [%d ms]\n",
@@ -1628,7 +1628,7 @@
     manager_failures = 0;
   }
 
-#endif //OEM_NO_WEBUI
+#endif //NO_WEBUI
 
 #ifdef TRACE_LOG_COP
   cop_log(COP_DEBUG, "Leaving heartbeat_manager() --> %d\n", err);

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/Makefile.am Tue Feb 16 23:34:08
2010
@@ -16,3 +16,34 @@
 
 sysconfdir = $(pkgsysconfdir)
 dist_sysconf_DATA = english.dict
+
+SUBDIRS = agent-installer charting configure images include monitor mrtg tune
+
+install-exec-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 \
+	$(DESTDIR)$(pkgdatadir)/mrtg \
+	$(DESTDIR)$(pkgdatadir)/tune
+
+uninstall-local:
+	-rm -rf $(DESTDIR)$(pkgdatadir)
+
+webuidir = $(pkgdatadir)
+dist_webui_DATA = \
+	checkCookies.ink \
+	enableCookies.ink \
+	index.ink \
+	inktomi.css \
+	inktomiLarge.css \
+	navigation_tree.xml \
+	plugin.ink \
+	rename.ink \
+	resize.js \
+	restart.ink \
+	ssl_redirect.ink
\ No newline at end of file

Added: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am?rev=910767&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am (added)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am Tue
Feb 16 23:34:08 2010
@@ -0,0 +1,23 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+
+webuidir = $(pkgdatadir)/agent-installer
+dist_webui_DATA = \
+	ftp.exp \
+	ftp.pl \
+	installer.cgi \
+	installer.html

Added: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am?rev=910767&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am (added)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/charting/Makefile.am Tue Feb 16
23:34:08 2010
@@ -0,0 +1,29 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+webuidir = $(pkgdatadir)/charting
+dist_webui_DATA = \
+	Bandwidth_Savings.html \
+	Cache_Percent_Free.html \
+	Cache_Transfers_In_Progress.html \
+	Client_Throughput.html \
+	DNS_Lookups_Per_Second.html \
+	Document_Hit_Rate.html \
+	Host_Database_Hit_Rate.html \
+	Multiple_Graph_View.html \
+	Open_Client_Connections.html \
+	Open_Server_Connections.html \
+	Transactions_Per_Second.html

Added: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am?rev=910767&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am (added)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am Tue Feb
16 23:34:08 2010
@@ -0,0 +1,127 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  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 \
+	c_autoconf_wpad.ink \
+	c_basic.ink \
+	c_basic.ink.win \
+	c_buttons_hide.ink \
+	c_buttons.ink \
+	c_cache_general.ink \
+	c_cache_hosting.ink \
+	c_cache_partition.ink \
+	c_clustering.ink \
+	c_config_display.ink \
+	c_congestion.ink \
+	c_dns_host_database.ink \
+	c_dns_proxy.ink \
+	c_dns_resolver.ink \
+	c_dns_split.ink \
+	c_footer.ink \
+	c_ftp_cachability.ink \
+	c_ftp_general.ink \
+	c_ftp_timeout.ink \
+	c_header.ink \
+	c_http_cachability.ink \
+	c_http_dyn_cache.ink \
+	c_http_filtering.ink \
+	c_http_general.ink \
+	c_http_parent_proxy.ink \
+	c_http_privacy.ink \
+	c_http_response_custom.ink \
+	c_http_response_general.ink \
+	c_http_timeout.ink \
+	c_http_update_general.ink \
+	c_http_update_urls.ink \
+	c_icp.ink \
+	c_inspector_display.ink \
+	c_inspector.ink \
+	c_ldap_general.ink \
+	c_logging_collation.ink \
+	c_logging_custom.ink \
+	c_logging_format.ink \
+	c_logging_general.ink \
+	c_logging_search.ink \
+	c_logging_splitting.ink \
+	c_mapping_ftp.ink \
+	c_mapping.ink \
+	c_media_common.ink \
+	c_media_push.ink \
+	c_mgmt_access.ink \
+	c_mgmt_general.ink \
+	c_mgmt_login.ink \
+	c_net_config.ink \
+	c_net_devdri.ink \
+	c_net_device.ink \
+	c_net_driver.ink \
+	c_net_nic.ink \
+	c_nntp_auth.ink \
+	c_nntp_cachability.ink \
+	c_nntp_general.ink \
+	c_nntp_parent_servers.ink \
+	c_nntp_timeout.ink \
+	c_ntlm_general.ink \
+	c_phonehome.ink \
+	c_proxy_access.ink \
+	c_quicktime_general.ink \
+	c_quicktime_mbridge.ink \
+	c_radius_general.ink \
+	c_real_networks_general.ink \
+	c_reverse_proxy_ftp.ink \
+	c_reverse_proxy.ink \
+	c_snapshot_filesystem.ink \
+	c_snapshot_floppy.ink \
+	c_snapshot_ftpsystem.ink \
+	c_snapshot.ink \
+	c_socks_general.ink \
+	c_socks_proxy.ink \
+	c_socks_server.ink \
+	c_ssl_accelerator.ink \
+	c_ssl_client_proxy.ink \
+	c_ssl_general.ink \
+	c_ssl_proxy_server.ink \
+	c_tab.ink \
+	c_throttling.ink \
+	c_view_access_logs.ink \
+	c_view_debug_logs.ink \
+	c_view_system_logs.ink \
+	c_virtual_ip.ink \
+	c_windows_media_general.ink \
+	c_windows_media_mbridge.ink \
+	c_windows_media_mcast.ink \
+	f_bypass_config.ink \
+	f_cache_config.ink \
+	f_configs.ink \
+	f_filter_config.ink \
+	f_ftp_remap_config.ink \
+	f_hosting_config.ink \
+	f_icp_config.ink \
+	f_ip_allow_config.ink \
+	f_ipnat_config.ink \
+	f_mgmt_allow_config.ink \
+	f_nntp_access_config.ink \
+	f_nntp_servers_config.ink \
+	f_parent_config.ink \
+	f_partition_config.ink \
+	f_remap_config.ink \
+	f_socks_config.ink \
+	f_split_dns_config.ink \
+	f_update_config.ink \
+	f_vaddrs_config.ink
\ No newline at end of file

Added: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am?rev=910767&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am (added)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am Tue
Feb 16 23:34:08 2010
@@ -0,0 +1,24 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+webuidir = $(pkgdatadir)/configure/helper
+dist_webui_DATA = \
+	INKMgmtAPICheckTcl.sh \
+	INKMgmtAPIFtp.tcl \
+	log.sh \
+	otwu.tcl \
+	traffic_shell.cgi
+

Added: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am?rev=910767&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am (added)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/images/Makefile.am Tue Feb 16
23:34:08 2010
@@ -0,0 +1,42 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+webuidir = $(pkgdatadir)/images
+dist_webui_DATA = \
+	arrow_add.gif \
+	arrow_cross.gif \
+	arrow_down.gif \
+	arrow_set.gif \
+	arrow_up.gif \
+	blankIcon.gif \
+	configure_off.gif \
+	configure_on.gif \
+	dot_clear.gif \
+	header_bg.gif \
+	header_bg_pe.gif \
+	menu_begin_off.gif \
+	menu_begin_on.gif \
+	menu_bg_off.gif \
+	menu_bg_on.gif \
+	menu_end_off.gif \
+	menu_end_on.gif \
+	menu_separator_off_off.gif \
+	menu_separator_off_on.gif \
+	menu_separator_on_off.gif \
+	minusIcon.gif \
+	monitor_off.gif \
+	monitor_on.gif \
+	plusIcon.gif

Added: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am?rev=910767&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am (added)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/include/Makefile.am Tue Feb 16
23:34:08 2010
@@ -0,0 +1,28 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+webuidir = $(pkgdatadir)/include
+dist_webui_DATA = \
+	body_footer.ink \
+	body_header.ink \
+	footer.ink \
+	form_footer.ink \
+	form_header.ink \
+	header.ink \
+	html_footer.ink \
+	html_header.ink \
+	tree_footer.ink \
+	tree_header.ink
\ No newline at end of file

Added: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am?rev=910767&view=auto
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am (added)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am Tue Feb 16
23:34:08 2010
@@ -0,0 +1,49 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+webuidir = $(pkgdatadir)/monitor
+dist_webui_DATA = \
+	m_alarm.ink \
+	m_blue_bar.ink \
+	m_cache.ink \
+	m_cluster.ink \
+	m_dns.ink \
+	m_dns_proxy.ink \
+	m_footer.ink \
+	m_ftp_http.ink \
+	m_ftp.ink \
+	m_graphs.ink \
+	m_header.ink \
+	m_http.ink \
+	m_http_trans.ink \
+	m_icp.ink \
+	m_ldap.ink \
+	m_logging.ink \
+	m_mpeg4.ink \
+	m_net_device.ink \
+	m_net.ink \
+	m_nntp.ink \
+	m_node.ink \
+	m_ntlm.ink \
+	m_overview_details_less.ink \
+	m_overview_details_more.ink \
+	m_overview.ink \
+	m_quicktime.ink \
+	m_real_networks.ink \
+	m_socks.ink \
+	m_tab.ink \
+	m_virtual_ip.ink \
+	m_windows_media.ink
\ No newline at end of file

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/Makefile.am Tue Feb 16 23:34:08
2010
@@ -14,4 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-dist_DATA = detailed.ink overview.ink
+webuidir = $(pkgdatadir)/mrtg
+dist_webui_DATA = \
+	detailed.ink \
+	overview.ink
\ No newline at end of file

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml Tue Feb 16
23:34:08 2010
@@ -1,4 +1,5 @@
-<!-------------------------------------------------------------------------
+<?xml version="1.0"?>
+<!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
   distributed with this work for additional information
@@ -14,9 +15,7 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  ------------------------------------------------------------------------->
-<?xml version="1.0"?>
-
+-->
 <!DOCTYPE MENU_TREE
   [
   <!ELEMENT MENU_TREE (MODE+)>
@@ -391,6 +390,7 @@
         <LINK name="Proxy Access" refresh="false"
               file_link="/configure/c_proxy_access.ink"
               help_link="/help/ts.ink?help=c_cnct.htm"/>
+      </ITEM>
       <ITEM name="Access Control">
         <LINK name="Filtering" refresh="false"
               file_link="/configure/c_http_filtering.ink"

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/Makefile.am Tue Feb 16 23:34:08
2010
@@ -16,6 +16,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+webuidir = $(pkgdatadir)/tune
+dist_webui_DATA = \
+	navigation_tree.xmlcpp
+
 DEFS += @DEFS@
 
 noinst_DATA = navigation_tree.xml

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc Tue Feb 16 23:34:08
2010
@@ -487,8 +487,8 @@
     goto Lerror;
   }
   if (XML_Parse(parser, xml_file_buf, xml_file_len, true) == 0) {
-    mgmt_elog(stderr, "[WebHttpTreeInit]: XML parse error - %s at line %d\n",
-              XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser));
+    mgmt_elog(stderr, "[WebHttpTreeInit]: XML parse error - %s at line %d for %s\n",
+              XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser),xml_file_path);
     goto Lerror;
   }
   // build javascript tree and track 'item's in our g_link_ht

Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc?rev=910767&r1=910766&r2=910767&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc Tue Feb 16 23:34:08
2010
@@ -612,8 +612,9 @@
   sigset_t allSigs;             // Set of all signals
 #endif
   char *cliPath = NULL;         // UNIX: socket path for cli
-
+#ifndef NO_WEBUI
   char webFailMsg[] = "Management Web Services Failed to Initialize";
+#endif
   char pacFailMsg[] = "Auto-Configuration Service Failed to Initialize";
   //  char gphFailMsg[] = "Dynamic Graph Service Failed to Initialize";
   char cliFailMsg[] = "Command Line Interface Failed to Initialize";
@@ -626,8 +627,9 @@
 
   int addrLen;
   int i;
+#ifndef NO_WEBUI
   int sleepTime = 2;
-
+#endif
   // No Warning
   x = x;
 
@@ -725,7 +727,7 @@
 
   adminContext.SSL_Context = NULL;
 
-#ifndef OEM_NO_WEBUI
+#ifndef NO_WEBUI
   // configure components
   configAuthEnabled();
   configAuthAdminUser();
@@ -734,7 +736,7 @@
   // <@record> substitution requires WebHttpInit() first
   // configLangDict();
   configUI();
-#endif /* OEM_NO_WEBUI */
+#endif /* NO_WEBUI */
 
 #ifdef HAVE_LIBSSL
   configSSLenable();
@@ -862,7 +864,7 @@
   // Check our web contexts to make sure everything is
   //  OK.  If it is, go ahead and fire up the interfaces
 
-#ifndef OEM_NO_WEBUI
+#ifndef NO_WEBUI
 
   if (checkWebContext(&adminContext, "Web Management") != 0) {
     lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_WEB_ERROR, webFailMsg);
@@ -884,7 +886,7 @@
     }
   }
 
-#endif //OEM_NO_WEBUI
+#endif //NO_WEBUI
 
   if (checkWebContext(&autoconfContext, "Browser Auto-Configuration") != 0) {
     lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_WEB_ERROR, pacFailMsg);
@@ -934,11 +936,12 @@
       overseerFD = -1;
     }
   }
+
   // Initialze WebHttp Module
   WebHttpInit();
-#ifndef OEM_NO_WEBUI
+#ifndef NO_WEBUI
   configLangDict();
-#endif /* OEM_NO_WEBUI */
+#endif /* NO_WEBUI */
 
   while (1) {
 
@@ -1025,12 +1028,12 @@
       // Accept OK
       ink_mutex_acquire(&wGlobals.serviceThrLock);
 
-#ifndef OEM_NO_WEBUI
+#ifndef NO_WEBUI
       // Check to see if there are any unprocessed config changes
       if (webConfigChanged > 0) {
         updateWebConfig();
       }
-#endif /* OEM_NO_WEBUI */
+#endif /* NO_WEBUI */
 
       // If this a web manager or an overseer connection, make sure that
       //   it is from an allowed ip addr



Mime
View raw message