SourceLayout: Shuffle TextException into libbase

diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc
index eb0a7e52d4c8780ef9289f5c77bc6692a42da761..57732ac08820b87c447ad7a5ba72898c25306a4c 100644 (file)
--- a/src/BodyPipe.cc
+++ b/src/BodyPipe.cc
@@ -1,7 +1,7 @@
 
 #include "squid.h"
+#include "base/TextException.h"
 #include "BodyPipe.h"
-#include "TextException.h"
 
 CBDATA_CLASS_INIT(BodyPipe);
 

diff --git a/src/ChunkedCodingParser.cc b/src/ChunkedCodingParser.cc
index 1c17263577cc0e96ea926325deaf56331374e098..bbbf891387c5dd395693d3e5c9e5c91fbc0a3892 100644 (file)
--- a/src/ChunkedCodingParser.cc
+++ b/src/ChunkedCodingParser.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
+#include "base/TextException.h"
 #include "Parsing.h"
-#include "TextException.h"
 #include "ChunkedCodingParser.h"
 #include "MemBuf.h"
 

diff --git a/src/LoadableModule.cc b/src/LoadableModule.cc
index faf96c541124765b0038d18aadfa87eba2d77e26..df01bc7b597385d5372a6380333b41a71d08f09f 100644 (file)
--- a/src/LoadableModule.cc
+++ b/src/LoadableModule.cc
@@ -12,7 +12,7 @@
 #include <dlfcn.h>
 #endif
 
-#include "TextException.h"
+#include "base/TextException.h"
 #include "LoadableModule.h"
 
 // Note: We must use preprocessor instead of C ifs because if dlopen()

diff --git a/src/Makefile.am b/src/Makefile.am
index f682bd02968f1472e5b87460df0170389888106b..d0e7c1c7e5776952f3d2d7ef062a8b77720dbeab 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -249,9 +249,7 @@ libsquid_la_SOURCES = \
        CommCalls.h \
        DescriptorSet.cc \
        DescriptorSet.h \
-       SquidConfig.cc \
-        TextException.cc \
-        TextException.h
+       SquidConfig.cc
 
 squid_SOURCES = \
        $(ACL_REGISTRATION_SOURCES) \
@@ -968,9 +966,10 @@ tests_testHttpReply_LDADD=\
        acl/libstate.la \
        auth/libauth.la \
        ip/libip.la \
+       base/libbase.la \
        $(SQUID_CPPUNIT_LIBS) \
        $(SQUID_CPPUNIT_LA) \
-       -L../lib -lmiscutil \
+       $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testHttpReply_DEPENDENCIES= $(SQUID_CPPUNIT_LA) \
        $(top_builddir)/lib/libmiscutil.a

diff --git a/src/Server.cc b/src/Server.cc
index 5f00e522952a3a384f55ef15ef012073a7755248..1b7c820d2338f942a618bfe28c5b1dd40ef37390 100644 (file)
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -33,11 +33,11 @@
  */
 
 #include "squid.h"
+#include "base/TextException.h"
 #include "Server.h"
 #include "Store.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"
-#include "TextException.h"
 #include "errorpage.h"
 #include "SquidTime.h"
 

diff --git a/src/String.cc b/src/String.cc
index 40eae2c59e644b40278cdc9bbd4f15a8b1743ed5..81a7c4e14f56c3c1006501c6c22068700a8c78e6 100644 (file)
--- a/src/String.cc
+++ b/src/String.cc
@@ -34,8 +34,8 @@
  */
 
 #include "squid.h"
+#include "base/TextException.h"
 #include "Store.h"
-#include "TextException.h"
 
 int
 String::psize() const

diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc
index 2f3a12617b43157b8d47a5923726ab52423719c9..953c2e84a1384760d4f449216b88cc80ddac5b83 100644 (file)
--- a/src/adaptation/AccessCheck.cc
+++ b/src/adaptation/AccessCheck.cc
@@ -10,7 +10,7 @@
 #include "adaptation/AccessRule.h"
 #include "adaptation/Config.h"
 #include "adaptation/AccessCheck.h"
-
+#include "base/TextException.h"
 
 /** \cond AUTODOCS-IGNORE */
 cbdata_type Adaptation::AccessCheck::CBDATA_AccessCheck = CBDATA_UNKNOWN;

diff --git a/src/adaptation/History.cc b/src/adaptation/History.cc
index 4733b5aef3e77ec1cea67428c328eab92f23b0ca..3ecd4d3780a98b2833256dc5058cb4ca6924e637 100644 (file)
--- a/src/adaptation/History.cc
+++ b/src/adaptation/History.cc
@@ -1,10 +1,10 @@
 #include "config.h"
