Moved src/ICAP/AsyncJob.* to src/base/ to prepare for the src/ICAP move to

src/adaptation/icap.

diff --git a/src/AsyncJobCalls.h b/src/AsyncJobCalls.h
index 306e538c337c83e207b36184d7f999c7eaae8eb0..0657d3672015361f13cbc67e8a31a20635d41482 100644 (file)
--- a/src/AsyncJobCalls.h
+++ b/src/AsyncJobCalls.h
@@ -6,7 +6,7 @@
 #ifndef SQUID_ASYNCJOBCALLS_H
 #define SQUID_ASYNCJOBCALLS_H
 
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 
 /*
  * *MemFunT are member function (i.e., class method) wrappers. They store

diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index 7ce016ef3a8c7284839e29f190a8ec366a0bce88..bf00268b865a06e53f398b74496990ac03ff7c25 100644 (file)
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -4,7 +4,7 @@
 
 #include "MemBuf.h"
 #include "AsyncCall.h"
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 
 class BodyPipe;
 

diff --git a/src/Server.h b/src/Server.h
index e7316965f60a84e97df0136aaee85ea964a133f5..ff8ef9e8def76df251f6ffd36fb85c351fdbf092 100644 (file)
--- a/src/Server.h
+++ b/src/Server.h
@@ -37,7 +37,7 @@
 #include "StoreIOBuffer.h"
 #include "forward.h"
 #include "BodyPipe.h"
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 #include "CommCalls.h"
 
 #if USE_ADAPTATION

diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h
index 89e54045e24e5757bcf5c3d52021d829f98b81ac..0d384be58296e13acec91a249fe9568b9580b0ec 100644 (file)
--- a/src/adaptation/AccessCheck.h
+++ b/src/adaptation/AccessCheck.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_ADAPTATION__ACCESS_CHECK_H
 #define SQUID_ADAPTATION__ACCESS_CHECK_H
 
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 #include "adaptation/Elements.h"
 #include "adaptation/forward.h"
 

diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h
index a94c5889e60e5904c07aa61d0f365012de6deea3..eba205f7b8b93431b5b198274d97dd67546c8196 100644 (file)
--- a/src/adaptation/Initiate.h
+++ b/src/adaptation/Initiate.h
@@ -2,7 +2,7 @@
 #define SQUID_ADAPTATION__INITIATE_H
 
 #include "AsyncCall.h"
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 #include "adaptation/forward.h"
 
 class HttpMsg;

diff --git a/src/adaptation/Initiator.h b/src/adaptation/Initiator.h
index 0d66074850fd9891ad49bd9671cdc7d4c8fc0994..ba2a1254f10957db81ea04346fc915398a8c56d2 100644 (file)
--- a/src/adaptation/Initiator.h
+++ b/src/adaptation/Initiator.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_ADAPTATION__INITIATOR_H
 #define SQUID_ADAPTATION__INITIATOR_H
 
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 #include "adaptation/forward.h"
 
 /*

diff --git a/src/ICAP/AsyncJob.cc b/src/base/AsyncJob.cc
similarity index 100%
rename from src/ICAP/AsyncJob.cc
rename to src/base/AsyncJob.cc

diff --git a/src/ICAP/AsyncJob.h b/src/base/AsyncJob.h
similarity index 98%
rename from src/ICAP/AsyncJob.h
rename to src/base/AsyncJob.h
index ee6ae4589647d255964e9e1d99ab533a87123506..287f64e05d4dcd03be69e448407712076aef49cf 100644 (file)
--- a/src/ICAP/AsyncJob.h
+++ b/src/base/AsyncJob.h
@@ -5,9 +5,6 @@
 #ifndef SQUID_ASYNC_JOB_H
 #define SQUID_ASYNC_JOB_H
 
-/// \todo move src/ICAP/AsyncJob.* to src/
-
-
 #include "AsyncCall.h"
 #include "TextException.h"
 

diff --git a/src/client_side.h b/src/client_side.h
index 5bb37172a1d9822d9522be98bd8d430f141f5342..37ad29978eb04c9e260c9ee7e1ca2107c6f97fb1 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -37,7 +37,7 @@
 #include "StoreIOBuffer.h"
 #include "BodyPipe.h"
 #include "RefCount.h"
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 #include "CommCalls.h"
 
 class ConnStateData;

diff --git a/src/client_side_request.h b/src/client_side_request.h
index 7e7b9b94f82ebe2f46c285bc2ed5533f286abe4a..0d1cd041c0b11fbc01f9ab495155d6c99da9bb2d 100644 (file)
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -41,7 +41,7 @@
 #include "client_side.h"
 #include "AccessLogEntry.h"
 #include "dlink.h"
-#include "ICAP/AsyncJob.h"
+#include "base/AsyncJob.h"
 
 #if USE_ADAPTATION
 #include "adaptation/forward.h"