From 1f3c65fca12ba8b6bf0a08e5aa9dd5c59a153e08 Mon Sep 17 00:00:00 2001 From: Alex Rousskov Date: Thu, 19 Feb 2009 15:35:50 -0700 Subject: [PATCH] Moved src/ICAP into src/adaptation/icap. Moved src/eCAP into src/adaptation/ecap. As a side effect, eCAP now tests its headers. MessageRep.h needed to include config.h to pass the tests, which probably indicates a bug in some other header (possibly enums.h). ICAP source file names still need to be changed. --- configure.in | 8 ++-- src/ICAP/Makefile.am | 44 ------------------- src/Makefile.am | 10 +---- src/adaptation/Makefile.am | 14 ++++++ src/{eCAP => adaptation/ecap}/Config.cc | 6 +-- src/{eCAP => adaptation/ecap}/Config.h | 0 src/{eCAP => adaptation/ecap}/Host.cc | 4 +- src/{eCAP => adaptation/ecap}/Host.h | 0 src/adaptation/ecap/Makefile.am | 18 ++++++++ src/{eCAP => adaptation/ecap}/MessageRep.cc | 7 ++- src/{eCAP => adaptation/ecap}/MessageRep.h | 8 ++++ .../ecap}/MinimalAdapter.cc | 0 src/{eCAP => adaptation/ecap}/Registry.h | 0 src/{eCAP => adaptation/ecap}/ServiceRep.cc | 4 +- src/{eCAP => adaptation/ecap}/ServiceRep.h | 0 src/{eCAP => adaptation/ecap}/XactionRep.cc | 2 +- src/{eCAP => adaptation/ecap}/XactionRep.h | 2 +- src/{ICAP => adaptation/icap}/ICAPClient.cc | 2 +- src/{ICAP => adaptation/icap}/ICAPClient.h | 0 src/{ICAP => adaptation/icap}/ICAPConfig.cc | 4 +- src/{ICAP => adaptation/icap}/ICAPConfig.h | 2 +- src/{ICAP => adaptation/icap}/ICAPElements.cc | 2 +- src/{ICAP => adaptation/icap}/ICAPElements.h | 0 src/{ICAP => adaptation/icap}/ICAPInOut.h | 0 src/{ICAP => adaptation/icap}/ICAPLauncher.cc | 6 +-- src/{ICAP => adaptation/icap}/ICAPLauncher.h | 2 +- src/{ICAP => adaptation/icap}/ICAPModXact.cc | 10 ++--- src/{ICAP => adaptation/icap}/ICAPModXact.h | 6 +-- src/{ICAP => adaptation/icap}/ICAPOptXact.cc | 4 +- src/{ICAP => adaptation/icap}/ICAPOptXact.h | 4 +- src/{ICAP => adaptation/icap}/ICAPOptions.cc | 4 +- src/{ICAP => adaptation/icap}/ICAPOptions.h | 2 +- .../icap}/ICAPServiceRep.cc | 10 ++--- .../icap}/ICAPServiceRep.h | 2 +- src/{ICAP => adaptation/icap}/ICAPXaction.cc | 4 +- src/{ICAP => adaptation/icap}/ICAPXaction.h | 2 +- src/adaptation/icap/Makefile.am | 25 +++++++++++ src/cache_cf.cc | 4 +- src/eCAP/Makefile.am | 30 ------------- src/main.cc | 4 +- 40 files changed, 119 insertions(+), 137 deletions(-) delete mode 100644 src/ICAP/Makefile.am rename src/{eCAP => adaptation/ecap}/Config.cc (82%) rename src/{eCAP => adaptation/ecap}/Config.h (100%) rename src/{eCAP => adaptation/ecap}/Host.cc (97%) rename src/{eCAP => adaptation/ecap}/Host.h (100%) create mode 100644 src/adaptation/ecap/Makefile.am rename src/{eCAP => adaptation/ecap}/MessageRep.cc (98%) rename src/{eCAP => adaptation/ecap}/MessageRep.h (96%) rename src/{eCAP => adaptation/ecap}/MinimalAdapter.cc (100%) rename src/{eCAP => adaptation/ecap}/Registry.h (100%) rename src/{eCAP => adaptation/ecap}/ServiceRep.cc (95%) rename src/{eCAP => adaptation/ecap}/ServiceRep.h (100%) rename src/{eCAP => adaptation/ecap}/XactionRep.cc (99%) rename src/{eCAP => adaptation/ecap}/XactionRep.h (98%) rename src/{ICAP => adaptation/icap}/ICAPClient.cc (75%) rename src/{ICAP => adaptation/icap}/ICAPClient.h (100%) rename src/{ICAP => adaptation/icap}/ICAPConfig.cc (96%) rename src/{ICAP => adaptation/icap}/ICAPConfig.h (98%) rename src/{ICAP => adaptation/icap}/ICAPElements.cc (52%) rename src/{ICAP => adaptation/icap}/ICAPElements.h (100%) rename src/{ICAP => adaptation/icap}/ICAPInOut.h (100%) rename src/{ICAP => adaptation/icap}/ICAPLauncher.cc (94%) rename src/{ICAP => adaptation/icap}/ICAPLauncher.h (98%) rename src/{ICAP => adaptation/icap}/ICAPModXact.cc (99%) rename src/{ICAP => adaptation/icap}/ICAPModXact.h (98%) rename src/{ICAP => adaptation/icap}/ICAPOptXact.cc (96%) rename src/{ICAP => adaptation/icap}/ICAPOptXact.h (96%) rename src/{ICAP => adaptation/icap}/ICAPOptions.cc (98%) rename src/{ICAP => adaptation/icap}/ICAPOptions.h (98%) rename src/{ICAP => adaptation/icap}/ICAPServiceRep.cc (98%) rename src/{ICAP => adaptation/icap}/ICAPServiceRep.h (99%) rename src/{ICAP => adaptation/icap}/ICAPXaction.cc (99%) rename src/{ICAP => adaptation/icap}/ICAPXaction.h (99%) create mode 100644 src/adaptation/icap/Makefile.am delete mode 100644 src/eCAP/Makefile.am diff --git a/configure.in b/configure.in index ff81f6af82..4932f3139b 100644 --- a/configure.in +++ b/configure.in @@ -813,7 +813,7 @@ AC_ARG_ENABLE(icap-client, if test "$use_icap_client" = "yes" ; then AC_DEFINE(ICAP_CLIENT,1,[Enable ICAP client features in Squid]) AM_CONDITIONAL(USE_ICAP_CLIENT, true) - ICAP_LIBS="ICAP/libicap.la" + ICAP_LIBS="icap/libicap.la" use_adaptation=yes else AC_DEFINE(ICAP_CLIENT,0,[Enable ICAP client features in Squid]) @@ -860,7 +860,7 @@ AM_CONDITIONAL(USE_ECAP, test $use_ecap = yes) if test $use_ecap = yes; then AC_DEFINE(USE_ECAP,1,[Enable eCAP support]) - ECAP_LIBS="eCAP/libeCAP.la $ECAP_LIBS" + ECAP_LIBS="ecap/libecap.la $ECAP_LIBS" use_adaptation=yes else AC_DEFINE(USE_ECAP,0,[Disable eCAP support]) @@ -3800,10 +3800,10 @@ AC_CONFIG_FILES([\ src/repl/Makefile \ src/auth/Makefile \ src/adaptation/Makefile \ - src/ICAP/Makefile \ + src/adaptation/icap/Makefile \ + src/adaptation/ecap/Makefile \ src/icmp/Makefile \ src/ip/Makefile \ - src/eCAP/Makefile \ contrib/Makefile \ snmplib/Makefile \ icons/Makefile \ diff --git a/src/ICAP/Makefile.am b/src/ICAP/Makefile.am deleted file mode 100644 index d9b716308e..0000000000 --- a/src/ICAP/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -AM_CFLAGS = @SQUID_CFLAGS@ -AM_CXXFLAGS = @SQUID_CXXFLAGS@ -CLEANFILES = - -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src - -noinst_LTLIBRARIES = libicap.la - -libicap_la_SOURCES = \ - ICAPClient.cc \ - ICAPClient.h \ - ICAPInOut.h \ - ICAPConfig.cc \ - ICAPConfig.h \ - ICAPElements.cc \ - ICAPElements.h \ - ICAPOptions.cc \ - ICAPOptions.h \ - ICAPServiceRep.cc \ - ICAPServiceRep.h \ - ICAPLauncher.cc \ - ICAPLauncher.h \ - ICAPOptXact.cc \ - ICAPOptXact.h \ - ICAPXaction.cc \ - ICAPXaction.h \ - ICAPModXact.cc \ - ICAPModXact.h - - -check_PROGRAMS = testHeaders - -## test .h correctness -testHeaders: $(top_srcdir)/src/ICAP/*.h - $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1 - -## No such file... -testHeaders.c: - touch testHeaders.c -CLEANFILES += testHeaders.c diff --git a/src/Makefile.am b/src/Makefile.am index 73c16fff82..b617558460 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,15 +38,7 @@ if USE_ADAPTATION SUBDIRS += adaptation endif -if USE_ICAP_CLIENT -SUBDIRS += ICAP -endif - -if USE_ECAP -SUBDIRS += eCAP -endif - -ADAPTATION_LIBS = @ECAP_LIBS@ @ICAP_LIBS@ @ADAPTATION_LIBS@ +ADAPTATION_LIBS = @ADAPTATION_LIBS@ DELAY_POOL_ALL_SOURCE = \ CommonPool.h \ diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am index c0cf4fd55f..0942fd25fc 100644 --- a/src/adaptation/Makefile.am +++ b/src/adaptation/Makefile.am @@ -1,8 +1,20 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am +## make a list of directories for configured adaptation schemes +SUBDIRS = + +if USE_ICAP_CLIENT +SUBDIRS += icap +endif + +if USE_ECAP +SUBDIRS += ecap +endif + noinst_LTLIBRARIES = libadaptation.la +## start with the code shared among all adaptation schemes libadaptation_la_SOURCES = \ AccessCheck.cc \ AccessCheck.h \ @@ -26,4 +38,6 @@ libadaptation_la_SOURCES = \ ServiceGroups.cc \ ServiceGroups.h +# add libraries for specific adaptation schemes +libadaptation_la_LIBADD = @ECAP_LIBS@ @ICAP_LIBS@ diff --git a/src/eCAP/Config.cc b/src/adaptation/ecap/Config.cc similarity index 82% rename from src/eCAP/Config.cc rename to src/adaptation/ecap/Config.cc index b8d3263ef1..3a3b546d4f 100644 --- a/src/eCAP/Config.cc +++ b/src/adaptation/ecap/Config.cc @@ -6,9 +6,9 @@ #include "squid.h" #include -#include "eCAP/Host.h" -#include "eCAP/ServiceRep.h" -#include "eCAP/Config.h" +#include "adaptation/ecap/Host.h" +#include "adaptation/ecap/ServiceRep.h" +#include "adaptation/ecap/Config.h" Ecap::Config Ecap::TheConfig; diff --git a/src/eCAP/Config.h b/src/adaptation/ecap/Config.h similarity index 100% rename from src/eCAP/Config.h rename to src/adaptation/ecap/Config.h diff --git a/src/eCAP/Host.cc b/src/adaptation/ecap/Host.cc similarity index 97% rename from src/eCAP/Host.cc rename to src/adaptation/ecap/Host.cc index 9fae209313..d8dd17df66 100644 --- a/src/eCAP/Host.cc +++ b/src/adaptation/ecap/Host.cc @@ -2,8 +2,8 @@ #include #include #include "TextException.h" -#include "eCAP/ServiceRep.h" -#include "eCAP/Host.h" +#include "adaptation/ecap/ServiceRep.h" +#include "adaptation/ecap/Host.h" const libecap::Name Ecap::protocolInternal("internal", libecap::Name::NextId()); const libecap::Name Ecap::protocolCacheObj("cache_object", libecap::Name::NextId()); diff --git a/src/eCAP/Host.h b/src/adaptation/ecap/Host.h similarity index 100% rename from src/eCAP/Host.h rename to src/adaptation/ecap/Host.h diff --git a/src/adaptation/ecap/Makefile.am b/src/adaptation/ecap/Makefile.am new file mode 100644 index 0000000000..3e80f80ac9 --- /dev/null +++ b/src/adaptation/ecap/Makefile.am @@ -0,0 +1,18 @@ +include $(top_srcdir)/src/Common.am +include $(top_srcdir)/src/TestHeaders.am + +noinst_LTLIBRARIES = libecap.la + +libecap_la_SOURCES = \ + Config.h \ + Config.cc \ + Host.h \ + Host.cc \ + MessageRep.h \ + MessageRep.cc \ + ServiceRep.h \ + ServiceRep.cc \ + XactionRep.h \ + XactionRep.cc \ + \ + Registry.h diff --git a/src/eCAP/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc similarity index 98% rename from src/eCAP/MessageRep.cc rename to src/adaptation/ecap/MessageRep.cc index f3b8b298ec..8560ab4a97 100644 --- a/src/eCAP/MessageRep.cc +++ b/src/adaptation/ecap/MessageRep.cc @@ -7,13 +7,12 @@ #include "HttpReply.h" #include "BodyPipe.h" #include "TextException.h" -#include "adaptation/Message.h" #include #include #include -#include "eCAP/MessageRep.h" -#include "eCAP/XactionRep.h" -#include "eCAP/Host.h" /* for protocol constants */ +#include "adaptation/ecap/MessageRep.h" +#include "adaptation/ecap/XactionRep.h" +#include "adaptation/ecap/Host.h" /* for protocol constants */ /* HeaderRep */ diff --git a/src/eCAP/MessageRep.h b/src/adaptation/ecap/MessageRep.h similarity index 96% rename from src/eCAP/MessageRep.h rename to src/adaptation/ecap/MessageRep.h index 2fae383079..adf62b9248 100644 --- a/src/eCAP/MessageRep.h +++ b/src/adaptation/ecap/MessageRep.h @@ -6,11 +6,19 @@ #ifndef SQUID__ECAP__MESSAGE_REP_H #define SQUID__ECAP__MESSAGE_REP_H +#include "config.h" +#include "HttpHeader.h" +#include "BodyPipe.h" #include "adaptation/forward.h" +#include "adaptation/Message.h" #include #include #include +class HttpMsg; +class HttpRequest; +class HttpReply; + namespace Ecap { diff --git a/src/eCAP/MinimalAdapter.cc b/src/adaptation/ecap/MinimalAdapter.cc similarity index 100% rename from src/eCAP/MinimalAdapter.cc rename to src/adaptation/ecap/MinimalAdapter.cc diff --git a/src/eCAP/Registry.h b/src/adaptation/ecap/Registry.h similarity index 100% rename from src/eCAP/Registry.h rename to src/adaptation/ecap/Registry.h diff --git a/src/eCAP/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc similarity index 95% rename from src/eCAP/ServiceRep.cc rename to src/adaptation/ecap/ServiceRep.cc index 5440e0008b..0fc16637a9 100644 --- a/src/eCAP/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -1,8 +1,8 @@ #include "squid.h" #include #include "TextException.h" -#include "eCAP/ServiceRep.h" -#include "eCAP/XactionRep.h" +#include "adaptation/ecap/ServiceRep.h" +#include "adaptation/ecap/XactionRep.h" Ecap::ServiceRep::ServiceRep(const Adaptation::ServiceConfig &cfg): /*AsyncJob("Ecap::ServiceRep"),*/ Adaptation::Service(cfg) diff --git a/src/eCAP/ServiceRep.h b/src/adaptation/ecap/ServiceRep.h similarity index 100% rename from src/eCAP/ServiceRep.h rename to src/adaptation/ecap/ServiceRep.h diff --git a/src/eCAP/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc similarity index 99% rename from src/eCAP/XactionRep.cc rename to src/adaptation/ecap/XactionRep.cc index e1eb8216b9..cb8eeb6b7b 100644 --- a/src/eCAP/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -5,7 +5,7 @@ #include "TextException.h" #include "HttpRequest.h" #include "HttpReply.h" -#include "eCAP/XactionRep.h" +#include "adaptation/ecap/XactionRep.h" // CBDATA_CLASS_INIT(Ecap::XactionRep); // TODO: add CBDATA_NAMESPACED_CLASS_INIT(namespace, classname) diff --git a/src/eCAP/XactionRep.h b/src/adaptation/ecap/XactionRep.h similarity index 98% rename from src/eCAP/XactionRep.h rename to src/adaptation/ecap/XactionRep.h index 3098ba1a5d..1a749cd9e5 100644 --- a/src/eCAP/XactionRep.h +++ b/src/adaptation/ecap/XactionRep.h @@ -10,7 +10,7 @@ #include "adaptation/Initiate.h" #include "adaptation/Service.h" #include "adaptation/Message.h" -#include "eCAP/MessageRep.h" +#include "adaptation/ecap/MessageRep.h" #include #include #include diff --git a/src/ICAP/ICAPClient.cc b/src/adaptation/icap/ICAPClient.cc similarity index 75% rename from src/ICAP/ICAPClient.cc rename to src/adaptation/icap/ICAPClient.cc index df2fd4966a..020265ecbb 100644 --- a/src/ICAP/ICAPClient.cc +++ b/src/adaptation/icap/ICAPClient.cc @@ -1,5 +1,5 @@ #include "squid.h" -#include "ICAPClient.h" +#include "adaptation/icap/ICAPClient.h" void ICAPInitModule() { diff --git a/src/ICAP/ICAPClient.h b/src/adaptation/icap/ICAPClient.h similarity index 100% rename from src/ICAP/ICAPClient.h rename to src/adaptation/icap/ICAPClient.h diff --git a/src/ICAP/ICAPConfig.cc b/src/adaptation/icap/ICAPConfig.cc similarity index 96% rename from src/ICAP/ICAPConfig.cc rename to src/adaptation/icap/ICAPConfig.cc index 581abcc33a..f5916212b7 100644 --- a/src/ICAP/ICAPConfig.cc +++ b/src/adaptation/icap/ICAPConfig.cc @@ -38,8 +38,8 @@ #include "ACL.h" #include "Store.h" #include "Array.h" // really Vector -#include "ICAPConfig.h" -#include "ICAPServiceRep.h" +#include "adaptation/icap/ICAPConfig.h" +#include "adaptation/icap/ICAPServiceRep.h" #include "HttpRequest.h" #include "HttpReply.h" #include "ACLChecklist.h" diff --git a/src/ICAP/ICAPConfig.h b/src/adaptation/icap/ICAPConfig.h similarity index 98% rename from src/ICAP/ICAPConfig.h rename to src/adaptation/icap/ICAPConfig.h index 1dc09093ab..ebc85085f9 100644 --- a/src/ICAP/ICAPConfig.h +++ b/src/adaptation/icap/ICAPConfig.h @@ -39,7 +39,7 @@ #include "event.h" #include "AsyncCall.h" #include "adaptation/Config.h" -#include "ICAPServiceRep.h" +#include "adaptation/icap/ICAPServiceRep.h" class acl_access; diff --git a/src/ICAP/ICAPElements.cc b/src/adaptation/icap/ICAPElements.cc similarity index 52% rename from src/ICAP/ICAPElements.cc rename to src/adaptation/icap/ICAPElements.cc index 8dad155cbf..e6ebf59d2b 100644 --- a/src/ICAP/ICAPElements.cc +++ b/src/adaptation/icap/ICAPElements.cc @@ -1,4 +1,4 @@ #include "squid.h" -#include "ICAPElements.h" +#include "adaptation/icap/ICAPElements.h" // TODO: remove this file? diff --git a/src/ICAP/ICAPElements.h b/src/adaptation/icap/ICAPElements.h similarity index 100% rename from src/ICAP/ICAPElements.h rename to src/adaptation/icap/ICAPElements.h diff --git a/src/ICAP/ICAPInOut.h b/src/adaptation/icap/ICAPInOut.h similarity index 100% rename from src/ICAP/ICAPInOut.h rename to src/adaptation/icap/ICAPInOut.h diff --git a/src/ICAP/ICAPLauncher.cc b/src/adaptation/icap/ICAPLauncher.cc similarity index 94% rename from src/ICAP/ICAPLauncher.cc rename to src/adaptation/icap/ICAPLauncher.cc index 575066e484..894265a308 100644 --- a/src/ICAP/ICAPLauncher.cc +++ b/src/adaptation/icap/ICAPLauncher.cc @@ -5,9 +5,9 @@ #include "squid.h" #include "TextException.h" #include "HttpMsg.h" -#include "ICAPLauncher.h" -#include "ICAPXaction.h" -#include "ICAPServiceRep.h" +#include "adaptation/icap/ICAPLauncher.h" +#include "adaptation/icap/ICAPXaction.h" +#include "adaptation/icap/ICAPServiceRep.h" ICAPLauncher::ICAPLauncher(const char *aTypeName, diff --git a/src/ICAP/ICAPLauncher.h b/src/adaptation/icap/ICAPLauncher.h similarity index 98% rename from src/ICAP/ICAPLauncher.h rename to src/adaptation/icap/ICAPLauncher.h index 24c4554268..d910214dc8 100644 --- a/src/ICAP/ICAPLauncher.h +++ b/src/adaptation/icap/ICAPLauncher.h @@ -36,7 +36,7 @@ #include "adaptation/Initiator.h" #include "adaptation/Initiate.h" -#include "ICAP/ICAPServiceRep.h" +#include "adaptation/icap/ICAPServiceRep.h" /* * The ICAP Launcher starts an ICAP transaction. If the transaction fails diff --git a/src/ICAP/ICAPModXact.cc b/src/adaptation/icap/ICAPModXact.cc similarity index 99% rename from src/ICAP/ICAPModXact.cc rename to src/adaptation/icap/ICAPModXact.cc index 06cd1138e1..c6c70ba940 100644 --- a/src/ICAP/ICAPModXact.cc +++ b/src/adaptation/icap/ICAPModXact.cc @@ -8,14 +8,14 @@ #include "HttpRequest.h" #include "HttpReply.h" #include "adaptation/Initiator.h" -#include "ICAPServiceRep.h" -#include "ICAPLauncher.h" -#include "ICAPModXact.h" -#include "ICAPClient.h" +#include "adaptation/icap/ICAPServiceRep.h" +#include "adaptation/icap/ICAPLauncher.h" +#include "adaptation/icap/ICAPModXact.h" +#include "adaptation/icap/ICAPClient.h" #include "ChunkedCodingParser.h" #include "TextException.h" #include "AuthUserRequest.h" -#include "ICAPConfig.h" +#include "adaptation/icap/ICAPConfig.h" #include "SquidTime.h" // flow and terminology: diff --git a/src/ICAP/ICAPModXact.h b/src/adaptation/icap/ICAPModXact.h similarity index 98% rename from src/ICAP/ICAPModXact.h rename to src/adaptation/icap/ICAPModXact.h index ccd1b4d76e..27c61d4e77 100644 --- a/src/ICAP/ICAPModXact.h +++ b/src/adaptation/icap/ICAPModXact.h @@ -35,9 +35,9 @@ #define SQUID_ICAPMODXACT_H #include "BodyPipe.h" -#include "ICAPXaction.h" -#include "ICAPInOut.h" -#include "ICAPLauncher.h" +#include "adaptation/icap/ICAPXaction.h" +#include "adaptation/icap/ICAPInOut.h" +#include "adaptation/icap/ICAPLauncher.h" /* * ICAPModXact implements ICAP REQMOD and RESPMOD transaction using diff --git a/src/ICAP/ICAPOptXact.cc b/src/adaptation/icap/ICAPOptXact.cc similarity index 96% rename from src/ICAP/ICAPOptXact.cc rename to src/adaptation/icap/ICAPOptXact.cc index 92c42aa8f3..77185dd9d4 100644 --- a/src/ICAP/ICAPOptXact.cc +++ b/src/adaptation/icap/ICAPOptXact.cc @@ -6,8 +6,8 @@ #include "comm.h" #include "HttpReply.h" -#include "ICAPOptXact.h" -#include "ICAPOptions.h" +#include "adaptation/icap/ICAPOptXact.h" +#include "adaptation/icap/ICAPOptions.h" #include "TextException.h" CBDATA_CLASS_INIT(ICAPOptXact); diff --git a/src/ICAP/ICAPOptXact.h b/src/adaptation/icap/ICAPOptXact.h similarity index 96% rename from src/ICAP/ICAPOptXact.h rename to src/adaptation/icap/ICAPOptXact.h index abbe153a2d..ee8164569e 100644 --- a/src/ICAP/ICAPOptXact.h +++ b/src/adaptation/icap/ICAPOptXact.h @@ -33,8 +33,8 @@ #ifndef SQUID_ICAPOPTXACT_H #define SQUID_ICAPOPTXACT_H -#include "ICAPXaction.h" -#include "ICAPLauncher.h" +#include "adaptation/icap/ICAPXaction.h" +#include "adaptation/icap/ICAPLauncher.h" class ICAPOptions; diff --git a/src/ICAP/ICAPOptions.cc b/src/adaptation/icap/ICAPOptions.cc similarity index 98% rename from src/ICAP/ICAPOptions.cc rename to src/adaptation/icap/ICAPOptions.cc index 4d4ff1029f..1b72e3af56 100644 --- a/src/ICAP/ICAPOptions.cc +++ b/src/adaptation/icap/ICAPOptions.cc @@ -1,9 +1,9 @@ #include "squid.h" #include "wordlist.h" #include "HttpReply.h" -#include "ICAPOptions.h" +#include "adaptation/icap/ICAPOptions.h" #include "TextException.h" -#include "ICAPConfig.h" +#include "adaptation/icap/ICAPConfig.h" #include "SquidTime.h" extern ICAPConfig TheICAPConfig; diff --git a/src/ICAP/ICAPOptions.h b/src/adaptation/icap/ICAPOptions.h similarity index 98% rename from src/ICAP/ICAPOptions.h rename to src/adaptation/icap/ICAPOptions.h index 5999d3806f..23e1f69705 100644 --- a/src/ICAP/ICAPOptions.h +++ b/src/adaptation/icap/ICAPOptions.h @@ -35,7 +35,7 @@ #define SQUID_ICAPOPTIONS_H #include "squid.h" -#include "ICAPServiceRep.h" +#include "adaptation/icap/ICAPServiceRep.h" class wordlist; diff --git a/src/ICAP/ICAPServiceRep.cc b/src/adaptation/icap/ICAPServiceRep.cc similarity index 98% rename from src/ICAP/ICAPServiceRep.cc rename to src/adaptation/icap/ICAPServiceRep.cc index bd743c0996..8ddf466ee4 100644 --- a/src/ICAP/ICAPServiceRep.cc +++ b/src/adaptation/icap/ICAPServiceRep.cc @@ -5,12 +5,12 @@ #include "squid.h" #include "TextException.h" #include "HttpReply.h" -#include "ICAPServiceRep.h" -#include "ICAPOptions.h" -#include "ICAPOptXact.h" +#include "adaptation/icap/ICAPServiceRep.h" +#include "adaptation/icap/ICAPOptions.h" +#include "adaptation/icap/ICAPOptXact.h" #include "ConfigParser.h" -#include "ICAPConfig.h" -#include "ICAPModXact.h" +#include "adaptation/icap/ICAPConfig.h" +#include "adaptation/icap/ICAPModXact.h" #include "SquidTime.h" CBDATA_CLASS_INIT(ICAPServiceRep); diff --git a/src/ICAP/ICAPServiceRep.h b/src/adaptation/icap/ICAPServiceRep.h similarity index 99% rename from src/ICAP/ICAPServiceRep.h rename to src/adaptation/icap/ICAPServiceRep.h index d47fd955b2..a0fe3247a2 100644 --- a/src/ICAP/ICAPServiceRep.h +++ b/src/adaptation/icap/ICAPServiceRep.h @@ -38,7 +38,7 @@ #include "adaptation/Service.h" #include "adaptation/forward.h" #include "adaptation/Initiator.h" -#include "ICAPElements.h" +#include "adaptation/icap/ICAPElements.h" class ICAPOptions; class ICAPOptXact; diff --git a/src/ICAP/ICAPXaction.cc b/src/adaptation/icap/ICAPXaction.cc similarity index 99% rename from src/ICAP/ICAPXaction.cc rename to src/adaptation/icap/ICAPXaction.cc index 82993b60ba..c8138eabe2 100644 --- a/src/ICAP/ICAPXaction.cc +++ b/src/adaptation/icap/ICAPXaction.cc @@ -6,8 +6,8 @@ #include "comm.h" #include "CommCalls.h" #include "HttpMsg.h" -#include "ICAPXaction.h" -#include "ICAPConfig.h" +#include "adaptation/icap/ICAPXaction.h" +#include "adaptation/icap/ICAPConfig.h" #include "TextException.h" #include "pconn.h" #include "fde.h" diff --git a/src/ICAP/ICAPXaction.h b/src/adaptation/icap/ICAPXaction.h similarity index 99% rename from src/ICAP/ICAPXaction.h rename to src/adaptation/icap/ICAPXaction.h index a321777eaf..003305d393 100644 --- a/src/ICAP/ICAPXaction.h +++ b/src/adaptation/icap/ICAPXaction.h @@ -37,7 +37,7 @@ #include "comm.h" #include "CommCalls.h" #include "MemBuf.h" -#include "ICAPServiceRep.h" +#include "adaptation/icap/ICAPServiceRep.h" #include "adaptation/Initiate.h" class HttpMsg; diff --git a/src/adaptation/icap/Makefile.am b/src/adaptation/icap/Makefile.am new file mode 100644 index 0000000000..35aa71f01d --- /dev/null +++ b/src/adaptation/icap/Makefile.am @@ -0,0 +1,25 @@ +include $(top_srcdir)/src/Common.am +include $(top_srcdir)/src/TestHeaders.am + +noinst_LTLIBRARIES = libicap.la + +libicap_la_SOURCES = \ + ICAPClient.cc \ + ICAPClient.h \ + ICAPInOut.h \ + ICAPConfig.cc \ + ICAPConfig.h \ + ICAPElements.cc \ + ICAPElements.h \ + ICAPOptions.cc \ + ICAPOptions.h \ + ICAPServiceRep.cc \ + ICAPServiceRep.h \ + ICAPLauncher.cc \ + ICAPLauncher.h \ + ICAPOptXact.cc \ + ICAPOptXact.h \ + ICAPXaction.cc \ + ICAPXaction.h \ + ICAPModXact.cc \ + ICAPModXact.h diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 661f41ca26..3c667263db 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -69,7 +69,7 @@ static void parse_adaptation_access_type(); #endif #if ICAP_CLIENT -#include "ICAP/ICAPConfig.h" +#include "adaptation/icap/ICAPConfig.h" static void parse_icap_service_type(ICAPConfig *); static void dump_icap_service_type(StoreEntry *, const char *, const ICAPConfig &); @@ -80,7 +80,7 @@ static void parse_icap_access_type(); #endif #if USE_ECAP -#include "eCAP/Config.h" +#include "adaptation/ecap/Config.h" static void parse_ecap_service_type(Ecap::Config *); static void dump_ecap_service_type(StoreEntry *, const char *, const Ecap::Config &); static void free_ecap_service_type(Ecap::Config *); diff --git a/src/eCAP/Makefile.am b/src/eCAP/Makefile.am deleted file mode 100644 index e9d1da4d22..0000000000 --- a/src/eCAP/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Makefile for the eCAP library -# -# $Id$ -# - -AM_CFLAGS = @SQUID_CFLAGS@ -AM_CXXFLAGS = @SQUID_CXXFLAGS@ - -noinst_LTLIBRARIES = libeCAP.la - -libeCAP_la_SOURCES = \ - Config.h \ - Config.cc \ - Host.h \ - Host.cc \ - MessageRep.h \ - MessageRep.cc \ - ServiceRep.h \ - ServiceRep.cc \ - XactionRep.h \ - XactionRep.cc \ - \ - Registry.h - -INCLUDES = \ - -I$(top_srcdir) \ - -I. \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src diff --git a/src/main.cc b/src/main.cc index ea43f2fec8..dab47b810d 100644 --- a/src/main.cc +++ b/src/main.cc @@ -77,10 +77,10 @@ #endif #if ICAP_CLIENT -#include "ICAP/ICAPConfig.h" +#include "adaptation/icap/ICAPConfig.h" #endif #if USE_ECAP -#include "eCAP/Config.h" +#include "adaptation/ecap/Config.h" #endif #if USE_ADAPTATION #include "adaptation/Config.h" -- 2.47.2