----- Original Message ----- > TS-2172: cleanup and move mgmt/api/remote up > > for better automake style tidy up, we need to stop compiling the > files in other directoris, use .a and .la instead. > > > Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo > Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8197736c > Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8197736c > Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8197736c > > Branch: refs/heads/master > Commit: 8197736cf7338df555d4043b3d890b99272e0689 > Parents: 5fa4f0b > Author: Zhao Yongming <ming....@gmail.com> > Authored: Sun Nov 3 18:04:44 2013 +0800 > Committer: Zhao Yongming <ming....@gmail.com> > Committed: Thu Nov 7 10:27:44 2013 +0800 > > ---------------------------------------------------------------------- > configure.ac | 1 - > cop/Makefile.am | 6 +- > iocore/aio/Makefile.am | 4 +- > iocore/eventsystem/Makefile.am | 5 +- > lib/records/Makefile.am | 8 +- > mgmt/Makefile.am | 7 +- > mgmt/api/APITestCliRemote.cc | 2458 ++++++++++++++++++++++++++++ > mgmt/api/CoreAPIRemote.cc | 843 ++++++++++ > mgmt/api/EventRegistration.cc | 166 ++ > mgmt/api/EventRegistration.h | 49 + > mgmt/api/Makefile.am | 51 +- > mgmt/api/NetworkUtilsRemote.cc | 1772 ++++++++++++++++++++ > mgmt/api/NetworkUtilsRemote.h | 109 ++ > mgmt/api/remote/APITestCliRemote.cc | 2458 ---------------------------- > mgmt/api/remote/CoreAPIRemote.cc | 843 ---------- > mgmt/api/remote/EventRegistration.cc | 166 -- > mgmt/api/remote/EventRegistration.h | 49 - > mgmt/api/remote/Makefile.am | 59 - > mgmt/api/remote/NetworkUtilsRemote.cc | 1772 -------------------- > mgmt/api/remote/NetworkUtilsRemote.h | 109 -- > mgmt/cli/Makefile.am | 4 +- > proxy/Makefile.am | 11 +- > tools/Makefile.am | 2 +- > 23 files changed, 5468 insertions(+), 5484 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8197736c/configure.ac > ---------------------------------------------------------------------- > diff --git a/configure.ac b/configure.ac > index 2db3199..6a05629 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1886,7 +1886,6 @@ AC_CONFIG_FILES([ > mgmt/Makefile > mgmt/api/Makefile > mgmt/api/include/Makefile > - mgmt/api/remote/Makefile > mgmt/cli/Makefile > mgmt/cluster/Makefile > mgmt/preparse/Makefile > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8197736c/cop/Makefile.am > ---------------------------------------------------------------------- > diff --git a/cop/Makefile.am b/cop/Makefile.am > index cd03094..f97416b 100644 > --- a/cop/Makefile.am > +++ b/cop/Makefile.am > @@ -31,12 +31,10 @@ DEFS += $(MGMT_DEFS) > bin_PROGRAMS = traffic_cop > > traffic_cop_SOURCES = \ > - ../lib/records/RecConfigParse.cc \ > - ../lib/records/RecFile.cc \ > - ../lib/records/RecDebug.cc \ > TrafficCop.cc > traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ > traffic_cop_LDADD = \ > - $(top_builddir)/mgmt/api/remote/libtsmgmt.la \ > + $(top_builddir)/mgmt/api/libtsmgmt.la \ > $(top_builddir)/lib/ts/libtsutil.la \ > + $(top_builddir)/lib/records/librec4cop.a \
This is a rather unusual name choice. > @LIBRESOLV@ @LIBSSL@ > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8197736c/iocore/aio/Makefile.am > ---------------------------------------------------------------------- > diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am > index 4090184..6a5ed16 100644 > --- a/iocore/aio/Makefile.am > +++ b/iocore/aio/Makefile.am > @@ -30,8 +30,7 @@ check_PROGRAMS = test_AIO > > libinkaio_a_SOURCES = AIO.cc I_AIO.h P_AIO.h Inline.cc > test_AIO_SOURCES = \ > - test_AIO.cc \ > - ../../proxy/UglyLogStubs.cc > + test_AIO.cc > > test_AIO_CXXFLAGS = \ > $(iocore_include_dirs) \ > @@ -52,5 +51,6 @@ test_AIO_LDADD = \ > $(top_builddir)/mgmt/utils/libutils_p.a \ > $(top_builddir)/iocore/eventsystem/libinkevent.a \ > $(top_builddir)/lib/ts/libtsutil.la \ > + $(top_builddir)/libUglyLogStubs.a \ > @LIBTCL@ > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8197736c/iocore/eventsystem/Makefile.am > ---------------------------------------------------------------------- > diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am > index fcadc9a..be5f063 100644 > --- a/iocore/eventsystem/Makefile.am > +++ b/iocore/eventsystem/Makefile.am > @@ -91,10 +91,11 @@ test_LDADD = \ > $(top_builddir)/mgmt/utils/libutils_p.a \ > $(top_builddir)/iocore/eventsystem/libinkevent.a \ > $(top_builddir)/lib/ts/libtsutil.la \ > + $(top_builddir)/proxy/libUglyLogStubs.a \ > @LIBTCL@ > > -test_Buffer_SOURCES = ../../proxy/UglyLogStubs.cc test_Buffer.cc > -test_Event_SOURCES = ../../proxy/UglyLogStubs.cc test_Event.cc > +test_Buffer_SOURCES = test_Buffer.cc > +test_Event_SOURCES = test_Event.cc > test_Buffer_CXXFLAGS = $(test_CXXFLAGS) > test_Event_CXXFLAGS = $(test_CXXFLAGS) > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8197736c/lib/records/Makefile.am > ---------------------------------------------------------------------- > diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am > index 6e96118..599ec6c 100644 > --- a/lib/records/Makefile.am > +++ b/lib/records/Makefile.am > @@ -29,7 +29,7 @@ AM_CPPFLAGS = \ > -I$(top_srcdir)/lib \ > -I$(top_srcdir)/lib/ts > > -noinst_LIBRARIES = libreclocal.a librecprocess.a > +noinst_LIBRARIES = libreclocal.a librecprocess.a librec4cop.a > > libreclocal_a_CXXFLAGS = $(ink_with_modules_local) > libreclocal_a_SOURCES = \ > @@ -91,3 +91,9 @@ librecprocess_a_SOURCES = \ > RecDebug.cc \ > RecConfigParse.cc > > + > +librec4cop_a_CXXFLAGS = $(ink_with_modules_process) > +librec4cop_a_SOURCES = \ > + RecConfigParse.cc \ > + RecFile.cc \ > + RecDebug.cc > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8197736c/mgmt/Makefile.am > ---------------------------------------------------------------------- > diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am > index 45309a2..f657d17 100644 > --- a/mgmt/Makefile.am > +++ b/mgmt/Makefile.am > @@ -69,8 +69,6 @@ libmgmt_p_a_SOURCES = \ > RecordsConfig.h > > traffic_manager_SOURCES = \ > - ../proxy/Error.cc \ > - ../proxy/DiagsConfig.cc \ > AddConfigFilesHere.cc \ > Alarms.cc \ > Alarms.h \ > @@ -96,11 +94,14 @@ traffic_manager_LDADD = \ > stats/libstats.a \ > web2/libweb.a \ > api/libmgmtapilocal.a \ > + api/libtsmgmtshare.la \ > utils/libutils_lm.a \ > $(top_builddir)/proxy/hdrs/libhdrs.a \ > $(top_builddir)/lib/records/libreclocal.a \ > $(top_builddir)/lib/ts/libtsutil.la \ > - $(top_builddir)/iocore/eventsystem/libinkevent.a \ > + $(top_builddir)/iocore/eventsystem/libinkevent.a \ > + $(top_builddir)/proxy/liberror.a \ > + $(top_builddir)/proxy/libdiagsconfig.a \ > @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ \ > -lm > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8197736c/mgmt/api/APITestCliRemote.cc > ---------------------------------------------------------------------- > diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc > new file mode 100644 > index 0000000..57f6ebc > --- /dev/null > +++ b/mgmt/api/APITestCliRemote.cc > @@ -0,0 +1,2458 @@ > +/** @file > + > + A brief file description > + > + @section license License > + > + 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. > + */ > + > +/***************************************************************************** > + * Filename: APITestCliRemote.cc > + * Purpose: An interactive cli to test remote mgmt API; UNIT TEST for > mgmtAPI > + * Created: lant Who or what is lant? There is *no* word about this in the commit message. It would be EXTREMELY helpful to add a note, or a separate commit that says, HEY I'M ADDING a test framework the size of a Shakespeare's longest plays. Contrast and compare: igalic@levix ~/src/asf/trafficserver (git)-[master] % git show 8197736cf7338df555d4043b3d890b99272e0689 | wc 11203 45061 342863 with http://www.shicho.net/38/stats/38wordcount.php [snip] All the stuff I didn't read. ++ i Igor Galić Tel: +43 (0) 664 886 22 883 Mail: i.ga...@brainsware.org URL: http://brainsware.org/ GPG: 8716 7A9F 989B ABD5 100F 4008 F266 55D6 2998 1641
