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 2012/03/01 17:53:34 UTC
git commit: TS-1024 Move regex_remap,
header_filter and stats_over_http to the main repo
Updated Branches:
refs/heads/master a5044fcc5 -> 1f38e9e3a
TS-1024 Move regex_remap, header_filter and stats_over_http to the main repo
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1f38e9e3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1f38e9e3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1f38e9e3
Branch: refs/heads/master
Commit: 1f38e9e3a0b298f2c72a570fd1232c9adb2992d5
Parents: a5044fc
Author: Leif Hedstrom <le...@ogre.com>
Authored: Thu Mar 1 09:53:12 2012 -0700
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Thu Mar 1 09:53:12 2012 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
configure.ac | 3 +++
plugins/Makefile.am | 2 +-
plugins/header_filter/Makefile.am | 22 ++++++++++++++++++++++
plugins/regex_remap/Makefile.am | 22 ++++++++++++++++++++++
plugins/stats_over_http/Makefile.am | 22 ++++++++++++++++++++++
6 files changed, 73 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f38e9e3/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8ed2f0a..fe00f19 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.3
+ *) [TS-1124] Move regex_remap, header_filter and stats_over_http from
+ the plugin repo to the main repo.
+
*) [TS-1111] fix crash in RangeTransform::handle_event
*) [TS-1109] fix stack dump crashing
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f38e9e3/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 45a7a60..3d74c63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1409,6 +1409,9 @@ AC_CONFIG_FILES([cop/Makefile])
# production plugins
AC_CONFIG_FILES([plugins/Makefile])
AC_CONFIG_FILES([plugins/conf_remap/Makefile])
+AC_CONFIG_FILES([plugins/regex_remap/Makefile])
+AC_CONFIG_FILES([plugins/header_filter/Makefile])
+AC_CONFIG_FILES([plugins/stats_over_http/Makefile])
# various tools
AC_CONFIG_FILES([tools/Makefile])
# example plugins
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f38e9e3/plugins/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 59e1923..14d0bf9 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = conf_remap
+SUBDIRS = conf_remap regex_remap header_filter stats_over_http
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f38e9e3/plugins/header_filter/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/header_filter/Makefile.am b/plugins/header_filter/Makefile.am
new file mode 100644
index 0000000..cbaa81c
--- /dev/null
+++ b/plugins/header_filter/Makefile.am
@@ -0,0 +1,22 @@
+# 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.
+
+CXXFLAGS+=-I$(top_srcdir)/proxy/api
+
+pkglibdir = ${pkglibexecdir}
+pkglib_LTLIBRARIES = header_filter.la
+header_filter_la_SOURCES = header_filter.cc rules.cc
+header_filter_la_LDFLAGS = -module -avoid-version -shared
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f38e9e3/plugins/regex_remap/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/regex_remap/Makefile.am b/plugins/regex_remap/Makefile.am
new file mode 100644
index 0000000..e016d1d
--- /dev/null
+++ b/plugins/regex_remap/Makefile.am
@@ -0,0 +1,22 @@
+# 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.
+
+CXXFLAGS+=-I$(top_srcdir)/proxy/api
+
+pkglibdir = ${pkglibexecdir}
+pkglib_LTLIBRARIES = regex_remap.la
+regex_remap_la_SOURCES = regex_remap.cc
+regex_remap_la_LDFLAGS = -module -avoid-version -shared
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1f38e9e3/plugins/stats_over_http/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/stats_over_http/Makefile.am b/plugins/stats_over_http/Makefile.am
new file mode 100644
index 0000000..972d7c3
--- /dev/null
+++ b/plugins/stats_over_http/Makefile.am
@@ -0,0 +1,22 @@
+# 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.
+
+CFLAGS+=-I$(top_srcdir)/proxy/api
+
+pkglibdir = ${pkglibexecdir}
+pkglib_LTLIBRARIES = stats_over_http.la
+stats_over_http_la_SOURCES = stats_over_http.c
+stats_over_http_la_LDFLAGS = -module -avoid-version -shared