Author: zwoop
Date: Tue Jan 18 22:39:22 2011
New Revision: 1060601
URL: http://svn.apache.org/viewvc?rev=1060601&view=rev
Log:
TS-638 Move proxy/mgmt to mgmt/, part 1
Added:
trafficserver/traffic/trunk/mgmt/
- copied from r1060598, trafficserver/traffic/trunk/proxy/mgmt/
Removed:
trafficserver/traffic/trunk/proxy/mgmt/
Modified:
trafficserver/traffic/trunk/Makefile.am
trafficserver/traffic/trunk/ci/rat-excludes.txt
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/cop/Makefile.am
trafficserver/traffic/trunk/iocore/cache/Makefile.am
trafficserver/traffic/trunk/iocore/cluster/Makefile.am
trafficserver/traffic/trunk/iocore/dns/Makefile.am
trafficserver/traffic/trunk/iocore/hostdb/Makefile.am
trafficserver/traffic/trunk/iocore/net/Makefile.am
trafficserver/traffic/trunk/lib/records/I_RecAlarms.h
trafficserver/traffic/trunk/lib/records/I_RecEvents.h
trafficserver/traffic/trunk/lib/records/I_RecSignals.h
trafficserver/traffic/trunk/lib/records/Makefile.am
trafficserver/traffic/trunk/mgmt/Makefile.am
trafficserver/traffic/trunk/mgmt/api/Makefile.am
trafficserver/traffic/trunk/mgmt/api/remote/Makefile.am
trafficserver/traffic/trunk/mgmt/cli/CLIconfigure.cc
trafficserver/traffic/trunk/mgmt/cli/CLImonitor.cc
trafficserver/traffic/trunk/mgmt/cli/Makefile.am
trafficserver/traffic/trunk/mgmt/cli2/Makefile.am
trafficserver/traffic/trunk/mgmt/cluster/Makefile.am
trafficserver/traffic/trunk/mgmt/stats/Makefile.am
trafficserver/traffic/trunk/mgmt/stats/spec
trafficserver/traffic/trunk/mgmt/tools/Makefile.am
trafficserver/traffic/trunk/mgmt/utils/Makefile.am
trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
trafficserver/traffic/trunk/mgmt/web2/Makefile.am
trafficserver/traffic/trunk/proxy/DiagsConfig.cc
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/congest/Makefile.am
trafficserver/traffic/trunk/proxy/http/HttpTransact.cc
trafficserver/traffic/trunk/proxy/http/Makefile.am
trafficserver/traffic/trunk/proxy/http/remap/Makefile.am
trafficserver/traffic/trunk/proxy/logging/Makefile.am
trafficserver/traffic/trunk/proxy/stats/Makefile.am
trafficserver/traffic/trunk/rc/Makefile.am
Modified: trafficserver/traffic/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/Makefile.am (original)
+++ trafficserver/traffic/trunk/Makefile.am Tue Jan 18 22:39:22 2011
@@ -21,12 +21,15 @@
# http://www.gnu.org/software/automake/manual/automake.html#Local-Macros
ACLOCAL_AMFLAGS = -I build
+# TODO: There's still some weirdness in the dependencies between proxy
+# and mgmt, hence we have to build proxy/hdrs first.
+
# proxy/api/ts has to be built first, since so much of libraries and "core
# depends on the generates ts/ts.h include file.
if STANDALONE_IOCORE
-SUBDIRS = proxy/api/ts iocore lib proxy cop plugins
+SUBDIRS = proxy/api/ts iocore lib proxy/hdrs mgmt proxy cop plugins
else
-SUBDIRS = proxy/api/ts iocore lib proxy cop rc doc plugins
+SUBDIRS = proxy/api/ts iocore lib proxy/hdrs mgmt proxy cop rc doc plugins
endif
DIST_BUILD_USER=`id -nu`
Modified: trafficserver/traffic/trunk/ci/rat-excludes.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/ci/rat-excludes.txt?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/ci/rat-excludes.txt (original)
+++ trafficserver/traffic/trunk/ci/rat-excludes.txt Tue Jan 18 22:39:22 2011
@@ -35,8 +35,8 @@ proxy/cache_test.config
proxy/congest/FeatureSpec.txt
proxy/http/stats.memo
proxy/issues.txt
-proxy/mgmt/cli2/cli_detailed_command_list.txt
-proxy/mgmt/cli2/cli_feature_spec.txt
+mgmt/cli2/cli_detailed_command_list.txt
+mgmt/cli2/cli_feature_spec.txt
example/README.internal
example/blacklist-1/blacklist.txt
example/thread-pool/TESTPLAN.txt
@@ -70,7 +70,7 @@ iocore/cache/Notes
iocore/cache/cache_test.config
iocore/fastio/tools/advbmark/runme
lib/records/test_records.config
-proxy/mgmt/stats/spec
+mgmt/stats/spec
proxy/mime.types
proxy/msgs/TSMessages.mc
proxy/msgs/TSMsgs.rc
@@ -78,8 +78,8 @@ test/SDKtest/synth_server/SDKtest_server
test/deft/defs/climatelab.def
test/deft/defs/localhost.def
test/plugin/INKHttpHooksTrans/altSelect.notes
-proxy/mgmt/html2/tune/navigation_tree.xml
-proxy/mgmt/cli2/hashtable.cc
+mgmt/html2/tune/navigation_tree.xml
+mgmt/cli2/hashtable.cc
lib/ts/ink_res_init.cc
lib/ts/ink_res_mkquery.cc
lib/ts/ink_rand.h
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Tue Jan 18 22:39:22 2011
@@ -1225,27 +1225,27 @@ AC_CONFIG_FILES([proxy/http/Makefile])
AC_CONFIG_FILES([proxy/http/remap/Makefile])
AC_CONFIG_FILES([proxy/logging/Makefile])
AC_CONFIG_FILES([proxy/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/api/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/api/remote/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/cli2/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/cli/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/cluster/Makefile])
+AC_CONFIG_FILES([mgmt/api/Makefile])
+AC_CONFIG_FILES([mgmt/api/remote/Makefile])
+AC_CONFIG_FILES([mgmt/cli2/Makefile])
+AC_CONFIG_FILES([mgmt/cli/Makefile])
+AC_CONFIG_FILES([mgmt/cluster/Makefile])
AS_IF([test "x$enable_webui" = "xyes"],
- [AC_CONFIG_FILES([proxy/mgmt/html2/Makefile])
- AC_CONFIG_FILES([proxy/mgmt/html2/charting/Makefile])
- AC_CONFIG_FILES([proxy/mgmt/html2/configure/Makefile])
- AC_CONFIG_FILES([proxy/mgmt/html2/images/Makefile])
- AC_CONFIG_FILES([proxy/mgmt/html2/include/Makefile])
- AC_CONFIG_FILES([proxy/mgmt/html2/monitor/Makefile])
- AC_CONFIG_FILES([proxy/mgmt/html2/mrtg/Makefile])
- AC_CONFIG_FILES([proxy/mgmt/html2/tune/Makefile])
+ [AC_CONFIG_FILES([mgmt/html2/Makefile])
+ AC_CONFIG_FILES([mgmt/html2/charting/Makefile])
+ AC_CONFIG_FILES([mgmt/html2/configure/Makefile])
+ AC_CONFIG_FILES([mgmt/html2/images/Makefile])
+ AC_CONFIG_FILES([mgmt/html2/include/Makefile])
+ AC_CONFIG_FILES([mgmt/html2/monitor/Makefile])
+ AC_CONFIG_FILES([mgmt/html2/mrtg/Makefile])
+ AC_CONFIG_FILES([mgmt/html2/tune/Makefile])
])
-AC_CONFIG_FILES([proxy/mgmt/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/preparse/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/stats/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/tools/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/utils/Makefile])
-AC_CONFIG_FILES([proxy/mgmt/web2/Makefile])
+AC_CONFIG_FILES([mgmt/Makefile])
+AC_CONFIG_FILES([mgmt/preparse/Makefile])
+AC_CONFIG_FILES([mgmt/stats/Makefile])
+AC_CONFIG_FILES([mgmt/tools/Makefile])
+AC_CONFIG_FILES([mgmt/utils/Makefile])
+AC_CONFIG_FILES([mgmt/web2/Makefile])
AC_CONFIG_FILES([proxy/stats/Makefile])
AC_CONFIG_FILES([proxy/wccp/Makefile])
AC_CONFIG_FILES([proxy/api/ts/Makefile])
Modified: trafficserver/traffic/trunk/cop/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/cop/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/cop/Makefile.am (original)
+++ trafficserver/traffic/trunk/cop/Makefile.am Tue Jan 18 22:39:22 2011
@@ -19,10 +19,10 @@
AM_CPPFLAGS = $(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/api/include
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/api/include
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
@@ -32,7 +32,7 @@ bin_PROGRAMS = traffic_cop
traffic_cop_SOURCES = TrafficCop.cc
traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_cop_LDADD = \
- $(top_builddir)/proxy/mgmt/api/remote/libmgmtapiremote.a \
+ $(top_builddir)/mgmt/api/remote/libmgmtapiremote.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/lib/ts/libts.a \
- @LIBTHREAD@ @LIBSOCKET@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ @LIBSSL@
+ @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBICONV@ @LIBRT@ @LIBDL@ @LIBSSL@
Modified: trafficserver/traffic/trunk/iocore/cache/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/cache/Makefile.am Tue Jan 18 22:39:22 2011
@@ -31,9 +31,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/http/remap \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/utils \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils \
-DSYSCONFDIR=\"$(sysconfdir)\"
ADD_SRC =
Modified: trafficserver/traffic/trunk/iocore/cluster/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/cluster/Makefile.am Tue Jan 18 22:39:22 2011
@@ -22,9 +22,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/utils
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils
DEFS += @IOCORE_MODULARIZED_DEFS@
Modified: trafficserver/traffic/trunk/iocore/dns/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/dns/Makefile.am Tue Jan 18 22:39:22 2011
@@ -26,10 +26,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
- -I$(top_srcdir)/proxy/mgmt/preparse \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/utils
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/preparse
endif
DEFS += @IOCORE_MODULARIZED_DEFS@
Modified: trafficserver/traffic/trunk/iocore/hostdb/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/Makefile.am Tue Jan 18 22:39:22 2011
@@ -25,11 +25,11 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/mgmt/preparse \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/utils
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/preparse
endif
Modified: trafficserver/traffic/trunk/iocore/net/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/net/Makefile.am Tue Jan 18 22:39:22 2011
@@ -25,10 +25,10 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/mgmt/preparse \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/utils
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils
endif
Modified: trafficserver/traffic/trunk/lib/records/I_RecAlarms.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/records/I_RecAlarms.h?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/records/I_RecAlarms.h (original)
+++ trafficserver/traffic/trunk/lib/records/I_RecAlarms.h Tue Jan 18 22:39:22 2011
@@ -24,7 +24,7 @@
#ifndef _I_REC_ALARMS_H_
#define _I_REC_ALARMS_H_
-// copy from proxy/mgmt/Alarms.h
+// copy from mgmt/Alarms.h
#define REC_ALARM_PROXY_PROCESS_DIED 1
#define REC_ALARM_PROXY_PROCESS_BORN 2
#define REC_ALARM_PROXY_PEER_BORN 3
Modified: trafficserver/traffic/trunk/lib/records/I_RecEvents.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/records/I_RecEvents.h?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/records/I_RecEvents.h (original)
+++ trafficserver/traffic/trunk/lib/records/I_RecEvents.h Tue Jan 18 22:39:22 2011
@@ -24,7 +24,7 @@
#ifndef _I_REC_EVENTS_H_
#define _I_REC_EVENTS_H_
-// copy from proxy/mgmt/BaseManager.h
+// copy from mgmt/BaseManager.h
#define REC_EVENT_SYNC_KEY 10000
#define REC_EVENT_SHUTDOWN 10001
#define REC_EVENT_RESTART 10002
Modified: trafficserver/traffic/trunk/lib/records/I_RecSignals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/records/I_RecSignals.h?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/records/I_RecSignals.h (original)
+++ trafficserver/traffic/trunk/lib/records/I_RecSignals.h Tue Jan 18 22:39:22 2011
@@ -24,7 +24,7 @@
#ifndef _I_REC_SIGNALS_H_
#define _I_REC_SIGNALS_H_
-// copy from proxy/mgmt/BaseManager.h
+// copy from mgmt/BaseManager.h
#define REC_SIGNAL_PID 0
#define REC_SIGNAL_MACHINE_UP 1
#define REC_SIGNAL_MACHINE_DOWN 2
Modified: trafficserver/traffic/trunk/lib/records/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/records/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/records/Makefile.am (original)
+++ trafficserver/traffic/trunk/lib/records/Makefile.am Tue Jan 18 22:39:22 2011
@@ -21,12 +21,12 @@ DEFS += @ink_with_modules_def@
AM_CPPFLAGS = \
-I$(top_srcdir)/iocore/eventsystem \
-I$(top_srcdir)/iocore/utils \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/web2 \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/utils
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/web2 \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/lib/tsconfig
noinst_LIBRARIES = libreclocal.a librecprocess.a
Modified: trafficserver/traffic/trunk/mgmt/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/Makefile.am Tue Jan 18 22:39:22 2011
@@ -31,14 +31,14 @@ AM_CPPFLAGS = $(ink_with_modules_local)
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/stats \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/web2
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/stats \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/web2 \
+ -I$(top_srcdir)/lib/tsconfig
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
@@ -52,12 +52,12 @@ libmgmt_p_a_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy/hdrs \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/utils \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/web2 \
-I$(top_srcdir)/proxy
libmgmt_p_a_SOURCES = \
BaseManager.cc \
@@ -104,8 +104,8 @@ traffic_manager_LDADD = \
utils/libutils_lm.a \
$(top_builddir)/proxy/hdrs/libhdrs.a \
$(top_builddir)/lib/records/libreclocal.a \
- $(top_builddir)/proxy/mgmt/tools/libinksysapi.a \
- $(top_builddir)/proxy/mgmt/tools/libinkconfigapi.a \
+ $(top_builddir)/mgmt/tools/libinksysapi.a \
+ $(top_builddir)/mgmt/tools/libinkconfigapi.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/lib/ts/libts.a \
@LIBEXPAT@ @LIBPCRE@ \
Modified: trafficserver/traffic/trunk/mgmt/api/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/api/Makefile.am Tue Jan 18 22:39:22 2011
@@ -22,12 +22,12 @@ SUBDIRS = remote
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/proxy/mgmt/web2 \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/api/include
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/web2 \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/lib/tsconfig
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/api/remote/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/api/remote/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/api/remote/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/api/remote/Makefile.am Tue Jan 18 22:39:22 2011
@@ -16,10 +16,10 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/proxy/mgmt/api \
- -I$(top_srcdir)/proxy/mgmt/api/include
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/api \
+ -I$(top_srcdir)/mgmt/api/include
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/cli/CLIconfigure.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/CLIconfigure.cc?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/CLIconfigure.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/CLIconfigure.cc Tue Jan 18 22:39:22 2011
@@ -47,7 +47,7 @@
// Table of Variable/Descriptions for the Configure section
//
// The variables come from 'proxy/config/records.conf' and
-// the Descriptions from 'proxy/mgmt/html/protocols.stats.ink'
+// the Descriptions from 'mgmt/html/protocols.stats.ink'
// It would be nice to cosolidate these so that both
// the ASCII and HTML output could use the same info.
//
Modified: trafficserver/traffic/trunk/mgmt/cli/CLImonitor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/CLImonitor.cc?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/CLImonitor.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cli/CLImonitor.cc Tue Jan 18 22:39:22 2011
@@ -49,7 +49,7 @@
// Table of Variable/Descriptions for the monitor section
//
// The variables come from 'proxy/etc/trafficserver/records.conf' and
-// the Descriptions from 'proxy/mgmt/html/protocols.stats.ink'
+// the Descriptions from 'mgmt/html/protocols.stats.ink'
// It would be nice to cosolidate these so that both
// the ASCII and HTML output could use the same info.
//
Modified: trafficserver/traffic/trunk/mgmt/cli/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/cli/Makefile.am Tue Jan 18 22:39:22 2011
@@ -20,12 +20,12 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/web2
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/web2 \
+ -I$(top_srcdir)/lib/tsconfig
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/cli2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cli2/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cli2/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/cli2/Makefile.am Tue Jan 18 22:39:22 2011
@@ -21,8 +21,8 @@ SUFFIXES = .java .class .jar .my .def .s
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt/tools
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/tools
bin_PROGRAMS = traffic_shell
@@ -72,10 +72,10 @@ traffic_shell_LDFLAGS = $(EXTRA_CXX_LDFL
traffic_shell_LDADD = \
libtrafficshell.a \
- $(top_builddir)/proxy/mgmt/api/remote/libmgmtapiremote.a \
- $(top_builddir)/proxy/mgmt/tools/libinksysapi.a \
- $(top_builddir)/proxy/mgmt/tools/libinkconfigapi.a \
- $(top_builddir)/proxy/mgmt/utils/libutils_lm.a \
+ $(top_builddir)/mgmt/api/remote/libmgmtapiremote.a \
+ $(top_builddir)/mgmt/tools/libinksysapi.a \
+ $(top_builddir)/mgmt/tools/libinkconfigapi.a \
+ $(top_builddir)/mgmt/utils/libutils_lm.a \
$(top_builddir)/lib/ts/libts.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(LIBTCL) \
Modified: trafficserver/traffic/trunk/mgmt/cluster/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cluster/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cluster/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/cluster/Makefile.am Tue Jan 18 22:39:22 2011
@@ -19,11 +19,11 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/web2
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/web2 \
+ -I$(top_srcdir)/lib/tsconfig
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/stats/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/stats/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/stats/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/stats/Makefile.am Tue Jan 18 22:39:22 2011
@@ -19,12 +19,12 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/proxy/mgmt/api/include \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/web2 \
-I$(top_srcdir)/proxy
MGMT_DEFS = @MGMT_DEFS@
Modified: trafficserver/traffic/trunk/mgmt/stats/spec
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/stats/spec?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/stats/spec (original)
+++ trafficserver/traffic/trunk/mgmt/stats/spec Tue Jan 18 22:39:22 2011
@@ -95,7 +95,7 @@ average hit rate in the cluster.
The statistics processor is designed to replace StatAggregate.cc and part of
the WebOverview. The first thing to test StatProcessor is to comment the
-aggregateNodeRecords() and doClusterAg() calls from proxy/mgmt/Main.cc.
+aggregateNodeRecords() and doClusterAg() calls from mgmt/Main.cc.
The next step is to replace the above function calls with StatProcessor::
processStat().
Modified: trafficserver/traffic/trunk/mgmt/tools/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/tools/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/tools/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/tools/Makefile.am Tue Jan 18 22:39:22 2011
@@ -19,10 +19,10 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/proxy/mgmt/api \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/api \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
Modified: trafficserver/traffic/trunk/mgmt/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/utils/Makefile.am Tue Jan 18 22:39:22 2011
@@ -20,11 +20,11 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/iocore/utils \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/api \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/web2 \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/api \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/web2 \
-I$(top_srcdir)/lib/tsconfig \
-I$(top_srcdir)/proxy
Modified: trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc Tue Jan 18 22:39:22 2011
@@ -36,9 +36,11 @@
#include "Diags.h"
#ifdef LOCAL_MANAGER
-#include "mgmt/Main.h"
+// mgmt/Main.h
+#include "../Main.h"
#else
-#include "mgmt/../Main.h"
+// proxy/Main.h
+#include "../../proxy/Main.h"
#endif
extern int diags_init;
Modified: trafficserver/traffic/trunk/mgmt/web2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/Makefile.am?rev=1060601&r1=1060598&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/Makefile.am (original)
+++ trafficserver/traffic/trunk/mgmt/web2/Makefile.am Tue Jan 18 22:39:22 2011
@@ -20,14 +20,14 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/iocore/utils \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/api \
- -I$(top_srcdir)/proxy/mgmt/api/include \
- -I$(top_srcdir)/proxy/mgmt/cli \
- -I$(top_srcdir)/proxy/mgmt/cluster \
- -I$(top_srcdir)/proxy/mgmt/utils \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/api \
+ -I$(top_srcdir)/mgmt/api/include \
+ -I$(top_srcdir)/mgmt/cli \
+ -I$(top_srcdir)/mgmt/cluster \
+ -I$(top_srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt/tools \
-I$(top_srcdir)/lib/tsconfig \
- -I$(top_srcdir)/proxy/mgmt/tools \
-I$(top_srcdir)/proxy/hdrs
MGMT_DEFS = @MGMT_DEFS@
Modified: trafficserver/traffic/trunk/proxy/DiagsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/DiagsConfig.cc?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/DiagsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/DiagsConfig.cc Tue Jan 18 22:39:22 2011
@@ -26,7 +26,7 @@
#include "DiagsConfig.h"
#ifdef LOCAL_MANAGER
-#include "mgmt/Main.h"
+#include "../mgmt/Main.h"
#define MGMT_PTR lmgmt
#define DIAGS_LOG_FILE "manager.log"
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Tue Jan 18 22:39:22 2011
@@ -16,16 +16,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# Note that hdrs is targeted from ../Makefile.am
if STANDALONE_IOCORE
noinst_LIBRARIES = libTrafficServerStandalone.a
bin_PROGRAMS =
noinst_PROGRAMS =
else
-SUBDIRS = congest http hdrs logging
+SUBDIRS = congest http logging
if BUILD_WCCP
SUBDIRS += wccp
endif
-SUBDIRS += mgmt config stats
+SUBDIRS += config stats
noinst_LIBRARIES =
bin_PROGRAMS = \
traffic_server \
@@ -41,9 +42,9 @@ AM_CPPFLAGS = \
-I$(srcdir)/logging \
-I$(srcdir)/http/remap \
-I$(srcdir)/hdrs \
- -I$(srcdir)/mgmt \
- -I$(srcdir)/mgmt/preparse \
- -I$(srcdir)/mgmt/utils \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils \
-I$(srcdir)/api/ts
noinst_HEADERS = \
@@ -144,9 +145,9 @@ traffic_server_LDADD = \
logging/liblogging.a \
stats/libstats.a \
hdrs/libhdrs.a \
- mgmt/preparse/libpreparse.a \
- mgmt/utils/libutils_p.a \
- mgmt/libmgmt_p.a \
+ $(top_builddir)/mgmt/preparse/libpreparse.a \
+ $(top_builddir)/mgmt/utils/libutils_p.a \
+ $(top_builddir)/mgmt/libmgmt_p.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/iocore/cluster/libinkcluster.a \
$(top_builddir)/iocore/dns/libinkdns.a \
@@ -202,9 +203,9 @@ traffic_logcat_LDADD = \
stats/libstats.a \
hdrs/libhdrs.a \
congest/libCongestionControl.a \
- mgmt/preparse/libpreparse.a \
- mgmt/utils/libutils_p.a \
- mgmt/libmgmt_p.a \
+ $(top_builddir)/mgmt/preparse/libpreparse.a \
+ $(top_builddir)/mgmt/utils/libutils_p.a \
+ $(top_builddir)/mgmt/libmgmt_p.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/iocore/cluster/libinkcluster.a \
$(top_builddir)/iocore/dns/libinkdns.a \
@@ -270,9 +271,9 @@ traffic_logstats_LDADD = \
stats/libstats.a \
hdrs/libhdrs.a \
congest/libCongestionControl.a \
- mgmt/preparse/libpreparse.a \
- mgmt/utils/libutils_p.a \
- mgmt/libmgmt_p.a \
+ $(top_builddir)/mgmt/preparse/libpreparse.a \
+ $(top_builddir)/mgmt/utils/libutils_p.a \
+ $(top_builddir)/mgmt/libmgmt_p.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/iocore/cluster/libinkcluster.a \
$(top_builddir)/iocore/dns/libinkdns.a \
@@ -339,9 +340,9 @@ traffic_sac_LDADD = \
logging/liblogging.a \
stats/libstats.a \
hdrs/libhdrs.a \
- mgmt/preparse/libpreparse.a \
- mgmt/utils/libutils_p.a \
- mgmt/libmgmt_p.a \
+ $(top_builddir)/mgmt/preparse/libpreparse.a \
+ $(top_builddir)/mgmt/utils/libutils_p.a \
+ $(top_builddir)/mgmt/libmgmt_p.a \
$(top_builddir)/iocore/utils/libinkutils.a \
$(top_builddir)/iocore/cluster/libinkcluster.a \
$(top_builddir)/iocore/dns/libinkdns.a \
Modified: trafficserver/traffic/trunk/proxy/congest/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/congest/Makefile.am Tue Jan 18 22:39:22 2011
@@ -21,9 +21,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/utils \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/hdrs
noinst_LIBRARIES = libCongestionControl.a
Modified: trafficserver/traffic/trunk/proxy/http/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTransact.cc?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTransact.cc Tue Jan 18 22:39:22 2011
@@ -6615,7 +6615,7 @@ HttpTransact::process_quick_http_filter(
// different internal implementation. We ought to either rewrite this
// completely, or just remove it.
- // Please refer to proxy/mgmt/RecordsConfig.cc file,
+ // Please refer to mgmt/RecordsConfig.cc file,
// "proxy.config.http.quick_filter.mask" variable for
// detailed information about quick_filter_mask layout.
Modified: trafficserver/traffic/trunk/proxy/http/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/http/Makefile.am Tue Jan 18 22:39:22 2011
@@ -22,9 +22,9 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/utils \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http/remap \
-I$(top_srcdir)/proxy/logging
Modified: trafficserver/traffic/trunk/proxy/http/remap/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/Makefile.am Tue Jan 18 22:39:22 2011
@@ -20,9 +20,9 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/utils \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/hdrs \
-I$(top_srcdir)/proxy/http
Modified: trafficserver/traffic/trunk/proxy/logging/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/logging/Makefile.am Tue Jan 18 22:39:22 2011
@@ -24,10 +24,10 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/proxy/http/remap \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/preparse \
- -I$(top_srcdir)/proxy/mgmt/utils \
- -I$(top_srcdir)/proxy/hdrs
+ -I$(top_srcdir)/proxy/hdrs \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/preparse \
+ -I$(top_srcdir)/mgmt/utils
EXTRA_DIST = LogStandalone.cc
Modified: trafficserver/traffic/trunk/proxy/stats/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/stats/Makefile.am Tue Jan 18 22:39:22 2011
@@ -20,8 +20,8 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/utils
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/utils
noinst_LIBRARIES = libstats.a
Modified: trafficserver/traffic/trunk/rc/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/rc/Makefile.am?rev=1060601&r1=1060600&r2=1060601&view=diff
==============================================================================
--- trafficserver/traffic/trunk/rc/Makefile.am (original)
+++ trafficserver/traffic/trunk/rc/Makefile.am Tue Jan 18 22:39:22 2011
@@ -19,8 +19,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/lib/records \
-I$(top_srcdir)/proxy \
- -I$(top_srcdir)/proxy/mgmt \
- -I$(top_srcdir)/proxy/mgmt/utils \
+ -I$(top_srcdir)/mgmt \
+ -I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/cache \
-I$(top_srcdir)/proxy/logging
|