You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/07/16 23:51:13 UTC
[4/7] trafficserver git commit: TS-3759 Eliminate -Ilib/ts
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtMarshall.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtMarshall.cc b/mgmt/utils/MgmtMarshall.cc
index c07f192..701ef65 100644
--- a/mgmt/utils/MgmtMarshall.cc
+++ b/mgmt/utils/MgmtMarshall.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "MgmtMarshall.h"
#include "MgmtSocket.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtSocket.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtSocket.cc b/mgmt/utils/MgmtSocket.cc
index 37f158e..bab4e90 100644
--- a/mgmt/utils/MgmtSocket.cc
+++ b/mgmt/utils/MgmtSocket.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
#include "MgmtSocket.h"
#if HAVE_UCRED_H
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtSocket.h
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtSocket.h b/mgmt/utils/MgmtSocket.h
index a16eca4..a48228a 100644
--- a/mgmt/utils/MgmtSocket.h
+++ b/mgmt/utils/MgmtSocket.h
@@ -24,7 +24,7 @@
#ifndef _MGMT_SOCKET_H_
#define _MGMT_SOCKET_H_
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
//-------------------------------------------------------------------------
// defines
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtUtils.cc b/mgmt/utils/MgmtUtils.cc
index 0d9bb26..b447e67 100644
--- a/mgmt/utils/MgmtUtils.cc
+++ b/mgmt/utils/MgmtUtils.cc
@@ -20,9 +20,9 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "MgmtUtils.h"
-#include "Diags.h"
+#include "ts/Diags.h"
#include "LocalManager.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/MgmtUtils.h
----------------------------------------------------------------------
diff --git a/mgmt/utils/MgmtUtils.h b/mgmt/utils/MgmtUtils.h
index a270184..b4271a8 100644
--- a/mgmt/utils/MgmtUtils.h
+++ b/mgmt/utils/MgmtUtils.h
@@ -34,8 +34,8 @@
#ifndef _MGMT_UTILS_H
#define _MGMT_UTILS_H
-#include "ink_platform.h"
-#include "Diags.h"
+#include "ts/ink_platform.h"
+#include "ts/Diags.h"
#include "P_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/mgmt/utils/test_marshall.cc
----------------------------------------------------------------------
diff --git a/mgmt/utils/test_marshall.cc b/mgmt/utils/test_marshall.cc
index 6cc1847..3b4b8da 100644
--- a/mgmt/utils/test_marshall.cc
+++ b/mgmt/utils/test_marshall.cc
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-#include "ink_defs.h"
-#include "ink_thread.h"
-#include "ink_inet.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_thread.h"
+#include "ts/ink_inet.h"
#include <ts/TestBox.h>
#include <MgmtMarshall.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/ats_pagespeed/gzip/gzip.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/gzip.cc b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
index 5b3507e..64b8726 100644
--- a/plugins/experimental/ats_pagespeed/gzip/gzip.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
@@ -29,7 +29,7 @@
#include "debug_macros.h"
#include "misc.h"
#include "configuration.h"
-//#include "ink_defs.h"
+//#include "ts/ink_defs.h"
using namespace std;
using namespace Gzip;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/ats_pagespeed/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.cc b/plugins/experimental/ats_pagespeed/gzip/misc.cc
index 2784dff..0ab94c5 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.cc
@@ -22,7 +22,7 @@
*/
#include "ts/ts.h"
-//#include "ink_defs.h"
+//#include "ts/ink_defs.h"
#include <stdint.h>
#include <inttypes.h>
#include "misc.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/channel_stats/channel_stats.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/channel_stats.cc b/plugins/experimental/channel_stats/channel_stats.cc
index 459f1a5..b971d72 100644
--- a/plugins/experimental/channel_stats/channel_stats.cc
+++ b/plugins/experimental/channel_stats/channel_stats.cc
@@ -16,8 +16,8 @@
limitations under the License.
*/
-#include "ink_platform.h"
-#include "ink_defs.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
#include <cstdio>
#include <cstring>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/plugins/experimental/channel_stats/debug_macros.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/debug_macros.h b/plugins/experimental/channel_stats/debug_macros.h
index c59e34e..c20b758 100644
--- a/plugins/experimental/channel_stats/debug_macros.h
+++ b/plugins/experimental/channel_stats/debug_macros.h
@@ -19,7 +19,7 @@
#ifndef _DBG_MACROS_H
#define _DBG_MACROS_H
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
#define TAG PLUGIN_NAME
#define API_TAG PLUGIN_NAME ".api"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/AbstractBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/AbstractBuffer.cc b/proxy/AbstractBuffer.cc
index d386f6d..bd8bab9 100644
--- a/proxy/AbstractBuffer.cc
+++ b/proxy/AbstractBuffer.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <assert.h>
#include <string.h>
#include "AbstractBuffer.h"
/* #include "CacheAtomic.h" */
-#include "ink_align.h"
+#include "ts/ink_align.h"
/*-------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/AbstractBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/AbstractBuffer.h b/proxy/AbstractBuffer.h
index a6e7d14..d86f763 100644
--- a/proxy/AbstractBuffer.h
+++ b/proxy/AbstractBuffer.h
@@ -25,7 +25,7 @@
#define __ABSTRACT_BUFFER_H__
-#include "libts.h"
+#include "ts/libts.h"
enum ABError {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/CacheControl.cc
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index 77af5fe..c1129ca 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -30,7 +30,7 @@
#include <sys/types.h>
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "CacheControl.h"
#include "ControlMatcher.h"
#include "Main.h"
@@ -41,7 +41,7 @@
#include "HttpConfig.h"
#include "StatSystem.h"
#include "P_Cache.h"
-#include "Regex.h"
+#include "ts/Regex.h"
static const char modulePrefix[] = "[CacheControl]";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlBase.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlBase.cc b/proxy/ControlBase.cc
index a149124..a1a7c88 100644
--- a/proxy/ControlBase.cc
+++ b/proxy/ControlBase.cc
@@ -28,19 +28,19 @@
*
*
****************************************************************************/
-#include "ink_platform.h"
-#include "ink_defs.h"
-#include "ink_time.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_time.h"
#include "Main.h"
#include "URL.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
#include "ControlBase.h"
-#include "MatcherUtils.h"
+#include "ts/MatcherUtils.h"
#include "HTTP.h"
#include "ControlMatcher.h"
#include "HdrUtils.h"
-#include "Vec.h"
+#include "ts/Vec.h"
#include <ts/TsBuffer.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlBase.h
----------------------------------------------------------------------
diff --git a/proxy/ControlBase.h b/proxy/ControlBase.h
index 48d393d..5c69a69 100644
--- a/proxy/ControlBase.h
+++ b/proxy/ControlBase.h
@@ -33,7 +33,7 @@
#ifndef _CONTROL_BASE_H_
#define _CONTROL_BASE_H_
-#include "libts.h"
+#include "ts/libts.h"
class HttpRequestData;
class Tokenizer;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index b2e0748..fa4c71d 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -28,14 +28,14 @@
*
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <sys/types.h>
#include "Main.h"
#include "ProxyConfig.h"
#include "ControlMatcher.h"
#include "CacheControl.h"
#include "ParentSelection.h"
-#include "HostLookup.h"
+#include "ts/HostLookup.h"
#include "HTTP.h"
#include "URL.h"
#include "P_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 999d09f..7a75b8f 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -87,13 +87,13 @@
#ifndef _CONTROL_MATCHER_H_
#define _CONTROL_MATCHER_H_
-#include "DynArray.h"
+#include "ts/DynArray.h"
#include <ts/IpMap.h>
-#include "ink_apidefs.h"
-#include "ink_defs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_defs.h"
#include "HTTP.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#ifdef HAVE_CTYPE_H
#include <ctype.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/CoreUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/CoreUtils.cc b/proxy/CoreUtils.cc
index 32c3bff..f4cce46 100644
--- a/proxy/CoreUtils.cc
+++ b/proxy/CoreUtils.cc
@@ -87,7 +87,7 @@
/* modify the "note" in process_core */
/* Document properly */
-#include "ink_config.h"
+#include "ts/ink_config.h"
#if defined(linux)
#include "CoreUtils.h"
@@ -105,7 +105,7 @@ int program_counter = 0;
#include <stdlib.h>
#include <stdint.h>
#include <math.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "CoreUtils.h"
#endif /* darwin || freebsd || solaris */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/CoreUtils.h
----------------------------------------------------------------------
diff --git a/proxy/CoreUtils.h b/proxy/CoreUtils.h
index 39af0a3..ba7b03a 100644
--- a/proxy/CoreUtils.h
+++ b/proxy/CoreUtils.h
@@ -40,7 +40,7 @@
#include <math.h>
#include <assert.h>
#include <elf.h>
-#include "DynArray.h"
+#include "ts/DynArray.h"
#define SP_REGNUM 15 /* Contains address of top of stack USP */
#define PC_REGNUM 12 /* Contains program counter EIP */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Crash.cc
----------------------------------------------------------------------
diff --git a/proxy/Crash.cc b/proxy/Crash.cc
index 0febbea..815efe1 100644
--- a/proxy/Crash.cc
+++ b/proxy/Crash.cc
@@ -22,10 +22,10 @@
*/
#include "Main.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "I_Net.h"
-#include "signals.h"
-#include "ink_cap.h"
+#include "ts/signals.h"
+#include "ts/ink_cap.h"
// ucontext.h is deprecated on Darwin, and we really only need it on Linux, so only
// include it if we are planning to use it.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/EventName.cc
----------------------------------------------------------------------
diff --git a/proxy/EventName.cc b/proxy/EventName.cc
index 5820236..f55272e 100644
--- a/proxy/EventName.cc
+++ b/proxy/EventName.cc
@@ -22,7 +22,7 @@
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/FetchSM.cc
----------------------------------------------------------------------
diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc
index 8c03597..045e26a 100644
--- a/proxy/FetchSM.cc
+++ b/proxy/FetchSM.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "FetchSM.h"
#include <stdio.h>
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ICP.cc
----------------------------------------------------------------------
diff --git a/proxy/ICP.cc b/proxy/ICP.cc
index 4acb633..57a2fb2 100644
--- a/proxy/ICP.cc
+++ b/proxy/ICP.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Main.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ICP.h
----------------------------------------------------------------------
diff --git a/proxy/ICP.h b/proxy/ICP.h
index 40865e2..08e4700 100644
--- a/proxy/ICP.h
+++ b/proxy/ICP.h
@@ -38,7 +38,7 @@
#include "URL.h"
#include "ICPevents.h"
#include "ICPProcessor.h"
-#include "DynArray.h"
+#include "ts/DynArray.h"
//*********************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ICPConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index 942e12a..f7eb257 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "P_Cache.h"
#include "P_Net.h"
@@ -38,7 +38,7 @@
#include "ICPProcessor.h"
#include "ICPlog.h"
#include "BaseManager.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
//--------------------------------------------------------------------------
// Each ICP peer is described in "icp.config" with the
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/IPAllow.cc
----------------------------------------------------------------------
diff --git a/proxy/IPAllow.cc b/proxy/IPAllow.cc
index 8a88866..6f414cf 100644
--- a/proxy/IPAllow.cc
+++ b/proxy/IPAllow.cc
@@ -28,7 +28,7 @@
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Main.h"
#include "IPAllow.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 8fa4fc4..069fcb6 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -23,8 +23,8 @@
#include <stdio.h>
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "ts.h"
#include "InkAPIInternal.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPIInternal.h
----------------------------------------------------------------------
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index ede71f1..241e177 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -32,7 +32,7 @@
#include "experimental.h"
#include "InkAPIPrivateIOCore.h"
#include "HTTP.h"
-#include "List.h"
+#include "ts/List.h"
#include "ProxyConfig.h"
#include "P_Cache.h"
#include "I_Tasks.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPITest.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index 83161af..fcf2997 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -27,7 +27,7 @@
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <sys/types.h>
#include <errno.h>
@@ -38,7 +38,7 @@
#include <stdio.h>
#include <string.h>
-#include "Regression.h"
+#include "ts/Regression.h"
#include "api/ts/ts.h"
#include "api/ts/experimental.h"
#include "I_RecCore.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkAPITestTool.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITestTool.cc b/proxy/InkAPITestTool.cc
index b5e6707..75b2efc 100644
--- a/proxy/InkAPITestTool.cc
+++ b/proxy/InkAPITestTool.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Regression.h"
+#include "ts/Regression.h"
#include "api/ts/ts.h"
#include <arpa/inet.h> /* For htonl */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkIOCoreAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc
index ecc05b0..a2e86e0 100644
--- a/proxy/InkIOCoreAPI.cc
+++ b/proxy/InkIOCoreAPI.cc
@@ -27,7 +27,7 @@
* file to ensure that it gets exported as a global symbol in TS
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "api/ts/InkAPIPrivateIOCore.h"
#if defined(solaris) && !defined(__GNUC__)
#include "P_EventSystem.h" // I_EventSystem.h
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/InkPool_r.h
----------------------------------------------------------------------
diff --git a/proxy/InkPool_r.h b/proxy/InkPool_r.h
index 2b7a8b5..262355c 100644
--- a/proxy/InkPool_r.h
+++ b/proxy/InkPool_r.h
@@ -24,7 +24,7 @@
#ifndef __INK_POOL_R_H_INCLUDED__
#define __INK_POOL_R_H_INCLUDED__
-#include "InkPool.h"
+#include "ts/InkPool.h"
#include "P_EventSystem.h"
template <class C> class InkStaticPool_r : public InkStaticPool<C>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index c71e203..49a01f3 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -30,10 +30,10 @@
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
-#include "libts.h"
-#include "ink_sys_control.h"
+#include "ts/libts.h"
+#include "ts/ink_sys_control.h"
#include <syslog.h>
#if !defined(linux)
@@ -51,7 +51,7 @@ extern "C" int plock(int);
#endif
#include "Main.h"
-#include "signals.h"
+#include "ts/signals.h"
#include "Error.h"
#include "StatSystem.h"
#include "P_EventSystem.h"
@@ -62,7 +62,7 @@ extern "C" int plock(int);
#include "P_Cluster.h"
#include "P_HostDB.h"
#include "P_Cache.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "I_Machine.h"
#include "RecordsConfig.h"
#include "I_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Main.h
----------------------------------------------------------------------
diff --git a/proxy/Main.h b/proxy/Main.h
index b1f3c9b..278206b 100644
--- a/proxy/Main.h
+++ b/proxy/Main.h
@@ -24,9 +24,9 @@
#define _Main_h_
#include <ts/ink_defs.h>
-#include "libts.h"
-#include "Regression.h"
-#include "I_Version.h"
+#include "ts/libts.h"
+#include "ts/Regression.h"
+#include "ts/I_Version.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 4935798..6dc0f6f 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -36,8 +36,6 @@ TESTS = \
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(srcdir)/http \
-I$(srcdir)/http2 \
-I$(srcdir)/spdy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ParentSelection.cc
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index cd30180..5d63861 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "ParentSelection.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ParentSelection.h
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index e3ac989..51d21ed 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -36,11 +36,11 @@
#include "ControlBase.h"
#include "ControlMatcher.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#include "P_RecProcess.h"
-#include "libts.h"
+#include "ts/libts.h"
#define MAX_PARENTS 64
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Plugin.cc
----------------------------------------------------------------------
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 6927fa1..a621b92 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -22,15 +22,15 @@
*/
#include <stdio.h>
-#include "ink_platform.h"
-#include "ink_file.h"
-#include "ParseRules.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
+#include "ts/ParseRules.h"
#include "I_RecCore.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "InkAPIInternal.h"
#include "Main.h"
#include "Plugin.h"
-#include "ink_cap.h"
+#include "ts/ink_cap.h"
static const char *plugin_dir = ".";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Plugin.h
----------------------------------------------------------------------
diff --git a/proxy/Plugin.h b/proxy/Plugin.h
index 9364e61..78f05f4 100644
--- a/proxy/Plugin.h
+++ b/proxy/Plugin.h
@@ -24,7 +24,7 @@
#ifndef __PLUGIN_H__
#define __PLUGIN_H__
-#include "List.h"
+#include "ts/List.h"
struct PluginRegInfo {
PluginRegInfo();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/PluginVC.cc
----------------------------------------------------------------------
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index 723aa9d..d1072ad 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -74,7 +74,7 @@
#include "PluginVC.h"
#include "P_EventSystem.h"
#include "P_Net.h"
-#include "Regression.h"
+#include "ts/Regression.h"
#define PVC_LOCK_RETRY_TIME HRTIME_MSECONDS(10)
#define PVC_DEFAULT_MAX_BYTES 32768
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/PluginVC.h
----------------------------------------------------------------------
diff --git a/proxy/PluginVC.h b/proxy/PluginVC.h
index 3352ac9..b495a1d 100644
--- a/proxy/PluginVC.h
+++ b/proxy/PluginVC.h
@@ -38,7 +38,7 @@
#include "Plugin.h"
#include "P_Net.h"
-#include "ink_atomic.h"
+#include "ts/ink_atomic.h"
class PluginVCCore;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ProxyClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/ProxyClientSession.h b/proxy/ProxyClientSession.h
index 4ed616c..c1ba124 100644
--- a/proxy/ProxyClientSession.h
+++ b/proxy/ProxyClientSession.h
@@ -24,7 +24,7 @@
#ifndef __PROXY_CLIENT_SESSION_H__
#define __PROXY_CLIENT_SESSION_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ReverseProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/ReverseProxy.cc b/proxy/ReverseProxy.cc
index e16f917..68d3e8a 100644
--- a/proxy/ReverseProxy.cc
+++ b/proxy/ReverseProxy.cc
@@ -27,7 +27,7 @@
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <dlfcn.h>
#include "Main.h"
#include "Error.h"
@@ -36,8 +36,8 @@
#include "P_Cache.h"
#include "ProxyConfig.h"
#include "ReverseProxy.h"
-#include "MatcherUtils.h"
-#include "Tokenizer.h"
+#include "ts/MatcherUtils.h"
+#include "ts/Tokenizer.h"
#include "api/ts/remap.h"
#include "RemapPluginInfo.h"
#include "RemapProcessor.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/ReverseProxy.h
----------------------------------------------------------------------
diff --git a/proxy/ReverseProxy.h b/proxy/ReverseProxy.h
index 680401a..c6de9f1 100644
--- a/proxy/ReverseProxy.h
+++ b/proxy/ReverseProxy.h
@@ -35,8 +35,8 @@
#include "P_RecProcess.h"
-#include "ink_hash_table.h"
-#include "ink_defs.h"
+#include "ts/ink_hash_table.h"
+#include "ts/ink_defs.h"
#include "HttpTransact.h"
#include "RemapPluginInfo.h"
#include "UrlRewrite.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/SocksProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/SocksProxy.cc b/proxy/SocksProxy.cc
index 4b0cb85..94787a9 100644
--- a/proxy/SocksProxy.cc
+++ b/proxy/SocksProxy.cc
@@ -27,7 +27,7 @@
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "StatSystem.h"
#include "P_Net.h"
#include "I_OneWayTunnel.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/StatPages.cc
----------------------------------------------------------------------
diff --git a/proxy/StatPages.cc b/proxy/StatPages.cc
index f6fe0fa..136c7cd 100644
--- a/proxy/StatPages.cc
+++ b/proxy/StatPages.cc
@@ -28,11 +28,11 @@
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "ProxyConfig.h"
#include "StatPages.h"
#include "HdrUtils.h"
-#include "MatcherUtils.h"
+#include "ts/MatcherUtils.h"
#define MAX_STAT_PAGES 32
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/StatSystem.cc
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.cc b/proxy/StatSystem.cc
index a784429..a743774 100644
--- a/proxy/StatSystem.cc
+++ b/proxy/StatSystem.cc
@@ -34,7 +34,7 @@
#include "ProxyConfig.h"
#include "StatPages.h"
#include "HTTP.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
// defines
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/StatSystem.h
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.h b/proxy/StatSystem.h
index 8f1448b..61c39de 100644
--- a/proxy/StatSystem.h
+++ b/proxy/StatSystem.h
@@ -29,15 +29,15 @@
#if !defined(_StatSystem_h_)
#define _StatSystem_h_
-#include "ink_platform.h"
-#include "ink_hrtime.h"
-#include "ink_atomic.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_hrtime.h"
+#include "ts/ink_atomic.h"
#ifdef USE_LOCKS_FOR_DYN_STATS
#include "Lock.h"
#endif
-#include "ink_apidefs.h"
-#include "apidefs.h"
+#include "ts/ink_apidefs.h"
+#include "ts/apidefs.h"
#define STATS_MAJOR_VERSION 6 // increment when changing the stats!
#define DEFAULT_SNAP_FILENAME "stats.snap"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestClock.cc
----------------------------------------------------------------------
diff --git a/proxy/TestClock.cc b/proxy/TestClock.cc
index 14f8e6a..0df6a0b 100644
--- a/proxy/TestClock.cc
+++ b/proxy/TestClock.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_hrtime.h"
+#include "ts/ink_hrtime.h"
#include <sys/time.h>
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestClusterHash.cc
----------------------------------------------------------------------
diff --git a/proxy/TestClusterHash.cc b/proxy/TestClusterHash.cc
index 73ab208..93e65b9 100644
--- a/proxy/TestClusterHash.cc
+++ b/proxy/TestClusterHash.cc
@@ -26,7 +26,7 @@
TestClusterHash.cc
****************************************************************************/
#include "Cluster.h"
-#include "libts.h"
+#include "ts/libts.h"
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestDNS.cc
----------------------------------------------------------------------
diff --git a/proxy/TestDNS.cc b/proxy/TestDNS.cc
index 239daf5..f81301f 100644
--- a/proxy/TestDNS.cc
+++ b/proxy/TestDNS.cc
@@ -38,7 +38,7 @@
#include <string.h>
#include "VConnection.h"
#include "stdio.h"
-#include "libts.h"
+#include "ts/libts.h"
#define N_STATE_MACHINES 1000
#define MEASUREMENT_INTERVAL 100
class TestDnsStateMachine;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestPreProc.cc
----------------------------------------------------------------------
diff --git a/proxy/TestPreProc.cc b/proxy/TestPreProc.cc
index 68fef0d..12b0f47 100644
--- a/proxy/TestPreProc.cc
+++ b/proxy/TestPreProc.cc
@@ -26,8 +26,8 @@
#include "HttpPreProc.h"
#include "HttpMessage.h"
#include "HttpPreProcMessageManager.h"
-#include "RawHashTable.h"
-#include "ink_time.h" /* ink_time_wall_seconds() */
+#include "ts/RawHashTable.h"
+#include "ts/ink_time.h" /* ink_time_wall_seconds() */
#include <string.h>
#include <iostream.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/TestRegex.cc
----------------------------------------------------------------------
diff --git a/proxy/TestRegex.cc b/proxy/TestRegex.cc
index f1e0297..ce3c74c 100644
--- a/proxy/TestRegex.cc
+++ b/proxy/TestRegex.cc
@@ -22,7 +22,7 @@
*/
#include "Main.h"
-#include "Regex.h"
+#include "ts/Regex.h"
void
test()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/Transform.cc
----------------------------------------------------------------------
diff --git a/proxy/Transform.cc b/proxy/Transform.cc
index ce9dc01..841dad1 100644
--- a/proxy/Transform.cc
+++ b/proxy/Transform.cc
@@ -61,7 +61,7 @@
#include "ProxyConfig.h"
#include "P_Net.h"
-#include "MimeTable.h"
+#include "ts/MimeTable.h"
#include "TransformInternal.h"
#include "HdrUtils.h"
#include "Log.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/Congestion.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.cc b/proxy/congest/Congestion.cc
index f7e0883..0bbeeac 100644
--- a/proxy/congest/Congestion.cc
+++ b/proxy/congest/Congestion.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Net.h"
#include "CongestionDB.h"
#include "Congestion.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/Congestion.h
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.h b/proxy/congest/Congestion.h
index 760eae5..de964e6 100644
--- a/proxy/congest/Congestion.h
+++ b/proxy/congest/Congestion.h
@@ -31,7 +31,7 @@
#ifndef CONGESTION_H_
#define CONGESTION_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "ControlBase.h"
#include "ControlMatcher.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/CongestionDB.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionDB.cc b/proxy/congest/CongestionDB.cc
index eedd853..bb0035c 100644
--- a/proxy/congest/CongestionDB.cc
+++ b/proxy/congest/CongestionDB.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "P_Net.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/CongestionTest.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionTest.cc b/proxy/congest/CongestionTest.cc
index cad77e4..819fb63 100644
--- a/proxy/congest/CongestionTest.cc
+++ b/proxy/congest/CongestionTest.cc
@@ -27,7 +27,7 @@
*
*
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include <math.h>
#include "Main.h"
#include "CongestionDB.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/congest/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index a217582..24abea5 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HTTP.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index 25f14d1..78e7161 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -21,14 +21,14 @@
limitations under the License.
*/
-#include "ink_defs.h"
-#include "libts.h"
+#include "ts/ink_defs.h"
+#include "ts/libts.h"
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include "HTTP.h"
#include "HdrToken.h"
-#include "Diags.h"
+#include "ts/Diags.h"
/***********************************************************************
* *
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HTTP.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HTTP.h b/proxy/hdrs/HTTP.h
index 4c80bcc..7d91687 100644
--- a/proxy/hdrs/HTTP.h
+++ b/proxy/hdrs/HTTP.h
@@ -25,12 +25,12 @@
#define __HTTP_H__
#include <assert.h>
-#include "Arena.h"
-#include "INK_MD5.h"
+#include "ts/Arena.h"
+#include "ts/INK_MD5.h"
#include "MIME.h"
#include "URL.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#define HTTP_VERSION(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
#define HTTP_MINOR(v) ((v)&0xFFFF)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrHeap.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrHeap.cc b/proxy/hdrs/HdrHeap.cc
index ba35a68..ba381b7 100644
--- a/proxy/hdrs/HdrHeap.cc
+++ b/proxy/hdrs/HdrHeap.cc
@@ -30,7 +30,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HdrHeap.h"
#include "URL.h"
#include "MIME.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrHeap.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrHeap.h b/proxy/hdrs/HdrHeap.h
index 856e860..a06baf7 100644
--- a/proxy/hdrs/HdrHeap.h
+++ b/proxy/hdrs/HdrHeap.h
@@ -33,10 +33,10 @@
#ifndef _HDR_HEAP_H_
#define _HDR_HEAP_H_
-#include "Ptr.h"
-#include "ink_defs.h"
-#include "ink_assert.h"
-#include "Arena.h"
+#include "ts/Ptr.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_assert.h"
+#include "ts/Arena.h"
#include "HdrToken.h"
// Objects in the heap must currently be aligned to 8 byte boundaries,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrTSOnly.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTSOnly.cc b/proxy/hdrs/HdrTSOnly.cc
index 03de04a..686ee13 100644
--- a/proxy/hdrs/HdrTSOnly.cc
+++ b/proxy/hdrs/HdrTSOnly.cc
@@ -37,7 +37,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HTTP.h"
#include "P_EventSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrTest.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index dc40512..ec1d672 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -32,12 +32,12 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
#include "HttpCompat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrTest.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTest.h b/proxy/hdrs/HdrTest.h
index 5018b25..445ecd5 100644
--- a/proxy/hdrs/HdrTest.h
+++ b/proxy/hdrs/HdrTest.h
@@ -35,7 +35,7 @@
#ifndef _HdrTest_H_
#define _HdrTest_H_
-#include "Regression.h"
+#include "ts/Regression.h"
class HdrTest
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrToken.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 6f097aa..8d292ed 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -21,13 +21,13 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <stdio.h>
-#include "Allocator.h"
+#include "ts/Allocator.h"
#include "HTTP.h"
#include "HdrToken.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
/*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrToken.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrToken.h b/proxy/hdrs/HdrToken.h
index 7d5df61..5e20670 100644
--- a/proxy/hdrs/HdrToken.h
+++ b/proxy/hdrs/HdrToken.h
@@ -26,13 +26,13 @@
#include <assert.h>
#include <sys/types.h>
-#include "ink_assert.h"
-#include "ink_atomic.h"
-#include "ink_defs.h"
-#include "ink_string.h"
-#include "Allocator.h"
-#include "Regex.h"
-#include "ink_apidefs.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_string.h"
+#include "ts/Allocator.h"
+#include "ts/Regex.h"
+#include "ts/ink_apidefs.h"
////////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrUtils.cc b/proxy/hdrs/HdrUtils.cc
index 6766619..9266498 100644
--- a/proxy/hdrs/HdrUtils.cc
+++ b/proxy/hdrs/HdrUtils.cc
@@ -31,7 +31,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HdrUtils.h"
#define GETNEXT() \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HdrUtils.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrUtils.h b/proxy/hdrs/HdrUtils.h
index db43eed..efbbd90 100644
--- a/proxy/hdrs/HdrUtils.h
+++ b/proxy/hdrs/HdrUtils.h
@@ -34,7 +34,7 @@
#ifndef _HDR_UTILS_H_
#define _HDR_UTILS_H_
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
#include "MIME.h"
// csv = comma separated value
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HttpCompat.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HttpCompat.cc b/proxy/hdrs/HttpCompat.cc
index e8bad1d..4ccfd65 100644
--- a/proxy/hdrs/HttpCompat.cc
+++ b/proxy/hdrs/HttpCompat.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpCompat.h"
#include "HdrUtils.h" /* MAGIC_EDITING_TAG */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/HttpCompat.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HttpCompat.h b/proxy/hdrs/HttpCompat.h
index 1cbf80b..2ef1107 100644
--- a/proxy/hdrs/HttpCompat.h
+++ b/proxy/hdrs/HttpCompat.h
@@ -24,10 +24,10 @@
#ifndef __HTTP_COMPAT_H__
#define __HTTP_COMPAT_H__
-#include "ink_string++.h"
+#include "ts/ink_string++.h"
#include "MIME.h"
-#include "RawHashTable.h"
-#include "Diags.h"
+#include "ts/RawHashTable.h"
+#include "ts/Diags.h"
struct HttpBodySetRawData {
unsigned int magic;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/MIME.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/MIME.cc b/proxy/hdrs/MIME.cc
index b4378e6..af989f3 100644
--- a/proxy/hdrs/MIME.cc
+++ b/proxy/hdrs/MIME.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "ink_defs.h"
-#include "libts.h"
+#include "ts/ink_defs.h"
+#include "ts/libts.h"
#include <assert.h>
#include <stdio.h>
#include <string.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/MIME.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/MIME.h b/proxy/hdrs/MIME.h
index f55da24..5589383 100644
--- a/proxy/hdrs/MIME.h
+++ b/proxy/hdrs/MIME.h
@@ -26,9 +26,9 @@
#include <sys/time.h>
-#include "ink_assert.h"
-#include "ink_apidefs.h"
-#include "ink_string++.h"
+#include "ts/ink_assert.h"
+#include "ts/ink_apidefs.h"
+#include "ts/ink_string++.h"
#include "HdrHeap.h"
#include "HdrToken.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index 6d475d3..f0a6515 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -19,9 +19,7 @@
AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts
+ -I$(top_srcdir)/lib/records
noinst_LIBRARIES = libhdrs.a
EXTRA_PROGRAMS = load_http_hdr
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/URL.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index e6cde0b..430e83a 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -23,11 +23,11 @@
#include <assert.h>
#include <new>
-#include "libts.h"
+#include "ts/libts.h"
#include "URL.h"
#include "MIME.h"
#include "HTTP.h"
-#include "Diags.h"
+#include "ts/Diags.h"
const char *URL_SCHEME_FILE;
const char *URL_SCHEME_FTP;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/URL.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/URL.h b/proxy/hdrs/URL.h
index de82af1..d56b170 100644
--- a/proxy/hdrs/URL.h
+++ b/proxy/hdrs/URL.h
@@ -24,14 +24,14 @@
#ifndef __URL_H__
#define __URL_H__
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HdrToken.h"
#include "HdrHeap.h"
-#include "INK_MD5.h"
-#include "MMH.h"
+#include "ts/INK_MD5.h"
+#include "ts/MMH.h"
#include "MIME.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
typedef int64_t cache_generation_t;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/load_http_hdr.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/load_http_hdr.cc b/proxy/hdrs/load_http_hdr.cc
index c04fe5f..3bf7dac 100644
--- a/proxy/hdrs/load_http_hdr.cc
+++ b/proxy/hdrs/load_http_hdr.cc
@@ -46,8 +46,8 @@
#include "HdrHeap.h"
#include "MIME.h"
#include "HTTP.h"
-#include "Tokenizer.h"
-#include "Diags.h"
+#include "ts/Tokenizer.h"
+#include "ts/Diags.h"
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/test_header.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/test_header.cc b/proxy/hdrs/test_header.cc
index 9ddab43..ed3f212 100644
--- a/proxy/hdrs/test_header.cc
+++ b/proxy/hdrs/test_header.cc
@@ -25,11 +25,11 @@
#include <stdlib.h>
#include <string.h>
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
// #include "Marshal.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
#include "HttpCompat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/hdrs/test_urlhash.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/test_urlhash.cc b/proxy/hdrs/test_urlhash.cc
index 812d7d0..ed9f599 100644
--- a/proxy/hdrs/test_urlhash.cc
+++ b/proxy/hdrs/test_urlhash.cc
@@ -25,10 +25,10 @@
#include <stdlib.h>
#include <string.h>
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
#include "MIME.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#include "URL.h"
#include "HttpCompat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpBodyFactory.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.cc b/proxy/http/HttpBodyFactory.cc
index 189ca50..4482d5e 100644
--- a/proxy/http/HttpBodyFactory.cc
+++ b/proxy/http/HttpBodyFactory.cc
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpBodyFactory.h"
#include <unistd.h>
#include <dirent.h>
@@ -39,7 +39,7 @@
#include <logging/LogAccess.h>
#include <logging/LogAccessHttp.h>
#include "HttpCompat.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
//////////////////////////////////////////////////////////////////////
// The HttpBodyFactory creates HTTP response page bodies, supported //
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpBodyFactory.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpBodyFactory.h b/proxy/http/HttpBodyFactory.h
index cd8179f..bcafcbc 100644
--- a/proxy/http/HttpBodyFactory.h
+++ b/proxy/http/HttpBodyFactory.h
@@ -57,14 +57,14 @@
#include <strings.h>
#include <sys/types.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "HTTP.h"
#include "HttpConfig.h"
#include "HttpCompat.h"
#include "HttpTransact.h"
#include "Error.h"
#include "Main.h"
-#include "RawHashTable.h"
+#include "ts/RawHashTable.h"
#define HTTP_BODY_TEMPLATE_MAGIC 0xB0DFAC00
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.cc b/proxy/http/HttpClientSession.cc
index fe78143..f02834c 100644
--- a/proxy/http/HttpClientSession.cc
+++ b/proxy/http/HttpClientSession.cc
@@ -30,8 +30,8 @@
****************************************************************************/
-#include "ink_config.h"
-#include "Allocator.h"
+#include "ts/ink_config.h"
+#include "ts/Allocator.h"
#include "HttpClientSession.h"
#include "HttpSM.h"
#include "HttpDebugNames.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpClientSession.h b/proxy/http/HttpClientSession.h
index 684815d..7f8c118 100644
--- a/proxy/http/HttpClientSession.h
+++ b/proxy/http/HttpClientSession.h
@@ -32,7 +32,7 @@
#ifndef _HTTP_CLIENT_SESSION_H_
#define _HTTP_CLIENT_SESSION_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_Net.h"
#include "InkAPIInternal.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index d96b044..27b6508 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <ctype.h>
#include <string.h>
#include "HttpConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpConfig.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index 9b39cb6..2d93f70 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -41,8 +41,8 @@
#include <ctype.h>
#endif
-#include "libts.h"
-#include "Regex.h"
+#include "ts/libts.h"
+#include "ts/Regex.h"
#include "HttpProxyAPIEnums.h"
#include "ProxyConfig.h"
#include "P_RecProcess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpConnectionCount.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConnectionCount.h b/proxy/http/HttpConnectionCount.h
index 8ee4a19..d725ca0 100644
--- a/proxy/http/HttpConnectionCount.h
+++ b/proxy/http/HttpConnectionCount.h
@@ -22,8 +22,8 @@
*/
//
-#include "libts.h"
-#include "Map.h"
+#include "ts/libts.h"
+#include "ts/Map.h"
#ifndef _HTTP_CONNECTION_COUNT_H_
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpPages.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpPages.h b/proxy/http/HttpPages.h
index 69497e3..f009111 100644
--- a/proxy/http/HttpPages.h
+++ b/proxy/http/HttpPages.h
@@ -34,9 +34,9 @@
#ifndef _HTTP_PAGES_H_
#define _HTTP_PAGES_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
-#include "DynArray.h"
+#include "ts/DynArray.h"
#include "HTTP.h"
#include "StatPages.h"
#include "HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 97b85c5..4d2cd81 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "P_Net.h"
#include "Main.h"
#include "Error.h"
@@ -33,7 +33,7 @@
#include "HttpClientSession.h"
#include "HttpPages.h"
#include "HttpTunnel.h"
-#include "Tokenizer.h"
+#include "ts/Tokenizer.h"
#include "P_SSLNextProtocolAccept.h"
#include "ProtocolProbeSessionAccept.h"
#include "SpdySessionAccept.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpSM.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index 9508bbc..504ccdd 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -33,7 +33,7 @@
#ifndef _HTTP_SM_H_
#define _HTTP_SM_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "HttpCacheSM.h"
#include "HttpTransact.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpServerSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpServerSession.cc b/proxy/http/HttpServerSession.cc
index 7acaa5e..8e5ce73 100644
--- a/proxy/http/HttpServerSession.cc
+++ b/proxy/http/HttpServerSession.cc
@@ -28,8 +28,8 @@
Description:
****************************************************************************/
-#include "ink_config.h"
-#include "Allocator.h"
+#include "ts/ink_config.h"
+#include "ts/Allocator.h"
#include "HttpServerSession.h"
#include "HttpSessionManager.h"
#include "HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpSessionAccept.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionAccept.h b/proxy/http/HttpSessionAccept.h
index 09ff3b5..d368065 100644
--- a/proxy/http/HttpSessionAccept.h
+++ b/proxy/http/HttpSessionAccept.h
@@ -24,7 +24,7 @@
#if !defined(_HttpSessionAccept_h_)
#define _HttpSessionAccept_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "records/I_RecHttp.h"
#include "P_EventSystem.h"
#include "HttpConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index fcd0666..ff92198 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <strings.h>
#include <math.h>
@@ -32,10 +32,10 @@
#include "HttpCacheSM.h" //Added to get the scope of HttpCacheSM object - YTS Team, yamsat
#include "HttpDebugNames.h"
#include "time.h"
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
#include "HTTP.h"
#include "HdrUtils.h"
-#include "MimeTable.h"
+#include "ts/MimeTable.h"
#include "logging/Log.h"
#include "logging/LogUtils.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransact.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 75d2ad4..199c600 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -25,7 +25,7 @@
#if !defined(_HttpTransact_h_)
#define _HttpTransact_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_HostDB.h"
#include "P_Net.h"
#include "HttpConfig.h"
@@ -109,7 +109,7 @@ struct HttpConfigParams;
struct MimeTableEntry;
class HttpSM;
-#include "InkErrno.h"
+#include "ts/InkErrno.h"
#define UNKNOWN_INTERNAL_ERROR (INK_START_ERRNO - 1)
enum ViaStringIndex_t {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransactCache.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index 66a9583..8317b24 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
@@ -30,7 +30,7 @@
#include "HTTP.h"
#include "HttpCompat.h"
#include "Error.h"
-#include "InkErrno.h"
+#include "ts/InkErrno.h"
ClassAllocator<CacheLookupHttpConfig> CacheLookupHttpConfigAllocator("CacheLookupHttpConfigAllocator");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransactCache.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactCache.h b/proxy/http/HttpTransactCache.h
index bc3b680..d78e141 100644
--- a/proxy/http/HttpTransactCache.h
+++ b/proxy/http/HttpTransactCache.h
@@ -31,7 +31,7 @@
#if !defined(_HttpTransactCache_h_)
#define _HttpTransactCache_h_
-#include "libts.h"
+#include "ts/libts.h"
// This is needed since txn_conf->cache_guaranteed_max_lifetime is currently not
// readily available in the cache. ToDo: We should fix this with TS-1919
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTransactHeaders.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactHeaders.cc b/proxy/http/HttpTransactHeaders.cc
index 28cdffc..a0d56a3 100644
--- a/proxy/http/HttpTransactHeaders.cc
+++ b/proxy/http/HttpTransactHeaders.cc
@@ -20,7 +20,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTunnel.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index c5eb009..961e225 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -30,12 +30,12 @@
****************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "HttpConfig.h"
#include "HttpTunnel.h"
#include "HttpSM.h"
#include "HttpDebugNames.h"
-#include "ParseRules.h"
+#include "ts/ParseRules.h"
static const int min_block_transfer_bytes = 256;
static char const *const CHUNK_HEADER_FMT = "%" PRIx64 "\r\n";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpTunnel.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index db760a6..615e386 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -33,7 +33,7 @@
#ifndef _HTTP_TUNNEL_H_
#define _HTTP_TUNNEL_H_
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
// Get rid of any previous definition first... /leif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/HttpUpdateTester.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpUpdateTester.cc b/proxy/http/HttpUpdateTester.cc
index bf685e3..469a4dd 100644
--- a/proxy/http/HttpUpdateTester.cc
+++ b/proxy/http/HttpUpdateTester.cc
@@ -23,8 +23,8 @@
#include "HttpUpdateSM.h"
#include "HttpDebugNames.h"
-#include "Diags.h"
-#include "ink_platform.h"
+#include "ts/Diags.h"
+#include "ts/ink_platform.h"
#define MAX_ACTIVE_REQUESTS 5
#define MAX_TOTAL_REQUESTS 100
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index 5d94ccc..039f78e 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -24,8 +24,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy/hdrs \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/RegressionHttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/RegressionHttpTransact.cc b/proxy/http/RegressionHttpTransact.cc
index c238a55..4eb94d9 100644
--- a/proxy/http/RegressionHttpTransact.cc
+++ b/proxy/http/RegressionHttpTransact.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "Regression.h"
+#include "ts/Regression.h"
#include "HttpTransact.h"
#include "HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/TestHttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/TestHttpTransact.cc b/proxy/http/TestHttpTransact.cc
index 93e132a..15b1809 100644
--- a/proxy/http/TestHttpTransact.cc
+++ b/proxy/http/TestHttpTransact.cc
@@ -23,7 +23,7 @@
#include "HttpNet.h"
#include <iostream.h>
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
#include "DebugStream.h"
#include "IOBuffer.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 75adad5..711e319 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/mgmt \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/RemapConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 55079e9..512bc9d 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -24,11 +24,11 @@
#include "RemapConfig.h"
#include "UrlRewrite.h"
#include "ReverseProxy.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "HTTP.h"
-#include "libts.h"
-#include "ink_cap.h"
-#include "ink_file.h"
+#include "ts/libts.h"
+#include "ts/ink_cap.h"
+#include "ts/ink_file.h"
#define modulePrefix "[ReverseProxy]"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/RemapPluginInfo.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPluginInfo.h b/proxy/http/remap/RemapPluginInfo.h
index 9f2aa1a..3783fd3 100644
--- a/proxy/http/remap/RemapPluginInfo.h
+++ b/proxy/http/remap/RemapPluginInfo.h
@@ -23,7 +23,7 @@
#if !defined(_REMAPPLUGININFO_h_)
#define _REMAPPLUGININFO_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "api/ts/ts.h"
#include "api/ts/remap.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/RemapPlugins.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPlugins.h b/proxy/http/remap/RemapPlugins.h
index f2dc2b7..7eade67 100644
--- a/proxy/http/remap/RemapPlugins.h
+++ b/proxy/http/remap/RemapPlugins.h
@@ -28,7 +28,7 @@
#if !defined(_REMAPPLUGINS_h_)
#define _REMAPPLUGINS_h_
-#include "libts.h"
+#include "ts/libts.h"
#include "I_EventSystem.h"
#include "RemapProcessor.h"
#include "api/ts/ts.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlMapping.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMapping.cc b/proxy/http/remap/UrlMapping.cc
index fac93e8..45651fd 100644
--- a/proxy/http/remap/UrlMapping.cc
+++ b/proxy/http/remap/UrlMapping.cc
@@ -21,10 +21,10 @@
limitations under the License.
*/
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
#include "UrlMapping.h"
#include "I_RecCore.h"
-#include "ink_cap.h"
+#include "ts/ink_cap.h"
/**
*
**/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlMapping.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMapping.h b/proxy/http/remap/UrlMapping.h
index 28c9595..88791e6 100644
--- a/proxy/http/remap/UrlMapping.h
+++ b/proxy/http/remap/UrlMapping.h
@@ -24,13 +24,13 @@
#ifndef _URL_MAPPING_H_
#define _URL_MAPPING_H_
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "AclFiltering.h"
#include "Main.h"
#include "Error.h"
#include "URL.h"
#include "RemapPluginInfo.h"
-#include "Regex.h"
+#include "ts/Regex.h"
static const unsigned int MAX_REMAP_PLUGIN_CHAIN = 10;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlMappingPathIndex.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMappingPathIndex.h b/proxy/http/remap/UrlMappingPathIndex.h
index 4b1cad6..a634ded 100644
--- a/proxy/http/remap/UrlMappingPathIndex.h
+++ b/proxy/http/remap/UrlMappingPathIndex.h
@@ -23,13 +23,13 @@
#ifndef _URL_MAPPING_PATH_INDEX_H
#define _URL_MAPPING_PATH_INDEX_H
-#include "libts.h"
+#include "ts/libts.h"
#undef std // FIXME: remove dependancy on the STL
#include <map>
#include "URL.h"
#include "UrlMapping.h"
-#include "Trie.h"
+#include "ts/Trie.h"
class UrlMappingPathIndex
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlRewrite.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index b74171c..422cda3 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -26,7 +26,7 @@
#include "ReverseProxy.h"
#include "UrlMappingPathIndex.h"
#include "RemapConfig.h"
-#include "I_Layout.h"
+#include "ts/I_Layout.h"
#include "HttpSM.h"
#define modulePrefix "[ReverseProxy]"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/remap/UrlRewrite.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlRewrite.h b/proxy/http/remap/UrlRewrite.h
index 0720915..d7a37ae 100644
--- a/proxy/http/remap/UrlRewrite.h
+++ b/proxy/http/remap/UrlRewrite.h
@@ -24,10 +24,10 @@
#ifndef _URL_REWRITE_H_
#define _URL_REWRITE_H_
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "UrlMapping.h"
#include "HttpTransact.h"
-#include "Regex.h"
+#include "ts/Regex.h"
#define URL_REMAP_FILTER_NONE 0x00000000
#define URL_REMAP_FILTER_REFERER 0x00000001 /* enable "referer" header validation */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http/testheaders.cc
----------------------------------------------------------------------
diff --git a/proxy/http/testheaders.cc b/proxy/http/testheaders.cc
index b1bffe8..772f602 100644
--- a/proxy/http/testheaders.cc
+++ b/proxy/http/testheaders.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_string.h"
+#include "ts/ink_string.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HPACK.h
----------------------------------------------------------------------
diff --git a/proxy/http2/HPACK.h b/proxy/http2/HPACK.h
index 4e63a37..aec28bb 100644
--- a/proxy/http2/HPACK.h
+++ b/proxy/http2/HPACK.h
@@ -24,7 +24,7 @@
#ifndef __HPACK_H__
#define __HPACK_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "HTTP.h"
// Constant strings for pseudo headers of HPACK
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HTTP2.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index bfb494c..e7db7cb 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -24,7 +24,7 @@
#include "HTTP2.h"
#include "HPACK.h"
#include "HuffmanCodec.h"
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
#include "P_RecCore.h"
#include "P_RecProcess.h"
@@ -789,7 +789,7 @@ Http2::init()
#if TS_HAS_TESTS
-#include "TestBox.h"
+#include "ts/TestBox.h"
// Constants for regression test
const static int BUFSIZE_FOR_REGRESSION_TEST = 128;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HTTP2.h
----------------------------------------------------------------------
diff --git a/proxy/http2/HTTP2.h b/proxy/http2/HTTP2.h
index 97b187d..bdaf6f2 100644
--- a/proxy/http2/HTTP2.h
+++ b/proxy/http2/HTTP2.h
@@ -24,8 +24,8 @@
#ifndef __HTTP2_H__
#define __HTTP2_H__
-#include "ink_defs.h"
-#include "ink_memory.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_memory.h"
#include "HPACK.h"
#include "MIME.h"
#include "P_RecDefs.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/Http2SessionAccept.h
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2SessionAccept.h b/proxy/http2/Http2SessionAccept.h
index 6d6fce0..3d9ba22 100644
--- a/proxy/http2/Http2SessionAccept.h
+++ b/proxy/http2/Http2SessionAccept.h
@@ -24,7 +24,7 @@
#ifndef __HTTP2_SESSION_ACCEPT_H__
#define __HTTP2_SESSION_ACCEPT_H__
-#include "libts.h"
+#include "ts/libts.h"
#include "I_Net.h"
// XXX HttpSessionAccept::Options needs to be refactored and separated from HttpSessionAccept so that
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/HuffmanCodec.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/HuffmanCodec.cc b/proxy/http2/HuffmanCodec.cc
index 0efe589..08d4717 100644
--- a/proxy/http2/HuffmanCodec.cc
+++ b/proxy/http2/HuffmanCodec.cc
@@ -22,7 +22,7 @@
*/
#include "HuffmanCodec.h"
-#include "libts.h"
+#include "ts/libts.h"
struct huffman_entry {
uint32_t code_as_hex;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/http2/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index b8c74d0..76fa41c 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -21,8 +21,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/mgmt \
-I$(top_srcdir)/mgmt/utils \
-I$(top_srcdir)/proxy \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logcat.cc
----------------------------------------------------------------------
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index 1133c07..3113b5d 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#define PROGRAM_NAME "traffic_logcat"
#define MAX_LOGBUFFER_SIZE 65536
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 512ca9c..1c8cc25 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -32,7 +32,7 @@
class.
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "Main.h"
@@ -53,9 +53,9 @@
#include "LogUtils.h"
#include "Log.h"
#include "LogSock.h"
-#include "SimpleTokenizer.h"
+#include "ts/SimpleTokenizer.h"
-#include "ink_apidefs.h"
+#include "ts/ink_apidefs.h"
#define PERIODIC_TASKS_INTERVAL_FALLBACK 5
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/Log.h
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index a2ff117..552a8db 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -294,7 +294,7 @@
#define LOG_H
#include <stdarg.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecProcess.h"
#include "LogFile.h"
#include "LogBuffer.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index 65c71f8..0e66493 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -31,7 +31,7 @@
to provide support for marshalling and unmarshalling support for the other
LogAccess derived classes.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "HTTP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccess.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index 16d5f33..c9c176d 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -28,7 +28,7 @@
***************************************************************************/
#ifndef LOG_ACCESS_H
#define LOG_ACCESS_H
-#include "libts.h"
+#include "ts/libts.h"
#include "LogField.h"
/*-------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccessHttp.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index d34d449..de9ec73 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -30,7 +30,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "LogAccessHttp.h"
#include "http/HttpSM.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccessHttp.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessHttp.h b/proxy/logging/LogAccessHttp.h
index f7daf4a..984794d 100644
--- a/proxy/logging/LogAccessHttp.h
+++ b/proxy/logging/LogAccessHttp.h
@@ -25,7 +25,7 @@
#ifndef LOG_ACCESS_HTTP_H
#define LOG_ACCESS_HTTP_H
-#include "Arena.h"
+#include "ts/Arena.h"
#include "HTTP.h"
#include "LogAccess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogAccessICP.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccessICP.cc b/proxy/logging/LogAccessICP.cc
index e7b20d9..9cf31ba 100644
--- a/proxy/logging/LogAccessICP.cc
+++ b/proxy/logging/LogAccessICP.cc
@@ -31,7 +31,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "HTTP.h"
#include "ICP.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 6292498..2e03c3b 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -25,7 +25,7 @@
recording log entries. See the header file LogBuffer.h for more
information on the structure of a LogBuffer.
*/
-#include "libts.h"
+#include "ts/libts.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index 160aac0..8463f64 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -25,7 +25,7 @@
#ifndef LOG_BUFFER_H
#define LOG_BUFFER_H
-#include "libts.h"
+#include "ts/libts.h"
#include "LogFormat.h"
#include "LogLimits.h"
#include "LogAccess.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogCollationAccept.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationAccept.cc b/proxy/logging/LogCollationAccept.cc
index 605de41..0dedc92 100644
--- a/proxy/logging/LogCollationAccept.cc
+++ b/proxy/logging/LogCollationAccept.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "libts.h"
+#include "ts/libts.h"
#include "P_EventSystem.h"
#include "Log.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogCollationClientSM.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationClientSM.cc b/proxy/logging/LogCollationClientSM.cc
index 21cfa76..ac00aa0 100644
--- a/proxy/logging/LogCollationClientSM.cc
+++ b/proxy/logging/LogCollationClientSM.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "libts.h"
+#include "ts/libts.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogCollationHostSM.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationHostSM.cc b/proxy/logging/LogCollationHostSM.cc
index dc73d87..75e9512 100644
--- a/proxy/logging/LogCollationHostSM.cc
+++ b/proxy/logging/LogCollationHostSM.cc
@@ -25,7 +25,7 @@
// include files
//-------------------------------------------------------------------------
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <stdlib.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 7b59792..fdccf4c 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -21,18 +21,18 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#include "ink_platform.h"
-#include "ink_file.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_file.h"
#include "Main.h"
-#include "List.h"
+#include "ts/List.h"
#include "InkXml.h"
#include "Log.h"
@@ -45,7 +45,7 @@
#include "LogObject.h"
#include "LogConfig.h"
#include "LogUtils.h"
-#include "SimpleTokenizer.h"
+#include "ts/SimpleTokenizer.h"
#include "LogCollationAccept.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogConfig.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index 6143d91..c7e18ac 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -25,7 +25,7 @@
#ifndef LOG_CONFIG_H
#define LOG_CONFIG_H
-#include "libts.h"
+#include "ts/libts.h"
#include "P_RecProcess.h"
#include "ProxyConfig.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogField.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.cc b/proxy/logging/LogField.cc
index eb90e8d..37008cd 100644
--- a/proxy/logging/LogField.cc
+++ b/proxy/logging/LogField.cc
@@ -27,7 +27,7 @@
This file implements the LogField object, which is the central
representation of a logging field.
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "LogUtils.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogField.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.h b/proxy/logging/LogField.h
index 29ab7a9..27fad8e 100644
--- a/proxy/logging/LogField.h
+++ b/proxy/logging/LogField.h
@@ -25,7 +25,7 @@
#ifndef LOG_FIELD_H
#define LOG_FIELD_H
-#include "libts.h"
+#include "ts/libts.h"
#include "LogFieldAliasMap.h"
#include "StatSystem.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFieldAliasMap.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFieldAliasMap.cc b/proxy/logging/LogFieldAliasMap.cc
index 21c4cb2..ad2d53c 100644
--- a/proxy/logging/LogFieldAliasMap.cc
+++ b/proxy/logging/LogFieldAliasMap.cc
@@ -27,9 +27,9 @@
***************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include "LogFieldAliasMap.h"
-#include "ink_assert.h"
+#include "ts/ink_assert.h"
void
LogFieldAliasTable::init(size_t numPairs, ...)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFieldAliasMap.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFieldAliasMap.h b/proxy/logging/LogFieldAliasMap.h
index e355232..4df1e8d 100644
--- a/proxy/logging/LogFieldAliasMap.h
+++ b/proxy/logging/LogFieldAliasMap.h
@@ -33,10 +33,10 @@
#include <stdarg.h>
#include <string.h>
-#include "libts.h"
-#include "Ptr.h"
+#include "ts/libts.h"
+#include "ts/Ptr.h"
#include "LogUtils.h"
-#include "ink_string.h"
+#include "ts/ink_string.h"
/*****************************************************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index 63730c4..920e7be 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include <errno.h>
#include <sys/types.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFile.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.h b/proxy/logging/LogFile.h
index 6b2441f..1f127c2 100644
--- a/proxy/logging/LogFile.h
+++ b/proxy/logging/LogFile.h
@@ -28,7 +28,7 @@
#include <stdarg.h>
#include <stdio.h>
-#include "libts.h"
+#include "ts/libts.h"
#include "LogBufferSink.h"
class LogSock;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFilter.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFilter.cc b/proxy/logging/LogFilter.cc
index abdf66f..a266c1a 100644
--- a/proxy/logging/LogFilter.cc
+++ b/proxy/logging/LogFilter.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
#include "LogUtils.h"
@@ -39,8 +39,8 @@
#include "LogObject.h"
#include "LogConfig.h"
#include "Log.h"
-//#include "ink_ctype.h"
-#include "SimpleTokenizer.h"
+//#include "ts/ink_ctype.h"
+#include "ts/SimpleTokenizer.h"
const char *LogFilter::OPERATOR_NAME[] = {"MATCH", "CASE_INSENSITIVE_MATCH", "CONTAIN", "CASE_INSENSITIVE_CONTAIN"};
const char *LogFilter::ACTION_NAME[] = {"REJECT", "ACCEPT", "WIPE_FIELD_VALUE"};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFilter.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index 8a82a68..7102bba 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -25,8 +25,8 @@
#ifndef LOG_FILTER_H
#define LOG_FILTER_H
-#include "libts.h"
-#include "IpMap.h"
+#include "ts/libts.h"
+#include "ts/IpMap.h"
#include "LogAccess.h"
#include "LogField.h"
#include "LogFormat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFormat.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFormat.cc b/proxy/logging/LogFormat.cc
index 069211c..4d0abff 100644
--- a/proxy/logging/LogFormat.cc
+++ b/proxy/logging/LogFormat.cc
@@ -26,16 +26,16 @@
***************************************************************************/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include "INK_MD5.h"
+#include "ts/INK_MD5.h"
#include "Error.h"
-#include "SimpleTokenizer.h"
+#include "ts/SimpleTokenizer.h"
#include "LogUtils.h"
#include "LogFile.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogFormat.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFormat.h b/proxy/logging/LogFormat.h
index 39ee864..e910ecc 100644
--- a/proxy/logging/LogFormat.h
+++ b/proxy/logging/LogFormat.h
@@ -26,7 +26,7 @@
#define LOG_FIELD_MARKER '\377'
-#include "libts.h"
+#include "ts/libts.h"
#include "LogField.h"
#include "InkXml.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogHost.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc
index 8e7b0a3..4767cc0 100644
--- a/proxy/logging/LogHost.cc
+++ b/proxy/logging/LogHost.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogObject.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index e3e8589..77fe808 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -26,7 +26,7 @@
***************************************************************************/
-#include "libts.h"
+#include "ts/libts.h"
#include "Error.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogObject.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.h b/proxy/logging/LogObject.h
index 649ad4f..3d6fe4d 100644
--- a/proxy/logging/LogObject.h
+++ b/proxy/logging/LogObject.h
@@ -25,7 +25,7 @@
#ifndef LOG_OBJECT_H
#define LOG_OBJECT_H
-#include "libts.h"
+#include "ts/libts.h"
#include "Log.h"
#include "LogFile.h"
#include "LogFormat.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogSock.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogSock.h b/proxy/logging/LogSock.h
index a80cf2b..1bf5118 100644
--- a/proxy/logging/LogSock.h
+++ b/proxy/logging/LogSock.h
@@ -25,7 +25,7 @@
#ifndef LOG_SOCK_H
#define LOG_SOCK_H
-#include "libts.h"
+#include "ts/libts.h"
/*-------------------------------------------------------------------------
LogSock
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogStandalone.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index ebac47c..4b74479 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -27,9 +27,9 @@
***************************************************************************/
-#include "libts.h"
-#include "ink_sys_control.h"
-#include "signals.h"
+#include "ts/libts.h"
+#include "ts/ink_sys_control.h"
+#include "ts/signals.h"
#include "DiagsConfig.h"
#include "Main.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index 4099f54..1aac724 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -21,7 +21,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-#include "ink_config.h"
+#include "ts/ink_config.h"
#include <assert.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/LogUtils.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogUtils.h b/proxy/logging/LogUtils.h
index 2b8b533..3d815b5a 100644
--- a/proxy/logging/LogUtils.h
+++ b/proxy/logging/LogUtils.h
@@ -25,8 +25,8 @@
#include "time.h"
-#include "libts.h"
-#include "Arena.h"
+#include "ts/libts.h"
+#include "ts/Arena.h"
namespace LogUtils
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logging/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index f8220f9..bfcd942 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
$(iocore_include_dirs) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/records \
- -I$(top_srcdir)/lib/ts \
- -I$(top_builddir)/lib/ts \
-I$(top_srcdir)/proxy/api/ts \
-I$(top_srcdir)/proxy \
-I$(top_srcdir)/proxy/http \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 7c24eb3..9e73bc3 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -21,12 +21,12 @@
limitations under the License.
*/
-#include "libts.h"
+#include "ts/libts.h"
#undef std // FIXME: remove dependency on the STL
-#include "ink_config.h"
-#include "ink_file.h"
-#include "I_Layout.h"
-#include "I_Version.h"
+#include "ts/ink_config.h"
+#include "ts/ink_file.h"
+#include "ts/I_Layout.h"
+#include "ts/I_Version.h"
// Includes and namespaces etc.
#include "LogStandalone.cc"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/23ce6934/proxy/sac.cc
----------------------------------------------------------------------
diff --git a/proxy/sac.cc b/proxy/sac.cc
index d6862a7..6d6bd0d 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -21,8 +21,8 @@
limitations under the License.
*/
-#include "libts.h"
-#include "I_Layout.h"
+#include "ts/libts.h"
+#include "ts/I_Layout.h"
#include "P_Net.h"
#define PROGRAM_NAME "traffic_sac"