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/09 18:33:08 UTC
trafficserver git commit: TS-3739 Enable build, and change default lib path such that we do not look in lib/ts by default

Repository: trafficserver
Updated Branches:
  refs/heads/master f426e6368 -> c8c5ba881


TS-3739 Enable build, and change default lib path such that we do not look in lib/ts by default


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c8c5ba88
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c8c5ba88
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c8c5ba88

Branch: refs/heads/master
Commit: c8c5ba881c3d644e311892b5d596fd0b213ad395
Parents: f426e63
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jul 9 10:28:09 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Jul 9 10:28:19 2015 -0600

----------------------------------------------------------------------
 .gitignore                                        |  5 ++++-
 build/plugins.mk                                  |  3 +--
 configure.ac                                      |  2 +-
 example/add-header/add-header.c                   |  2 +-
 example/append-transform/append-transform.c       |  2 +-
 example/basic-auth/basic-auth.c                   |  2 +-
 example/blacklist-1/blacklist-1.c                 |  2 +-
 example/bnull-transform/bnull-transform.c         |  2 +-
 example/cache-scan/cache-scan.cc                  |  2 +-
 example/hello/hello.c                             |  2 +-
 example/null-transform/null-transform.c           |  2 +-
 example/output-header/output-header.c             |  2 +-
 example/protocol/Protocol.c                       |  2 +-
 example/protocol/TxnSM.c                          |  2 +-
 example/query-remap/query-remap.c                 |  2 +-
 example/remap/remap.cc                            |  2 +-
 example/replace-header/replace-header.c           |  2 +-
 example/response-header-1/response-header-1.c     |  2 +-
 example/server-transform/server-transform.c       |  2 +-
 example/ssl-sni-whitelist/ssl-sni-whitelist.cc    |  2 +-
 example/ssl-sni/ssl-sni.cc                        |  2 +-
 example/thread-1/thread-1.c                       |  2 +-
 example/thread-pool/psi.c                         |  2 +-
 example/thread-pool/thread.c                      |  2 +-
 example/version/version.c                         |  2 +-
 plugins/cacheurl/cacheurl.cc                      |  5 +++--
 plugins/conf_remap/conf_remap.cc                  | 18 +-----------------
 plugins/experimental/Makefile.am                  |  6 ++----
 plugins/experimental/authproxy/authproxy.cc       |  3 ++-
 plugins/experimental/background_fetch/configs.h   |  2 +-
 plugins/experimental/balancer/balancer.cc         |  2 +-
 .../experimental/cache_promote/cache_promote.cc   |  2 +-
 plugins/experimental/epic/epic.cc                 |  3 ++-
 plugins/experimental/esi/combo_handler.cc         |  2 +-
 plugins/experimental/esi/esi.cc                   |  2 +-
 plugins/experimental/esi/serverIntercept.cc       |  2 +-
 .../regex_revalidate/regex_revalidate.c           |  4 ++--
 plugins/experimental/sslheaders/expand.cc         |  2 +-
 plugins/experimental/sslheaders/sslheaders.cc     |  2 +-
 plugins/experimental/sslheaders/util.cc           |  2 +-
 .../stale_while_revalidate.c                      |  2 +-
 .../experimental/ts_lua/ts_lua_client_request.c   |  2 +-
 plugins/experimental/ts_lua/ts_lua_common.h       |  2 +-
 .../experimental/ts_lua/ts_lua_server_request.c   |  2 +-
 plugins/experimental/xdebug/xdebug.cc             |  2 +-
 plugins/gzip/gzip.cc                              |  7 ++++---
 plugins/gzip/misc.cc                              |  2 +-
 plugins/header_rewrite/lulu.h                     |  4 ++--
 plugins/regex_remap/regex_remap.cc                |  6 +++---
 plugins/stats_over_http/stats_over_http.c         |  2 +-
 plugins/tcpinfo/tcpinfo.cc                        |  2 +-
 proxy/api/ts/ts.h                                 |  2 +-
 52 files changed, 67 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 772a2e6..ac17aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,11 +56,14 @@ cmd/traffic_layout/traffic_layout
 cmd/traffic_via/traffic_via
 cmd/traffic_wccp/traffic_wccp
 
+lib/stamp-h1
+lib/ink_autoconf.h
+lib/ink_autoconf.h.in
+lib/ts/stamp-h1
 lib/ts/ink_autoconf.h
 lib/ts/ink_autoconf.h.in
 lib/ts/ink_config.h
 lib/ts/apidefs.h
