Updated Branches: refs/heads/master 7b2ea5f89 -> 6958d0564
Fixing license and updating notice Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6958d056 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6958d056 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6958d056 Branch: refs/heads/master Commit: 6958d056469698a4850d7019259912bec6eb23cb Parents: 7b2ea5f Author: Brian Geffon <[email protected]> Authored: Fri Oct 18 14:54:08 2013 -0700 Committer: Brian Geffon <[email protected]> Committed: Fri Oct 18 14:54:08 2013 -0700 ---------------------------------------------------------------------- NOTICE | 5 ++ configure.ac | 58 ++++++++++++++++---- lib/Makefile.am | 6 +- .../NullTransformationPlugin.cc | 26 +++++---- 4 files changed, 72 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6958d056/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 849f001..b486b5e 100644 --- a/NOTICE +++ b/NOTICE @@ -38,3 +38,8 @@ Copyright (C) 2012 Oregon Health & Science University healthcheck Plugin developed by GoDaddy. Copyright (C) 2012 GoDaddy. + +~~~ + +lib/atscppapi developed by LinkedIn +Copyright (c) 2013 LinkedIn \ No newline at end of file http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6958d056/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 8023755..bb2f373 100644 --- a/configure.ac +++ b/configure.ac @@ -480,6 +480,19 @@ AC_ARG_ENABLE([experimental-plugins], AC_MSG_RESULT([$enable_experimental_plugins]) AM_CONDITIONAL([BUILD_EXPERIMENTAL_PLUGINS], [ test "x${enable_experimental_plugins}" = "xyes" ]) + +# +# build c++ api +# +AC_MSG_CHECKING([whether to build c++ api]) +AC_ARG_ENABLE([cppapi], + [AS_HELP_STRING([--enable-cppapi],[Build the c++ api])], + [], + [enable_cppapi="no"] +) +AC_MSG_RESULT([$enable_cppapi]) +AM_CONDITIONAL([ENABLE_CPPAPI], [ test "x${enable_cppapi}" = "xyes" ]) + # # Installation directories # For each var the following is evaluated @@ -996,15 +1009,17 @@ AC_MSG_NOTICE([Build for host OS: $host_os, arch: $host_cpu, optimization: $host # # CPP 11 API -# -AC_MSG_CHECKING([whether to enable c++11 api]) -AC_ARG_WITH([cpp11api], - [AS_HELP_STRING([--with-cpp11api],[enable support for cpp11api [default=auto]])], - [cpp11api=$withval], - [cpp11api=$enable_cxx_11_support] -) -AC_MSG_RESULT([$cpp11api]) -AM_CONDITIONAL([BUILD_CPP11API], [test "$cpp11api" = yes]) +# TODO: briang, this needs to be translated to a define +# that can be used in the c++ api to enable c++11 api features. +# +#AC_MSG_CHECKING([whether to enable c++11 api]) +#AC_ARG_WITH([cpp11api], +# [AS_HELP_STRING([--with-cpp11api],[enable support for cpp11api [default=auto]])], +# [cpp11api=$withval], +# [cpp11api=$enable_cxx_11_support] +#) +#AC_MSG_RESULT([$cpp11api]) +#AM_CONDITIONAL([BUILD_CPP11API], [test "$cpp11api" = yes]) # Check for ccache (if explicitly enabled) if test "x$enable_ccache" = "xyes"; then @@ -1825,11 +1840,34 @@ AC_CONFIG_FILES([ iocore/net/Makefile iocore/utils/Makefile lib/Makefile - lib/cpp11api/Makefile lib/records/Makefile lib/ts/Makefile lib/ts/ink_config.h lib/tsconfig/Makefile + lib/atscppapi/Makefile + lib/atscppapi/src/Makefile + lib/atscppapi/examples/Makefile + lib/atscppapi/examples/helloworld/Makefile + lib/atscppapi/examples/globalhook/Makefile + lib/atscppapi/examples/transactionhook/Makefile + lib/atscppapi/examples/multiple_transaction_hooks/Makefile + lib/atscppapi/examples/clientrequest/Makefile + lib/atscppapi/examples/data_caching/Makefile + lib/atscppapi/examples/serverresponse/Makefile + lib/atscppapi/examples/clientredirect/Makefile + lib/atscppapi/examples/customresponse/Makefile + lib/atscppapi/examples/null_transformation_plugin/Makefile + lib/atscppapi/examples/post_buffer/Makefile + lib/atscppapi/examples/logger_example/Makefile + lib/atscppapi/examples/detachedrequest/Makefile + lib/atscppapi/examples/stat_example/Makefile + lib/atscppapi/examples/async_http_fetch/Makefile + lib/atscppapi/examples/remap_plugin/Makefile + lib/atscppapi/examples/gzip_transformation/Makefile + lib/atscppapi/examples/timeout_example/Makefile + lib/atscppapi/examples/internal_transaction_handling/Makefile + lib/atscppapi/examples/async_timer/Makefile + lib/atscppapi/examples/request_cookies/Makefile lib/wccp/Makefile lib/perl/Makefile mgmt/Makefile http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6958d056/lib/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/Makefile.am b/lib/Makefile.am index 8be7aa8..9664374 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -27,6 +27,6 @@ if BUILD_WCCP SUBDIRS += tsconfig wccp endif -if BUILD_CPP11API -SUBDIRS += cpp11api -endif +if ENABLE_CPPAPI +SUBDIRS += atscppapi +endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6958d056/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc index b226290..c23971e 100644 --- a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc +++ b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc @@ -1,13 +1,19 @@ -/* - * Copyright (c) 2013 LinkedIn Corp. All rights reserved. - * Licensed 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. - * +/** + 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. */ #include <iostream>
