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.

diff --git a/configure.in b/configure.in
index ff81f6af820fd3692cd3bca8f41ee8ff53229826..4932f3139ba68cbf15b22c292e8bf4d481066b51 100644 (file)
--- 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 (file)
index d9b7163..0000000
--- 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 73c16fff82e429b0b86ff8151bf6d877f5a03709..b6175584608645c4033f54bbd7b5598674302236 100644 (file)
--- 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 c0cf4fd55fcc174e6412588f69f93026e0c082f2..0942fd25fc5f798598f6e6f34c7b0b4b241bc05f 100644 (file)
--- 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 b8d3263ef14ef22d45396f36e4251b4996f4b5a4..3a3b546d4f68741a5a23e23ac391b092faed7a7b 100644 (file)
--- a/src/eCAP/Config.cc
+++ b/src/adaptation/ecap/Config.cc
@@ -6,9 +6,9 @@
 #include "squid.h"
 
 #include <libecap/common/registry.h>
-#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 9fae209313fcb5adc2c59326661c27b2eb8ac56d..d8dd17df66498bd3d486e8be399f437eb8a749fd 100644 (file)
--- a/src/eCAP/Host.cc
+++ b/src/adaptation/ecap/Host.cc
@@ -2,8 +2,8 @@
 #include <libecap/adapter/service.h>
 #include <libecap/common/names.h>
 #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 (file)
index 0000000..3e80f80
--- /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 f3b8b298ecf04ac514be16dc4e7696348cad1b72..8560ab4a9700825762b9e5370a93a28b0f93d52e 100644 (file)
--- 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 <libecap/common/names.h>
 #include <libecap/common/area.h>
 #include <libecap/common/version.h>
-#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 2fae3830791a9bfc9c69cfe6ba0b8131d56e3c0b..adf62b9248419489272b62bfcf0b4838b030e963 100644 (file)
--- 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 <libecap/common/message.h>
 #include <libecap/common/header.h>
 #include <libecap/common/body.h>
 
+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 5440e0008ba688e48fc5d58e54b5fbde3b1e39fd..0fc16637a9af1ac3f30e6c55faf3dfb25bdb4fc0 100644 (file)
--- a/src/eCAP/ServiceRep.cc
+++ b/src/adaptation/ecap/ServiceRep.cc
@@ -1,8 +1,8 @@
 #include "squid.h"
 #include <libecap/adapter/service.h>
 #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 e1eb8216b9158c553a080d13bc98066ef21eaa56..cb8eeb6b7be4d36b7b969a998e761c9e34922251 100644 (file)
--- 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 3098ba1a5d843bd0392a5c979685134061d53e7d..1a749cd9e595940c7bdcdc692435988b9906d939 100644 (file)
--- 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 <libecap/common/forward.h>
 #include <libecap/common/memory.h>
 #include <libecap/host/xaction.h>

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 df2fd4966ad0751428cd579c2154ce39bbe0b588..020265ecbba6b49a3e8bbc3de05dcc04eee44064 100644 (file)
--- 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 581abcc33a8ec6f68f03e6de6d2509f23a62ea62..f5916212b7dbf6a2a15ed832cfad9d546ef87562 100644 (file)
--- 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 1dc09093ab10648f37aeff9d62993f316e104254..ebc85085f94836b6633af34dbfb7c6440c0e2028 100644 (file)
--- 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 8dad155cbfd8ebf94287c514ec75ade8924fe9b3..e6ebf59d2b6222802b8f35ce0f41fdab70e8c217 100644 (file)
--- 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 575066e4843e937714234c152830ecd49e38ba02..894265a308c23bf789574ed46c76b188fa74de97 100644 (file)
--- 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 24c4554268f3e2ba08fc7ee6865478728aac0802..d910214dc83db0b6e826d558833b27274e46b3c4 100644 (file)
--- 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 06cd1138e1df9a19f105e76b545509132eb843fe..c6c70ba9407a51146fafe7a13e932fbf43fee2de 100644 (file)
--- 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 ccd1b4d76e72d9973627795b51f53488afd6603f..27c61d4e772d4f73cbb2d18226aae38976bef3c0 100644 (file)
--- 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 92c42aa8f36a39c019d71d519c0ed9c67c4bc797..77185dd9d405aec384e0fe27fc12678115bf1ab0 100644 (file)
--- 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 abbe153a2de59d84b0281cc0f374c5d4de1e9bb4..ee8164569e481e3c8913bda137c76549920a542e 100644 (file)
--- 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 4d4ff1029f439aab053c93e9ceef101c07ae6b7f..1b72e3af56c733c49d010f362d4e883846546d83 100644 (file)
--- 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 5999d3806fc4bf66529066a1b8fb2ab217329477..23e1f69705b807f74d0226e0c187d6ed84c6a427 100644 (file)
--- 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 bd743c09960cb32b18dd65ae9657bef0154a478e..8ddf466ee474d9485e07d910172714c50916470e 100644 (file)
--- 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 d47fd955b24989bb62790f9ea0329df49aea7a20..a0fe3247a29c5640eea92fd6d5c362c0072e5148 100644 (file)
--- 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 82993b60bae7ebb91e0b224c8e47e60f554e10f7..c8138eabe2a38f1464b36a954117f2f465ac5921 100644 (file)
--- 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 a321777eafb52933c8a2ba242e091833b4c1d2d1..003305d393a824260295b9eb68d145a4ae096aa3 100644 (file)
--- 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 (file)
index 0000000..35aa71f
--- /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 661f41ca268d0519fab7aeb9806f43b47ca9cb04..3c667263db779b81ca6119387199b328fc7e259a 100644 (file)
--- 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 (file)
index e9d1da4..0000000
--- 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 ea43f2fec868e02773f7d8dfbe5c595909513c90..dab47b810d5becac1bc2835e044de0d44b9a705b 100644 (file)
--- 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"