-lib/ts/stamp-h1
 lib/ts/CompileParseRules
 lib/ts/ParseRulesCType
 lib/ts/ParseRulesCTypeToLower

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/build/plugins.mk
----------------------------------------------------------------------
diff --git a/build/plugins.mk b/build/plugins.mk
index b92eb1f..4a23105 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -25,8 +25,7 @@ TS_PLUGIN_LDFLAGS = \
 TS_PLUGIN_CPPFLAGS = \
   -I$(top_builddir)/proxy/api \
   -I$(top_srcdir)/proxy/api \
-  -I$(top_builddir)/lib/ts \
-  -I$(top_srcdir)/lib/ts \
+  -I$(top_builddir)/lib \
   -I$(top_srcdir)/lib
 
 # Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index d7e8015..29c0b7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_CONFIG_AUX_DIR([build/aux])
 AC_CONFIG_SRCDIR([proxy/Main.cc])
 AC_CONFIG_MACRO_DIR([build])
 AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman subdir-objects 1.9.2])
-AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
+AC_CONFIG_HEADERS([lib/ink_autoconf.h])
 
 # Configure with --disable-silent-rules to get verbose output. For more info, see
 # http://www.gnu.org/software/automake/manual/html_node/Automake-silent_002drules-Option.html

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/add-header/add-header.c
----------------------------------------------------------------------
diff --git a/example/add-header/add-header.c b/example/add-header/add-header.c
index e2dd814..1783cdc 100644
--- a/example/add-header/add-header.c
+++ b/example/add-header/add-header.c
@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static TSMBuffer hdr_bufp;
 static TSMLoc hdr_loc;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/append-transform/append-transform.c
----------------------------------------------------------------------
diff --git a/example/append-transform/append-transform.c b/example/append-transform/append-transform.c
index 386ece5..87c9c60 100644
--- a/example/append-transform/append-transform.c
+++ b/example/append-transform/append-transform.c
@@ -41,7 +41,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define ASSERT_SUCCESS(_x) TSAssert((_x) == TS_SUCCESS)
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/basic-auth/basic-auth.c
----------------------------------------------------------------------
diff --git a/example/basic-auth/basic-auth.c b/example/basic-auth/basic-auth.c
index 3afb8cd..4e6c0b6 100644
--- a/example/basic-auth/basic-auth.c
+++ b/example/basic-auth/basic-auth.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 
 static char base64_codes[256];

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/blacklist-1/blacklist-1.c
----------------------------------------------------------------------
diff --git a/example/blacklist-1/blacklist-1.c b/example/blacklist-1/blacklist-1.c
index e1c499e..9226edd 100644
--- a/example/blacklist-1/blacklist-1.c
+++ b/example/blacklist-1/blacklist-1.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define MAX_NSITES 500
 #define RETRY_TIME 10

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/bnull-transform/bnull-transform.c
----------------------------------------------------------------------
diff --git a/example/bnull-transform/bnull-transform.c b/example/bnull-transform/bnull-transform.c
index 563bfc0..e87d337 100644
--- a/example/bnull-transform/bnull-transform.c
+++ b/example/bnull-transform/bnull-transform.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define TS_NULL_MUTEX NULL
 #define STATE_BUFFER_DATA 0

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/cache-scan/cache-scan.cc
----------------------------------------------------------------------
diff --git a/example/cache-scan/cache-scan.cc b/example/cache-scan/cache-scan.cc
index 70e8d15..eff1163 100644
--- a/example/cache-scan/cache-scan.cc
+++ b/example/cache-scan/cache-scan.cc
@@ -32,7 +32,7 @@
 
 #include "ts/ts.h"
 #include "ts/experimental.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static TSCont global_contp;
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/hello/hello.c
----------------------------------------------------------------------
diff --git a/example/hello/hello.c b/example/hello/hello.c
index 94379e5..765fa15 100644
--- a/example/hello/hello.c
+++ b/example/hello/hello.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 void
 TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/null-transform/null-transform.c