-#include "globals.h"
-#include "TextException.h"
-#include "SquidTime.h"
-#include "HttpRequest.h" /* for alLogformatHasAdaptToken */
 #include "adaptation/Config.h"
 #include "adaptation/History.h"
+#include "base/TextException.h"
+#include "globals.h"
+#include "HttpRequest.h" /* for alLogformatHasAdaptToken */
+#include "SquidTime.h"
 
 /// impossible services value to identify unset theNextServices
 const static char *TheNullServices = ",null,";

diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc
index 1b903faf0a2c0dcab73a3f0f4907445099c3a030..afd8e294e0a897a13b4016ec7b0512ff74a697dd 100644 (file)
--- a/src/adaptation/Iterator.cc
+++ b/src/adaptation/Iterator.cc
@@ -3,15 +3,15 @@
  */
 
 #include "squid.h"
-#include "TextException.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
-#include "HttpMsg.h"
 #include "adaptation/Config.h"
 #include "adaptation/Iterator.h"
 #include "adaptation/Service.h"
 #include "adaptation/ServiceFilter.h"
 #include "adaptation/ServiceGroups.h"
+#include "base/TextException.h"
+#include "HttpRequest.h"
+#include "HttpReply.h"
+#include "HttpMsg.h"
 
 
 Adaptation::Iterator::Iterator(Adaptation::Initiator *anInitiator,

diff --git a/src/adaptation/Message.cc b/src/adaptation/Message.cc
index ee4bac6500bcd053ccdccb4836f08e2175ee7355..fb525d1bb977668f514ffa17e68e6e5c306cfa21 100644 (file)
--- a/src/adaptation/Message.cc
+++ b/src/adaptation/Message.cc
@@ -3,9 +3,9 @@
  */
 
 #include "squid.h"
-#include "HttpMsg.h"
-#include "TextException.h"
 #include "adaptation/Message.h"
+#include "base/TextException.h"
+#include "HttpMsg.h"
 
 Adaptation::Message::Message(): header(NULL)
 {

diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc
index 62995d2661c246f0d666032bd4285ea6a838b617..48f9d65f670dbd620543a167738767d4539ab6f4 100644 (file)
--- a/src/adaptation/ecap/Host.cc
+++ b/src/adaptation/ecap/Host.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include <libecap/adapter/service.h>
 #include <libecap/common/names.h>
-#include "TextException.h"
+#include "base/TextException.h"
 #include "adaptation/ecap/ServiceRep.h"
 #include "adaptation/ecap/Host.h"
 

diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index ac50b731ee7a0fb79364b07d717e352b81dd8bf5..bb568034060918118c6d4132f86ec80984800092 100644 (file)
--- a/src/adaptation/ecap/MessageRep.cc
+++ b/src/adaptation/ecap/MessageRep.cc
@@ -6,13 +6,13 @@
 #include "HttpRequest.h"
 #include "HttpReply.h"
 #include "BodyPipe.h"
-#include "TextException.h"
 #include <libecap/common/names.h>
 #include <libecap/common/area.h>
 #include <libecap/common/version.h>
 #include "adaptation/ecap/MessageRep.h"
 #include "adaptation/ecap/XactionRep.h"
 #include "adaptation/ecap/Host.h" /* for protocol constants */
+#include "base/TextException.h"
 
 /* HeaderRep */
 

diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc
index be8027aafdb7ab453d05daaed8ae10927a119fdb..162c4305b9a822a7762ebd0ddf62a90b839407ad 100644 (file)
--- a/src/adaptation/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 "adaptation/ecap/ServiceRep.h"
 #include "adaptation/ecap/XactionRep.h"
+#include "base/TextException.h"
 
 Adaptation::Ecap::ServiceRep::ServiceRep(const Adaptation::ServiceConfig &cfg):
         /*AsyncJob("Adaptation::Ecap::ServiceRep"),*/ Adaptation::Service(cfg)

diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc
index c78a1096d79a2925a552dcbf44ab51fd8f7ed3e7..219c2889f2232b79b6e3dff571763d96fba8be90 100644 (file)
--- a/src/adaptation/ecap/XactionRep.cc
+++ b/src/adaptation/ecap/XactionRep.cc
@@ -2,11 +2,11 @@
 #include <libecap/common/area.h>
 #include <libecap/common/delay.h>
 #include <libecap/adapter/xaction.h>
-#include "TextException.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"
 #include "SquidTime.h"
 #include "adaptation/ecap/XactionRep.h"
+#include "base/TextException.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Ecap::XactionRep, XactionRep);
 

diff --git a/src/adaptation/icap/Launcher.cc b/src/adaptation/icap/Launcher.cc
index 313a8b275b2a91d38945c8983ed4f0ea60663194..d95c3377f1e788942e75260eb9cc8c1b0984b057 100644 (file)
--- a/src/adaptation/icap/Launcher.cc
+++ b/src/adaptation/icap/Launcher.cc
@@ -3,15 +3,15 @@
  */
 
 #include "squid.h"
-#include "TextException.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
 #include "acl/FilledChecklist.h"
-#include "HttpMsg.h"
 #include "adaptation/icap/Launcher.h"
 #include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/ServiceRep.h"
 #include "adaptation/icap/Config.h"
+#include "base/TextException.h"
+#include "HttpMsg.h"
+#include "HttpRequest.h"
+#include "HttpReply.h"
 
 
 Adaptation::Icap::Launcher::Launcher(const char *aTypeName,

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index bddee51219b60c2e667bd3d2d8c539deb8daff8b..d2911d94336da1be12f3f3e260883fc48ab24ed3 100644 (file)
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -3,23 +3,23 @@
  */
 
 #include "squid.h"
+#include "AccessLogEntry.h"
+#include "adaptation/History.h"
+#include "adaptation/icap/Client.h"
+#include "adaptation/icap/Config.h"
+#include "adaptation/icap/History.h"
+#include "adaptation/icap/Launcher.h"
+#include "adaptation/icap/ModXact.h"
+#include "adaptation/icap/ServiceRep.h"
+#include "adaptation/Initiator.h"
+#include "auth/UserRequest.h"
+#include "base/TextException.h"
+#include "ChunkedCodingParser.h"
 #include "comm.h"
 #include "HttpMsg.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"
-#include "adaptation/Initiator.h"
-#include "adaptation/icap/ServiceRep.h"
-#include "adaptation/icap/Launcher.h"
-#include "adaptation/icap/ModXact.h"
-#include "adaptation/icap/Client.h"
-#include "ChunkedCodingParser.h"
-#include "TextException.h"
-#include "auth/UserRequest.h"
-#include "adaptation/icap/Config.h"
 #include "SquidTime.h"
-#include "AccessLogEntry.h"
-#include "adaptation/icap/History.h"
-#include "adaptation/History.h"
 
 // flow and terminology:
 //     HTTP| --> receive --> encode --> write --> |network

diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc
index 0eb53af1debb4dbf2972ba83d29d85855f767020..17990d960225e9a6e4baff7863068a4d8d560f4f 100644 (file)
--- a/src/adaptation/icap/OptXact.cc
+++ b/src/adaptation/icap/OptXact.cc
@@ -8,7 +8,7 @@
 
 #include "adaptation/icap/OptXact.h"
 #include "adaptation/icap/Options.h"
-#include "TextException.h"
+#include "base/TextException.h"
 #include "SquidTime.h"
 #include "HttpRequest.h"
 

diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc
index 630dcbfbc43bf11979b66bfaca7a2ac91b02624a..da84d28c62e31829f9a8482ab0ebb8a1bd7725ad 100644 (file)
--- a/src/adaptation/icap/Options.cc
+++ b/src/adaptation/icap/Options.cc
@@ -1,10 +1,10 @@
 #include "squid.h"
-#include "wordlist.h"
-#include "HttpReply.h"
-#include "adaptation/icap/Options.h"
-#include "TextException.h"
 #include "adaptation/icap/Config.h"
+#include "adaptation/icap/Options.h"
+#include "base/TextException.h"
+#include "HttpReply.h"
 #include "SquidTime.h"
+#include "wordlist.h"
 
 Adaptation::Icap::Options::Options(): error("unconfigured"),
         max_connections(-1), allow204(false),

diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc
index c6a0740050a9bec5aaa3ae6d0c5ca65ff2214f1a..7e788be5193a9225da11ba7939d74182e3f31736 100644 (file)
--- a/src/adaptation/icap/ServiceRep.cc
+++ b/src/adaptation/icap/ServiceRep.cc
@@ -3,14 +3,14 @@
  */
 
 #include "squid.h"
-#include "TextException.h"
-#include "HttpReply.h"
-#include "adaptation/icap/ServiceRep.h"
+#include "adaptation/icap/Config.h"
+#include "adaptation/icap/ModXact.h"
 #include "adaptation/icap/Options.h"
 #include "adaptation/icap/OptXact.h"
+#include "adaptation/icap/ServiceRep.h"
+#include "base/TextException.h"
 #include "ConfigParser.h"
-#include "adaptation/icap/Config.h"
-#include "adaptation/icap/ModXact.h"
+#include "HttpReply.h"
 #include "SquidTime.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ServiceRep);

diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc
index e7f4cc0749816d13a2e7bce7703191aee37c730f..18c11dc228eefc894d0d39361b71bc8ddc092e00 100644 (file)
--- a/src/adaptation/icap/Xaction.cc
+++ b/src/adaptation/icap/Xaction.cc
@@ -9,7 +9,7 @@
 #include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/Launcher.h"
 #include "adaptation/icap/Config.h"
-#include "TextException.h"
+#include "base/TextException.h"
 #include "pconn.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"

diff --git a/src/base/AsyncJob.cc b/src/base/AsyncJob.cc
index 4b4fb6ad074d941f56b158aa5abe9f25029cfedd..19559f8e78ee2c2f49c94f7a4fba4b7db24e16b1 100644 (file)
--- a/src/base/AsyncJob.cc
+++ b/src/base/AsyncJob.cc
@@ -3,11 +3,11 @@
  */
 
 #include "squid.h"
+#include "base/AsyncCall.h"
+#include "base/AsyncJob.h"
+#include "base/TextException.h"
 #include "cbdata.h"
 #include "MemBuf.h"
-#include "TextException.h"
-#include "base/AsyncJob.h"
-#include "base/AsyncCall.h"
 
 
 unsigned int AsyncJob::TheLastId = 0;

diff --git a/src/base/AsyncJob.h b/src/base/AsyncJob.h
index dd33044ca08bcc75f93c301235b35d3e03d95899..4a182c5818df4fe6a371914492064a4846010be2 100644 (file)
--- a/src/base/AsyncJob.h
+++ b/src/base/AsyncJob.h
@@ -6,7 +6,6 @@
 #define SQUID_ASYNC_JOB_H
 
 #include "base/AsyncCall.h"
-#include "TextException.h"
 
 /**
  \defgroup AsyncJobAPI Async-Jobs API

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index 0596e0168f813df601d0a328b32a8f13cad5162a..0e1d4a96dad7fbdfa45add1584493c6ac7da82a6 100644 (file)
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -11,4 +11,6 @@ libbase_la_SOURCES = \
        AsyncJob.cc \
        AsyncJobCalls.h \
        AsyncCallQueue.cc \
-       AsyncCallQueue.h
+       AsyncCallQueue.h \
+       TextException.cc \
+       TextException.h

diff --git a/src/TextException.cc b/src/base/TextException.cc
similarity index 94%
rename from src/TextException.cc
rename to src/base/TextException.cc
index bcee9943786f5d7682fb368721cea07f5674c5bd..c595e3093757baafbae2dd54fc53c289d54e7918 100644 (file)
--- a/src/TextException.cc
+++ b/src/base/TextException.cc
@@ -1,5 +1,7 @@
-#include "squid.h"
-#include "TextException.h"
+#include "config.h"
+#include "base/TextException.h"
+#include "Debug.h"
+#include "util.h"
 
 TextException::TextException()
 {

diff --git a/src/TextException.h b/src/base/TextException.h
similarity index 98%
rename from src/TextException.h
rename to src/base/TextException.h
index 59e82b42fc29a0ed387037372cd792510835b6e5..c559c52e8ac9bcad4ca1f2bddac89f1afe18b8e4 100644 (file)
--- a/src/TextException.h
+++ b/src/base/TextException.h
@@ -3,7 +3,7 @@
 
 // Origin: xstd/TextException
 
-#include "squid.h"
+#include "config.h"
 #include <exception>
 
 // simple exception to report custom errors

diff --git a/src/http.cc b/src/http.cc
index 36c9f2c511d240430f0f22058197853b80c2206a..e00332cb5a73dd4bf3191bfd6703dbdd8ea81c36 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -42,6 +42,7 @@
 
 #include "acl/FilledChecklist.h"
 #include "auth/UserRequest.h"
+#include "base/TextException.h"
 #if DELAY_POOLS
 #include "DelayPools.h"
 #endif
@@ -59,7 +60,6 @@
 #include "rfc1738.h"
 #include "SquidTime.h"
 #include "Store.h"
-#include "TextException.h"
 
 
 #define SQUID_ENTER_THROWING_CODE() try {

diff --git a/src/main.cc b/src/main.cc
index 85cbbba2b998a9ffd340265465fce7a1fc19e1c4..255528623c43dfd676dd98d74d80fdb979d49e70 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -38,6 +38,7 @@
 #include "adaptation/icap/icap_log.h"
 #endif
 #include "auth/Gadgets.h"
+#include "base/TextException.h"
 #include "ConfigParser.h"
 #include "errorpage.h"
 #include "event.h"
@@ -73,7 +74,6 @@
 #include "MemPool.h"
 #include "icmp/IcmpSquid.h"
 #include "icmp/net_db.h"
-#include "TextException.h"
 
 #if USE_LOADABLE_MODULES
 #include "LoadableModules.h"