diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 65a41b04fe9..5eba4394e2a 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -38,6 +38,7 @@ add_subdirectory(remap_purge) add_subdirectory(remap_stats) add_subdirectory(s3_auth) add_subdirectory(server_push_preload) +add_subdirectory(slice) add_subdirectory(statichit) add_subdirectory(stats_over_http) add_subdirectory(tcpinfo) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 57013f8f8e0..421dd4589e0 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -57,6 +57,7 @@ include remap_purge/Makefile.inc include remap_stats/Makefile.inc include s3_auth/Makefile.inc include server_push_preload/Makefile.inc +include slice/Makefile.inc include statichit/Makefile.inc include stats_over_http/Makefile.inc include tcpinfo/Makefile.inc @@ -99,7 +100,6 @@ include experimental/money_trace/Makefile.inc include experimental/mp4/Makefile.inc include experimental/rate_limit/Makefile.inc include experimental/redo_cache_lookup/Makefile.inc -include experimental/slice/Makefile.inc include experimental/sslheaders/Makefile.inc include experimental/stream_editor/Makefile.inc include experimental/system_stats/Makefile.inc diff --git a/plugins/experimental/CMakeLists.txt b/plugins/experimental/CMakeLists.txt index 030238f891f..d25994d1a1d 100644 --- a/plugins/experimental/CMakeLists.txt +++ b/plugins/experimental/CMakeLists.txt @@ -34,7 +34,6 @@ add_subdirectory(money_trace) add_subdirectory(mp4) add_subdirectory(rate_limit) add_subdirectory(redo_cache_lookup) -add_subdirectory(slice) add_subdirectory(stek_share) add_subdirectory(stream_editor) add_subdirectory(system_stats) diff --git a/plugins/experimental/slice/Makefile.inc b/plugins/experimental/slice/Makefile.inc deleted file mode 100644 index 0bf4c1f0b6d..00000000000 --- a/plugins/experimental/slice/Makefile.inc +++ /dev/null @@ -1,72 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -pkglib_LTLIBRARIES += experimental/slice/slice.la - -experimental_slice_slice_la_SOURCES = \ - experimental/slice/client.cc \ - experimental/slice/client.h \ - experimental/slice/Config.cc \ - experimental/slice/Config.h \ - experimental/slice/ContentRange.cc \ - experimental/slice/ContentRange.h \ - experimental/slice/Data.h \ - experimental/slice/HttpHeader.cc \ - experimental/slice/HttpHeader.h \ - experimental/slice/intercept.cc \ - experimental/slice/intercept.h \ - experimental/slice/prefetch.cc \ - experimental/slice/prefetch.h \ - experimental/slice/Range.cc \ - experimental/slice/Range.h \ - experimental/slice/response.cc \ - experimental/slice/response.h \ - experimental/slice/server.cc \ - experimental/slice/server.h \ - experimental/slice/slice.cc \ - experimental/slice/slice.h \ - experimental/slice/Stage.h \ - experimental/slice/transfer.cc \ - experimental/slice/transfer.h \ - experimental/slice/util.cc \ - experimental/slice/util.h - -check_PROGRAMS += experimental/slice/test_content_range - -experimental_slice_test_content_range_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/lib/catch2 -DUNITTEST -experimental_slice_test_content_range_SOURCES = \ - experimental/slice/unit-tests/test_content_range.cc \ - experimental/slice/ContentRange.cc - -experimental_slice_test_content_range_LDADD = @LIBPCRE@ - -check_PROGRAMS += experimental/slice/test_range - -experimental_slice_test_range_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/lib/catch2 -DUNITTEST -experimental_slice_test_range_SOURCES = \ - experimental/slice/unit-tests/test_range.cc \ - experimental/slice/Range.cc - -experimental_slice_test_range_LDADD = @LIBPCRE@ - -check_PROGRAMS += experimental/slice/test_config - -experimental_slice_test_config_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/lib/catch2 -DUNITTEST -experimental_slice_test_config_SOURCES = \ - experimental/slice/unit-tests/test_config.cc \ - experimental/slice/Config.cc - -experimental_slice_test_config_LDADD = @LIBPCRE@ diff --git a/plugins/experimental/slice/CMakeLists.txt b/plugins/slice/CMakeLists.txt similarity index 100% rename from plugins/experimental/slice/CMakeLists.txt rename to plugins/slice/CMakeLists.txt diff --git a/plugins/experimental/slice/Config.cc b/plugins/slice/Config.cc similarity index 100% rename from plugins/experimental/slice/Config.cc rename to plugins/slice/Config.cc diff --git a/plugins/experimental/slice/Config.h b/plugins/slice/Config.h similarity index 100% rename from plugins/experimental/slice/Config.h rename to plugins/slice/Config.h diff --git a/plugins/experimental/slice/ContentRange.cc b/plugins/slice/ContentRange.cc similarity index 100% rename from plugins/experimental/slice/ContentRange.cc rename to plugins/slice/ContentRange.cc diff --git a/plugins/experimental/slice/ContentRange.h b/plugins/slice/ContentRange.h similarity index 100% rename from plugins/experimental/slice/ContentRange.h rename to plugins/slice/ContentRange.h diff --git a/plugins/experimental/slice/Data.h b/plugins/slice/Data.h similarity index 100% rename from plugins/experimental/slice/Data.h rename to plugins/slice/Data.h diff --git a/plugins/experimental/slice/HttpHeader.cc b/plugins/slice/HttpHeader.cc similarity index 100% rename from plugins/experimental/slice/HttpHeader.cc rename to plugins/slice/HttpHeader.cc diff --git a/plugins/experimental/slice/HttpHeader.h b/plugins/slice/HttpHeader.h similarity index 100% rename from plugins/experimental/slice/HttpHeader.h rename to plugins/slice/HttpHeader.h diff --git a/plugins/slice/Makefile.inc b/plugins/slice/Makefile.inc new file mode 100644 index 00000000000..9f2437acc97 --- /dev/null +++ b/plugins/slice/Makefile.inc @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +pkglib_LTLIBRARIES += slice/slice.la + +slice_slice_la_SOURCES = \ + slice/client.cc \ + slice/client.h \ + slice/Config.cc \ + slice/Config.h \ + slice/ContentRange.cc \ + slice/ContentRange.h \ + slice/Data.h \ + slice/HttpHeader.cc \ + slice/HttpHeader.h \ + slice/intercept.cc \ + slice/intercept.h \ + slice/prefetch.cc \ + slice/prefetch.h \ + slice/Range.cc \ + slice/Range.h \ + slice/response.cc \ + slice/response.h \ + slice/server.cc \ + slice/server.h \ + slice/slice.cc \ + slice/slice.h \ + slice/Stage.h \ + slice/transfer.cc \ + slice/transfer.h \ + slice/util.cc \ + slice/util.h + +check_PROGRAMS += slice/test_content_range + +slice_test_content_range_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/lib/catch2 -DUNITTEST +slice_test_content_range_SOURCES = \ + slice/unit-tests/test_content_range.cc \ + slice/ContentRange.cc + +slice_test_content_range_LDADD = @LIBPCRE@ + +check_PROGRAMS += slice/test_range + +slice_test_range_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/lib/catch2 -DUNITTEST +slice_test_range_SOURCES = \ + slice/unit-tests/test_range.cc \ + slice/Range.cc + +slice_test_range_LDADD = @LIBPCRE@ + +check_PROGRAMS += slice/test_config + +slice_test_config_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/lib/catch2 -DUNITTEST +slice_test_config_SOURCES = \ + slice/unit-tests/test_config.cc \ + slice/Config.cc + +slice_test_config_LDADD = @LIBPCRE@ diff --git a/plugins/experimental/slice/Makefile.tsxs b/plugins/slice/Makefile.tsxs similarity index 100% rename from plugins/experimental/slice/Makefile.tsxs rename to plugins/slice/Makefile.tsxs diff --git a/plugins/experimental/slice/README.md b/plugins/slice/README.md similarity index 100% rename from plugins/experimental/slice/README.md rename to plugins/slice/README.md diff --git a/plugins/experimental/slice/Range.cc b/plugins/slice/Range.cc similarity index 100% rename from plugins/experimental/slice/Range.cc rename to plugins/slice/Range.cc diff --git a/plugins/experimental/slice/Range.h b/plugins/slice/Range.h similarity index 100% rename from plugins/experimental/slice/Range.h rename to plugins/slice/Range.h diff --git a/plugins/experimental/slice/Stage.h b/plugins/slice/Stage.h similarity index 100% rename from plugins/experimental/slice/Stage.h rename to plugins/slice/Stage.h diff --git a/plugins/experimental/slice/client.cc b/plugins/slice/client.cc similarity index 100% rename from plugins/experimental/slice/client.cc rename to plugins/slice/client.cc diff --git a/plugins/experimental/slice/client.h b/plugins/slice/client.h similarity index 100% rename from plugins/experimental/slice/client.h rename to plugins/slice/client.h diff --git a/plugins/experimental/slice/intercept.cc b/plugins/slice/intercept.cc similarity index 100% rename from plugins/experimental/slice/intercept.cc rename to plugins/slice/intercept.cc diff --git a/plugins/experimental/slice/intercept.h b/plugins/slice/intercept.h similarity index 100% rename from plugins/experimental/slice/intercept.h rename to plugins/slice/intercept.h diff --git a/plugins/experimental/slice/prefetch.cc b/plugins/slice/prefetch.cc similarity index 100% rename from plugins/experimental/slice/prefetch.cc rename to plugins/slice/prefetch.cc diff --git a/plugins/experimental/slice/prefetch.h b/plugins/slice/prefetch.h similarity index 100% rename from plugins/experimental/slice/prefetch.h rename to plugins/slice/prefetch.h diff --git a/plugins/experimental/slice/response.cc b/plugins/slice/response.cc similarity index 100% rename from plugins/experimental/slice/response.cc rename to plugins/slice/response.cc diff --git a/plugins/experimental/slice/response.h b/plugins/slice/response.h similarity index 100% rename from plugins/experimental/slice/response.h rename to plugins/slice/response.h diff --git a/plugins/experimental/slice/server.cc b/plugins/slice/server.cc similarity index 100% rename from plugins/experimental/slice/server.cc rename to plugins/slice/server.cc diff --git a/plugins/experimental/slice/server.h b/plugins/slice/server.h similarity index 100% rename from plugins/experimental/slice/server.h rename to plugins/slice/server.h diff --git a/plugins/experimental/slice/slice.cc b/plugins/slice/slice.cc similarity index 100% rename from plugins/experimental/slice/slice.cc rename to plugins/slice/slice.cc diff --git a/plugins/experimental/slice/slice.h b/plugins/slice/slice.h similarity index 100% rename from plugins/experimental/slice/slice.h rename to plugins/slice/slice.h diff --git a/plugins/experimental/slice/slice_test.cc b/plugins/slice/slice_test.cc similarity index 100% rename from plugins/experimental/slice/slice_test.cc rename to plugins/slice/slice_test.cc diff --git a/plugins/experimental/slice/transfer.cc b/plugins/slice/transfer.cc similarity index 100% rename from plugins/experimental/slice/transfer.cc rename to plugins/slice/transfer.cc diff --git a/plugins/experimental/slice/transfer.h b/plugins/slice/transfer.h similarity index 100% rename from plugins/experimental/slice/transfer.h rename to plugins/slice/transfer.h diff --git a/plugins/experimental/slice/unit-tests/CMakeLists.txt b/plugins/slice/unit-tests/CMakeLists.txt similarity index 100% rename from plugins/experimental/slice/unit-tests/CMakeLists.txt rename to plugins/slice/unit-tests/CMakeLists.txt diff --git a/plugins/experimental/slice/unit-tests/slice_test.cc b/plugins/slice/unit-tests/slice_test.cc similarity index 100% rename from plugins/experimental/slice/unit-tests/slice_test.cc rename to plugins/slice/unit-tests/slice_test.cc diff --git a/plugins/experimental/slice/unit-tests/test_config.cc b/plugins/slice/unit-tests/test_config.cc similarity index 100% rename from plugins/experimental/slice/unit-tests/test_config.cc rename to plugins/slice/unit-tests/test_config.cc diff --git a/plugins/experimental/slice/unit-tests/test_content_range.cc b/plugins/slice/unit-tests/test_content_range.cc similarity index 100% rename from plugins/experimental/slice/unit-tests/test_content_range.cc rename to plugins/slice/unit-tests/test_content_range.cc diff --git a/plugins/experimental/slice/unit-tests/test_range.cc b/plugins/slice/unit-tests/test_range.cc similarity index 100% rename from plugins/experimental/slice/unit-tests/test_range.cc rename to plugins/slice/unit-tests/test_range.cc diff --git a/plugins/experimental/slice/util.cc b/plugins/slice/util.cc similarity index 100% rename from plugins/experimental/slice/util.cc rename to plugins/slice/util.cc diff --git a/plugins/experimental/slice/util.h b/plugins/slice/util.h similarity index 100% rename from plugins/experimental/slice/util.h rename to plugins/slice/util.h