----------------------------------------------------------------------
diff --git a/example/null-transform/null-transform.c b/example/null-transform/null-transform.c
index a4a5e72..c8f101a 100644
--- a/example/null-transform/null-transform.c
+++ b/example/null-transform/null-transform.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 typedef struct {
   TSVIO output_vio;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/output-header/output-header.c
----------------------------------------------------------------------
diff --git a/example/output-header/output-header.c b/example/output-header/output-header.c
index 90db3b6..59388be 100644
--- a/example/output-header/output-header.c
+++ b/example/output-header/output-header.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define DEBUG_TAG "output-header"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/protocol/Protocol.c
----------------------------------------------------------------------
diff --git a/example/protocol/Protocol.c b/example/protocol/Protocol.c
index cf2e3b1..c07ec08 100644
--- a/example/protocol/Protocol.c
+++ b/example/protocol/Protocol.c
@@ -23,7 +23,7 @@
 
 #include "Protocol.h"
 #include "TxnSM.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include <math.h>
 
 /* global variable */

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/protocol/TxnSM.c
----------------------------------------------------------------------
diff --git a/example/protocol/TxnSM.c b/example/protocol/TxnSM.c
index 8aff655..5f723c6 100644
--- a/example/protocol/TxnSM.c
+++ b/example/protocol/TxnSM.c
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 #include <netinet/in.h>
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include "TxnSM.h"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/query-remap/query-remap.c
----------------------------------------------------------------------
diff --git a/example/query-remap/query-remap.c b/example/query-remap/query-remap.c
index ec6249f..262cc61 100644
--- a/example/query-remap/query-remap.c
+++ b/example/query-remap/query-remap.c
@@ -27,7 +27,7 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define PLUGIN_NAME "query_remap"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/remap/remap.cc
----------------------------------------------------------------------
diff --git a/example/remap/remap.cc b/example/remap/remap.cc
index 931ba11..5b644c9 100644
--- a/example/remap/remap.cc
+++ b/example/remap/remap.cc
@@ -44,7 +44,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include "ts/ts.h"
 #include "ts/remap.h"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/replace-header/replace-header.c
----------------------------------------------------------------------
diff --git a/example/replace-header/replace-header.c b/example/replace-header/replace-header.c
index 189e1f8..8fea65d 100644
--- a/example/replace-header/replace-header.c
+++ b/example/replace-header/replace-header.c
@@ -37,7 +37,7 @@
 #include <ctype.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static void
 replace_header(TSHttpTxn txnp)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/response-header-1/response-header-1.c
----------------------------------------------------------------------
diff --git a/example/response-header-1/response-header-1.c b/example/response-header-1/response-header-1.c
index 016a20c..3160639 100644
--- a/example/response-header-1/response-header-1.c
+++ b/example/response-header-1/response-header-1.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static int init_buffer_status;
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/server-transform/server-transform.c
----------------------------------------------------------------------
diff --git a/example/server-transform/server-transform.c b/example/server-transform/server-transform.c
index c3fef62..b99e951 100644
--- a/example/server-transform/server-transform.c
+++ b/example/server-transform/server-transform.c
@@ -57,7 +57,7 @@
 #include <netinet/in.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define STATE_BUFFER 1
 #define STATE_CONNECT 2

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
----------------------------------------------------------------------
diff --git a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
index 206da35..c30eeed 100644
--- a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
+++ b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
@@ -27,7 +27,7 @@
 #include <memory.h>
 #include <inttypes.h>
 #include <ts/ts.h>
-#include <ink_config.h>
+#include "ts/ink_config.h"
 #include <tsconfig/TsValue.h>
 #include <openssl/ssl.h>
 #include <getopt.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/ssl-sni/ssl-sni.cc
----------------------------------------------------------------------
diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc
index cf81cef..55d1dd6 100644
--- a/example/ssl-sni/ssl-sni.cc
+++ b/example/ssl-sni/ssl-sni.cc
@@ -30,7 +30,7 @@
 #include <memory.h>
 #include <inttypes.h>
 #include <ts/ts.h>
-#include <ink_config.h>
+#include "ts/ink_config.h"
 #include <tsconfig/TsValue.h>
 #include <openssl/ssl.h>
 #include <getopt.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/thread-1/thread-1.c
----------------------------------------------------------------------
diff --git a/example/thread-1/thread-1.c b/example/thread-1/thread-1.c
index a9be7f5..8431075 100644
--- a/example/thread-1/thread-1.c
+++ b/example/thread-1/thread-1.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static void *
 reenable_txn(void *data)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/thread-pool/psi.c
----------------------------------------------------------------------
diff --git a/example/thread-pool/psi.c b/example/thread-pool/psi.c
index f924659..142c1fc 100644
--- a/example/thread-pool/psi.c
+++ b/example/thread-pool/psi.c
@@ -52,7 +52,7 @@
 
 #include "ts/ts.h"
 #include "thread.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define DBG_TAG "xpsi"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/thread-pool/thread.c
----------------------------------------------------------------------
diff --git a/example/thread-pool/thread.c b/example/thread-pool/thread.c
index 544c6b2..db27906 100644
--- a/example/thread-pool/thread.c
+++ b/example/thread-pool/thread.c
@@ -27,7 +27,7 @@
 #include "ts/ts.h"
 
 #include "thread.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define DBGTAG "xthread"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/example/version/version.c
----------------------------------------------------------------------
diff --git a/example/version/version.c b/example/version/version.c
index 8c92949..f5c8126 100644
--- a/example/version/version.c
+++ b/example/version/version.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 void
 TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/cacheurl/cacheurl.cc
----------------------------------------------------------------------
diff --git a/plugins/cacheurl/cacheurl.cc b/plugins/cacheurl/cacheurl.cc
index 2c3d96b..72eea1b 100644
--- a/plugins/cacheurl/cacheurl.cc
+++ b/plugins/cacheurl/cacheurl.cc
@@ -27,8 +27,9 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
-#include "ink_memory.h"
+
+#include "ts/ink_defs.h"
+#include "ts/ink_memory.h"
 
 #include <string>
 #include <vector>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/conf_remap/conf_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/conf_remap/conf_remap.cc b/plugins/conf_remap/conf_remap.cc
index ebf61b4..726d50c 100644
--- a/plugins/conf_remap/conf_remap.cc
+++ b/plugins/conf_remap/conf_remap.cc
@@ -18,7 +18,7 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -334,19 +334,3 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo * /* rri ATS_UNUSED */
 
   return TSREMAP_NO_REMAP; // This plugin never rewrites anything.
 }
-
-
-/*
-  local variables:
-  mode: C++
-  indent-tabs-mode: nil
-  c-basic-offset: 2
-  c-comment-only-line-offset: 0
-  c-file-offsets: ((statement-block-intro . +)
-  (label . 0)
-  (statement-cont . +)
-  (innamespace . 0))
-  end:
-
-  Indent with: /usr/bin/indent -ncs -nut -npcs -l 120 logstats.cc
-*/

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index aefdeb6..f7e0e94 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -40,10 +40,8 @@ SUBDIRS = \
  stale_while_revalidate \
  url_sig \
  xdebug \
- mp4
-
-# Commented out for now, since it breaks on OSX
-# stream_editor
+ mp4 \
+ stream_editor
 
 if HAS_MYSQL
   SUBDIRS += mysql_remap

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/authproxy/authproxy.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/authproxy/authproxy.cc b/plugins/experimental/authproxy/authproxy.cc
index d27bf41..e734b7a 100644
--- a/plugins/experimental/authproxy/authproxy.cc
+++ b/plugins/experimental/authproxy/authproxy.cc
@@ -37,7 +37,8 @@
 #include <arpa/inet.h>
 #include <sys/param.h>
 #include <ts/remap.h>
-#include <ink_config.h>
+
+#include "ts/ink_config.h"
 
 using std::strlen;
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/background_fetch/configs.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/background_fetch/configs.h b/plugins/experimental/background_fetch/configs.h
index 4f5ff33..f334d04 100644
--- a/plugins/experimental/background_fetch/configs.h
+++ b/plugins/experimental/background_fetch/configs.h
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include "rules.h"
-#include "ink_atomic.h"
+#include "ts/ink_atomic.h"
 
 // Constants
 const char PLUGIN_NAME[] = "background_fetch";

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/balancer/balancer.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/balancer/balancer.cc b/plugins/experimental/balancer/balancer.cc
index c330ec6..337dcf2 100644
--- a/plugins/experimental/balancer/balancer.cc
+++ b/plugins/experimental/balancer/balancer.cc
@@ -30,7 +30,7 @@
 #include <iterator>
 
 // Using ink_inet API is cheating, but I was too lazy to write new IPv6 address parsing routines ;)
-#include "ink_inet.h"
+#include "ts/ink_inet.h"
 
 // The policy type is the first comma-separated token.
 static BalancerInstance *

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/cache_promote/cache_promote.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/cache_promote/cache_promote.cc b/plugins/experimental/cache_promote/cache_promote.cc
index eb99ae9..9c2edb6 100644
--- a/plugins/experimental/cache_promote/cache_promote.cc
+++ b/plugins/experimental/cache_promote/cache_promote.cc
@@ -30,7 +30,7 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_config.h"
+#include "ts/ink_config.h"
 
 
 static const char *PLUGIN_NAME = "cache_promote";

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/epic/epic.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/epic/epic.cc b/plugins/experimental/epic/epic.cc
index 06fe108..6f6abff 100644
--- a/plugins/experimental/epic/epic.cc
+++ b/plugins/experimental/epic/epic.cc
@@ -29,7 +29,8 @@
 #include <inttypes.h>
 #include <set>
 #include <string>
-#include "ink_defs.h"
+
+#include "ts/ink_defs.h"
 
 #define debug_tag(tag, fmt, ...)          \
   do {                                    \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/esi/combo_handler.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/combo_handler.cc b/plugins/experimental/esi/combo_handler.cc
index ead810e..433d4fb 100644
--- a/plugins/experimental/esi/combo_handler.cc
+++ b/plugins/experimental/esi/combo_handler.cc
@@ -33,7 +33,7 @@
 #include "ts/ts.h"
 #include "ts/experimental.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include "HttpDataFetcherImpl.h"
 #include "gzip.h"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/esi/esi.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/esi.cc b/plugins/experimental/esi/esi.cc
index c20c238..52b2320 100644
--- a/plugins/experimental/esi/esi.cc
+++ b/plugins/experimental/esi/esi.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include <stdio.h>
 #include <stdlib.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/esi/serverIntercept.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/serverIntercept.cc b/plugins/experimental/esi/serverIntercept.cc
index 28e8195..56989d2 100644
--- a/plugins/experimental/esi/serverIntercept.cc
+++ b/plugins/experimental/esi/serverIntercept.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include "serverIntercept.h"
 
 #include <string>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/regex_revalidate/regex_revalidate.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/regex_revalidate/regex_revalidate.c b/plugins/experimental/regex_revalidate/regex_revalidate.c
index 1835b5d..a1f728f 100644
--- a/plugins/experimental/regex_revalidate/regex_revalidate.c
+++ b/plugins/experimental/regex_revalidate/regex_revalidate.c
@@ -19,8 +19,8 @@
   limitations under the License.
  */
 
-#include "ink_defs.h"
-#include "ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_platform.h"
 
 #include <stdlib.h>
 #include <stdio.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/sslheaders/expand.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/sslheaders/expand.cc b/plugins/experimental/sslheaders/expand.cc
index 0b8fbd1..128faf9 100644
--- a/plugins/experimental/sslheaders/expand.cc
+++ b/plugins/experimental/sslheaders/expand.cc
@@ -17,7 +17,7 @@
  */
 
 #include "sslheaders.h"
-#include <ink_defs.h>
+#include "ts/ink_defs.h"
 
 #include <openssl/x509.h>
 #include <openssl/pem.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/sslheaders/sslheaders.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/sslheaders/sslheaders.cc b/plugins/experimental/sslheaders/sslheaders.cc
index da60505..196f590 100644
--- a/plugins/experimental/sslheaders/sslheaders.cc
+++ b/plugins/experimental/sslheaders/sslheaders.cc
@@ -17,7 +17,7 @@
  */
 
 #include "sslheaders.h"
-#include "ink_memory.h"
+#include "ts/ink_memory.h"
 
 #include <getopt.h>
 #include <openssl/ssl.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/sslheaders/util.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/sslheaders/util.cc b/plugins/experimental/sslheaders/util.cc
index 5525ef0..5d9b066 100644
--- a/plugins/experimental/sslheaders/util.cc
+++ b/plugins/experimental/sslheaders/util.cc
@@ -18,7 +18,7 @@
 
 #include "sslheaders.h"
 #include <memory>
-#include <ink_defs.h>
+#include "ts/ink_defs.h"
 
 // Count of fields (not including SSL_HEADERS_FIELD_NONE).
 #define NUMFIELDS (SSL_HEADERS_FIELD_MAX - 1)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
index 4a48400..5eab951 100644
--- a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
+++ b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
@@ -30,7 +30,7 @@
 #include <getopt.h>
 #include <arpa/inet.h>
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include "ts/ts.h"
 #include "ts/experimental.h"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/ts_lua/ts_lua_client_request.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.c b/plugins/experimental/ts_lua/ts_lua_client_request.c
index ad3e9a2..7639a62 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.c
@@ -17,7 +17,7 @@
 */
 
 
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
 #include <netinet/in.h>
 #include "ts_lua_util.h"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/ts_lua/ts_lua_common.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_common.h b/plugins/experimental/ts_lua/ts_lua_common.h
index 3a26472..06187d7 100644
--- a/plugins/experimental/ts_lua/ts_lua_common.h
+++ b/plugins/experimental/ts_lua/ts_lua_common.h
@@ -31,7 +31,7 @@
 #include <ts/ts.h>
 #include <ts/experimental.h>
 #include <ts/remap.h>
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include "ts_lua_coroutine.h"
 
 #define TS_LUA_FUNCTION_REMAP "do_remap"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/ts_lua/ts_lua_server_request.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_server_request.c b/plugins/experimental/ts_lua/ts_lua_server_request.c
index a980615..9f40fcb 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_server_request.c
@@ -16,7 +16,7 @@
   limitations under the License.
 */
 
-#include "ink_platform.h"
+#include "ts/ink_platform.h"
 #include <netinet/in.h>
 #include "ts_lua_util.h"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/experimental/xdebug/xdebug.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/xdebug/xdebug.cc b/plugins/experimental/xdebug/xdebug.cc
index a22d832..8cac135 100644
--- a/plugins/experimental/xdebug/xdebug.cc
+++ b/plugins/experimental/xdebug/xdebug.cc
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <strings.h>
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 // The name of the debug request header. This should probably be configurable.
 #define X_DEBUG_HEADER "X-Debug"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/gzip/gzip.cc
----------------------------------------------------------------------
diff --git a/plugins/gzip/gzip.cc b/plugins/gzip/gzip.cc
index 0aa56d1..73cdbe7 100644
--- a/plugins/gzip/gzip.cc
+++ b/plugins/gzip/gzip.cc
@@ -24,13 +24,14 @@
 #include <string>
 #include <string.h>
 #include <zlib.h>
-#include <ts/ts.h>
+
+#include "ts/ts.h"
+#include "ts/ink_defs.h"
+
 #include "debug_macros.h"
 #include "misc.h"
 #include "configuration.h"
 
-#include "ink_defs.h"
-
 using namespace std;
 using namespace Gzip;
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/gzip/misc.cc b/plugins/gzip/misc.cc
index 65789df..e71fdc3 100644
--- a/plugins/gzip/misc.cc
+++ b/plugins/gzip/misc.cc
@@ -22,7 +22,7 @@
  */
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include "misc.h"
 #include <string.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/header_rewrite/lulu.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/lulu.h b/plugins/header_rewrite/lulu.h
index c4080b1..7f1d943 100644
--- a/plugins/header_rewrite/lulu.h
+++ b/plugins/header_rewrite/lulu.h
@@ -25,8 +25,8 @@
 
 #include <string>
 
-#include "ink_defs.h"
-#include "ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_platform.h"
 
 std::string getIP(sockaddr const *s_sockaddr);
 char *getIP(sockaddr const *s_sockaddr, char res[INET6_ADDRSTRLEN]);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/regex_remap/regex_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index fd120da..f2e44a4 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -37,9 +37,9 @@
 #include <ctype.h>
 
 // Get some specific stuff from libts, yes, we can do that now that we build inside the core.
-#include "ink_platform.h"
-#include "ink_atomic.h"
-#include "ink_time.h"
+#include "ts/ink_platform.h"
+#include "ts/ink_atomic.h"
+#include "ts/ink_time.h"
 
 #ifdef HAVE_PCRE_PCRE_H
 #include <pcre/pcre.h>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/stats_over_http/stats_over_http.c
----------------------------------------------------------------------
diff --git a/plugins/stats_over_http/stats_over_http.c b/plugins/stats_over_http/stats_over_http.c
index 837398a..bf90a53 100644
--- a/plugins/stats_over_http/stats_over_http.c
+++ b/plugins/stats_over_http/stats_over_http.c
@@ -34,7 +34,7 @@
 #include <inttypes.h>
 #include <getopt.h>
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define PLUGIN_NAME "stats_over_http"
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/plugins/tcpinfo/tcpinfo.cc
----------------------------------------------------------------------
diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc
index b1975cc..9e0c564 100644
--- a/plugins/tcpinfo/tcpinfo.cc
+++ b/plugins/tcpinfo/tcpinfo.cc
@@ -37,7 +37,7 @@
 #include <sys/time.h>
 #include <arpa/inet.h>
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #if defined(TCP_INFO) && defined(HAVE_STRUCT_TCP_INFO)
 #define TCPI_PLUGIN_SUPPORTED 1

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c8c5ba88/proxy/api/ts/ts.h
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index 882d10d..7ef9914 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -30,7 +30,7 @@
 #ifndef __TS_API_H__
 #define __TS_API_H__
 
-#include "apidefs.h"
+#include <ts/apidefs.h>
 
 #ifdef __cplusplus
 extern "C" {