Author: Alex Rousskov <rousskov@measurement-factory.com>

SourceLayout: src/auth, src/fs

 src/auth take 0: Moved src/AuthFoo* to src/auth/Foo*, polished.

 src/fs, take 0: Polished Makefiles.

These fixes should have no runtime effects and were triggered by an attempt to
make "make distclean" work.

TODO: add Auth and Fs namespaces, rename classes.

diff --git a/configure.in b/configure.in
index 200c0346dec22b4df2fe53da2a94f8f52178e213..21b38114a4210d6ff2acbafec6d0ce52914f13fe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -450,14 +450,12 @@ if test -n "$STORE_MODULES"; then
     dnl ensure that all modules a) exist and b) only include once.
     STORE_MODULES_FULL=$STORE_MODULES
     STORE_MODULES=
-    STORE_LINKOBJS=
     for module in $STORE_MODULES_FULL; do
         have_mod=`echo "$STORE_MODULES" | grep "$module"`
         if test "$have_mod" != ""; then
            AC_MSG_NOTICE([Removing duplicate $module from storeio])
        elif test -d $srcdir/src/fs/$module; then
            STORE_MODULES="$STORE_MODULES $module"
-           STORE_LINKOBJS="$STORE_LINKOBJS fs/${module}/StoreFS${module}.o"
        else
            AC_MSG_ERROR(storeio $module does not exist)
        fi
@@ -498,36 +496,30 @@ for fs in $STORE_MODULES none; do
        STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT"
     esac
 done
-STORE_OBJS=
-STORE_LIBS=
-dnl We have 'fake' modules - aufs and diskd - legacy.
-for fs in $STORE_MODULES; do
-    case "$fs" in
-    diskd);;
-    aufs);;
-    *)
-      STORE_OBJS="$STORE_OBJS fs/lib${fs}.a"
-      STORE_LIBS="$STORE_LIBS lib${fs}.a"
-      ;;
-    esac
-done
 
 if test -z "$UFS_FOUND" && test -n "$NEED_UFS"; then
     AC_MSG_NOTICE([Adding UFS, as it contains core logic for diskd and aufs])
-    STORE_OBJS="$STORE_OBJS fs/libufs.a"
-    STORE_LIBS="$STORE_LIBS libufs.a"
     STORE_MODULES="$STORE_MODULES ufs"
-    STORE_LINKOBJS="$STORE_LINKOBJS fs/ufs/StoreFSufs.o"
     dnl
     dnl Automake om MinGW needs explicit exe extension
     dnl for STORE_TESTS substition
     dnl
     STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT"
 fi
-  
-AC_SUBST(STORE_OBJS)
-AC_SUBST(STORE_LIBS)
-AC_SUBST(STORE_LINKOBJS)
+
+dnl got final STORE_MODULES, build library lists
+dnl This list will not be needed when each fs library has its own Makefile
+STORE_LIBS_TO_BUILD=
+dnl File system libraries to link executables with.
+dnl These are the same as STORE_LIBS_TO_BUILD, but with a path
+STORE_LIBS_TO_ADD=
+for fs in $STORE_MODULES; do
+    STORE_LIBS_TO_BUILD="$STORE_LIBS_TO_BUILD lib${fs}.a"
+    STORE_LIBS_TO_ADD="$STORE_LIBS_TO_ADD fs/lib${fs}.a"
+done
+
+AC_SUBST(STORE_LIBS_TO_BUILD)
+AC_SUBST(STORE_LIBS_TO_ADD)
 AC_SUBST(STORE_TESTS)
 
 AC_ARG_ENABLE(disk-io,
@@ -1560,19 +1552,22 @@ if test -n "$AUTH_MODULES"; then
        eval AUTH_MODULE_${module}=yes
     done
     AC_MSG_NOTICE([Auth scheme modules built: $AUTH_MODULES])
-    AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a"
-    AUTH_LIBS="`echo $AUTH_OBJS|sed -e 's%auth/%%g'`"
 else
     AC_MSG_WARN([Auth scheme modules built: None])
 fi
-AUTH_LINKOBJS=
+dnl Authentication libraries to build
+dnl This list will not be needed when each auth library has its own Makefile
+AUTH_LIBS_TO_BUILD=
+dnl Authentication libraries to link authenticating executables with.
+dnl These are the same as AUTH_LIBS_TO_BUILD, but with a path
+AUTH_LIBS_TO_ADD=
 for module in $AUTH_MODULES; do
-  AUTH_LINKOBJS="$AUTH_LINKOBJS auth/${module}/${module}Scheme.o"
+    AUTH_LIBS_TO_BUILD="$AUTH_LIBS_TO_BUILD lib${module}.a"
+    AUTH_LIBS_TO_ADD="$AUTH_LIBS_TO_ADD auth/lib${module}.a"
 done
 AC_SUBST(AUTH_MODULES)
-AC_SUBST(AUTH_LIBS)
-AC_SUBST(AUTH_LINKOBJS)
-AC_SUBST(AUTH_OBJS)
+AC_SUBST(AUTH_LIBS_TO_ADD)
+AC_SUBST(AUTH_LIBS_TO_BUILD)
 
 dnl bundled auth modules, in order to have handy defines for the cppunit testsuite
 test -n "$AUTH_MODULE_basic" && AC_DEFINE([HAVE_AUTH_MODULE_BASIC],1,[Basic auth module is built])

diff --git a/src/ACLChecklist.cc b/src/ACLChecklist.cc
index 33b317e31c4391b55fcd360983492bc75600c1d6..4811f5cd48d2ca1020eb3dac4c6d919d92a7f439 100644 (file)
--- a/src/ACLChecklist.cc
+++ b/src/ACLChecklist.cc
@@ -40,7 +40,7 @@
 #include "authenticate.h"
 #include "ACLProxyAuth.h"
 #include "client_side.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 
 int
 ACLChecklist::authenticated()

diff --git a/src/ACLMaxUserIP.cc b/src/ACLMaxUserIP.cc
index 4d561a385f7a28cec7d11d971e749765c0210f39..31aafc4212a1ce8949cf4c7bb0560fe82f649670 100644 (file)
--- a/src/ACLMaxUserIP.cc
+++ b/src/ACLMaxUserIP.cc
@@ -36,7 +36,7 @@
 
 #include "squid.h"
 #include "ACLMaxUserIP.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "authenticate.h"
 #include "wordlist.h"
 #include "ConfigParser.h"

diff --git a/src/ACLProxyAuth.cc b/src/ACLProxyAuth.cc
index 312d908acb632147358720e2e9d8ab4d564fa34b..e8643cd38bab8be0ed3c84dd6da9c67e801e4d56 100644 (file)
--- a/src/ACLProxyAuth.cc
+++ b/src/ACLProxyAuth.cc
@@ -42,8 +42,8 @@
 #include "ACLRegexData.h"
 #include "client_side.h"
 #include "HttpRequest.h"
-#include "AuthUser.h"
-#include "AuthUserRequest.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
 
 ACLProxyAuth::~ACLProxyAuth()
 {

diff --git a/src/DelayUser.cc b/src/DelayUser.cc
index d32b5f2186f74016a36106282716598bf8872178..9ddbe4d1dd9b4b5593cd9a71f21ee0e87fa85516 100644 (file)
--- a/src/DelayUser.cc
+++ b/src/DelayUser.cc
@@ -40,8 +40,8 @@
 #if DELAY_POOLS
 #include "squid.h"
 #include "DelayUser.h"
-#include "AuthUserRequest.h"
-#include "AuthUser.h"
+#include "auth/UserRequest.h"
+#include "auth/User.h"
 #include "NullDelayId.h"
 #include "Store.h"
 

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index b27814e6704a557f39d9d8f44b3cadd9b2ae9273..1f80874d41380537c3eee89d2f63ab1cebaf66eb 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -36,7 +36,7 @@
 
 #include "squid.h"
 #include "HttpRequest.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "HttpHeaderRange.h"
 #include "MemBuf.h"
 #include "Store.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index d2570621249ce6d71598b9eed312a681f5ccfbc4..b7707ee16292ae89cb78444f37d5e9bc89a5f2c0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,12 +200,12 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
 EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
 noinst_LIBRARIES = @DISK_LIBS@
-noinst_LTLIBRARIES = libsquid.la libauth.la
+noinst_LTLIBRARIES = libsquid.la
 
 # libraries used by many targets
 COMMON_LIBS = \
        libsquid.la \
-       libauth.la \
+       auth/libauth.a \
        base/libbase.la \
        ip/libip.la
 
@@ -256,12 +256,6 @@ cf_gen_LDADD= \
        @MINGW_LIBS@
 cf_gen.$(OBJEXT): cf_gen_defines.h
 
-all_FSMODULES = \
-       fs/aufs/StoreFSaufs.cc \
-       fs/coss/StoreFScoss.cc \
-       fs/diskd/StoreFSdiskd.cc \
-       fs/ufs/StoreFSufs.cc
-
 DISKIO_SOURCE = \
        DiskIO/DiskIOModule.cc \
        DiskIO/ReadRequest.cc \
@@ -281,18 +275,7 @@ DiskIO/DiskIOModules_gen.cc: Makefile
        $(SHELL) $(srcdir)/DiskIO/modules.sh $(DISK_MODULES) > DiskIO/DiskIOModules_gen.cc
 
 
-all_AUTHMODULES = \
-       auth/basic/basicScheme.cc \
-       auth/basic/basicScheme.h \
-       auth/digest/digestScheme.cc \
-       auth/digest/digestScheme.h \
-       auth/ntlm/ntlmScheme.cc \
-       auth/ntlm/ntlmScheme.h \
-       auth/negotiate/negotiateScheme.cc \
-       auth/negotiate/negotiateScheme.h 
-
 EXTRA_squid_SOURCES = \
-       $(all_FSMODULES) \
        $(AIO_WIN32_ALL_SOURCES) \
        $(all_AUTHMODULES) \
        $(ARP_ACL_ALL_SOURCE) \
@@ -427,15 +410,6 @@ libsquid_la_SOURCES = \
         TextException.cc \
         TextException.h
 
-# authentication framework
-libauth_la_SOURCES = \
-       AuthConfig.cc \
-       AuthConfig.h \
-       AuthScheme.cc \
-       AuthScheme.h \
-       AuthUser.cc \
-       AuthUserRequest.cc
-
 squid_SOURCES = \
        access_log.cc \
        AccessLogEntry.h \
@@ -664,9 +638,6 @@ squid_SOURCES = \
        $(WINSVC_SOURCE)
 
 noinst_HEADERS = ACLChecklist.cci \
-       AuthUser.cci \
-       AuthUser.h \
-       AuthUserRequest.h \
        client_side_request.cci \
        MemBuf.cci \
        MemBuf.h \
@@ -690,11 +661,9 @@ squid_LDADD = \
        @XTRA_OBJS@ \
        @DISK_LINKOBJS@ \
        @REPL_OBJS@ \
-       @STORE_LINKOBJS@ \
-       @STORE_OBJS@ \
+       @STORE_LIBS_TO_ADD@ \
        @DISK_LIBS@ \
-       @AUTH_LINKOBJS@ \
-       @AUTH_OBJS@ \
+       @AUTH_LIBS_TO_ADD@ \
        @CRYPTLIB@ \
        @REGEXLIB@ \
        @SNMPLIB@ \
@@ -705,13 +674,11 @@ squid_LDADD = \
        @EPOLL_LIBS@ \
        @MINGW_LIBS@ 
 squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @STORE_OBJS@ \
-       @STORE_LINKOBJS@ \
+       @STORE_LIBS_TO_ADD@ \
        @DISK_LIBS@ \
        @DISK_LINKOBJS@ \
        @REPL_OBJS@ \
-       @AUTH_LINKOBJS@ \
-       @AUTH_OBJS@
+       @AUTH_LIBS_TO_ADD@
 
 if USE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
@@ -912,8 +879,8 @@ ufsdump_LDADD = \
        icmp/libicmp.la icmp/libicmp-core.la \
        @XTRA_OBJS@ \
        @REPL_OBJS@ \
-       @STORE_OBJS@ \
-       @AUTH_OBJS@ \
+       @STORE_LIBS_TO_ADD@ \
+       @AUTH_LIBS_TO_ADD@ \
        @CRYPTLIB@ \
        @REGEXLIB@ \
        @SNMPLIB@ \
@@ -924,13 +891,11 @@ ufsdump_LDADD = \
        @EPOLL_LIBS@ \
        @MINGW_LIBS@ 
 ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @STORE_OBJS@ \
-       @STORE_LINKOBJS@ \
+       @STORE_LIBS_TO_ADD@ \
        @DISK_LIBS@ \
        @DISK_LINKOBJS@ \
        @REPL_OBJS@ \
-       @AUTH_LINKOBJS@ \
-       @AUTH_OBJS@
+       @AUTH_LIBS_TO_ADD@
 
 nodist_ufsdump_SOURCES = \
        repl_modules.cc \
@@ -1229,15 +1194,14 @@ nodist_tests_testAuth_SOURCES = \
 
 tests_testAuth_LDADD= \
        $(COMMON_LIBS) \
-       @AUTH_LINKOBJS@ @AUTH_OBJS@ \
+       @AUTH_LIBS_TO_ADD@ \
        -L../lib -lmiscutil \
        @REGEXLIB@ \
        @SQUID_CPPUNIT_LIBS@ \
        @SSLLIB@
 tests_testAuth_LDFLAGS = $(LIBADD_DL)
 tests_testAuth_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
-       @AUTH_LINKOBJS@ \
-       @AUTH_OBJS@ \
+       @AUTH_LIBS_TO_ADD@ \
        @SQUID_CPPUNIT_LA@
 
 ## Tests for the ACLMaxUserIP class
@@ -1946,7 +1910,7 @@ tests_test_http_range_LDADD = \
        $(COMMON_LIBS) \
        icmp/libicmp.la icmp/libicmp-core.la \
        @REPL_OBJS@ \
-       @STORE_OBJS@ \
+       @STORE_LIBS_TO_ADD@ \
        ${ADAPTATION_LIBS} \
        @REGEXLIB@ \
        @SNMPLIB@ \
@@ -2148,7 +2112,6 @@ STORE_TEST_SOURCES=\
        HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
        StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
        tests/stub_HttpRequest.cc tests/stub_access_log.cc \
-       ip/stubQosConfig.cc \
        refresh.cc \
        tests/stub_store_client.cc \
        tests/stub_tools.cc \
@@ -2256,8 +2219,7 @@ SWAP_TEST_GEN_SOURCES = \
 
 SWAP_TEST_LDADD = \
        @REGEXLIB@ \
-       @STORE_LINKOBJS@ \
-       @STORE_OBJS@ \
+       @STORE_LIBS_TO_ADD@ \
        @REPL_OBJS@ \
        @DISK_LIBS@ \
        -L../lib -lmiscutil \
@@ -2266,8 +2228,7 @@ SWAP_TEST_DS =\
        $(top_builddir)/lib/libmiscutil.a \
        repl_modules.o \
        @DISK_LIBS@ \
-       @STORE_LINKOBJS@ \
-       @STORE_OBJS@ \
+       @STORE_LIBS_TO_ADD@ \
        @REPL_OBJS@ \
        @SQUID_CPPUNIT_LA@
 

diff --git a/src/TestHeaders.am b/src/TestHeaders.am
index c3da20a3ce100bbd39adb5f167c14e3a0ea9f429..bf65d3ccee6704c18cf7587e3ec73f891ad9b1c5 100644 (file)
--- a/src/TestHeaders.am
+++ b/src/TestHeaders.am
@@ -9,4 +9,10 @@ TESTS += testHeaders
 testHeaders: $(srcdir)/*.h
        $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(srcdir)" || exit 1
 
+## XXX: this is only needed because testheaders.sh creates a dummy file called
+## testHeaders and distclean does not know about it.
+## Remove when testheaders.sh and its users are fixed.
+CLEANFILES += testHeaders
+
+
 .PHONY: testHeaders

diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index 6dbb850410731d6a8d2913543215437f5eff1fb8..7038f7c3d72856be76afc4dea310ef28fd92a6d5 100644 (file)
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -14,7 +14,7 @@
 #include "adaptation/icap/Client.h"
 #include "ChunkedCodingParser.h"
 #include "TextException.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "adaptation/icap/Config.h"
 #include "SquidTime.h"
 

diff --git a/src/AuthConfig.cc b/src/auth/Config.cc
similarity index 98%
rename from src/AuthConfig.cc
rename to src/auth/Config.cc
index bcfbf7f6fc59633b4fbca2162894fa03e1d4307a..0b4beb0862f3c6c31b2656224f6dc68d97e30968 100644 (file)
--- a/src/AuthConfig.cc
+++ b/src/auth/Config.cc
@@ -34,8 +34,8 @@
  */
 
 #include "squid.h"
-#include "AuthConfig.h"
-#include "AuthUserRequest.h"
+#include "auth/Config.h"
+#include "auth/UserRequest.h"
 
 /* Get Auth User: Return a filled out auth_user structure for the given
  * Proxy Auth (or Auth) header. It may be a cached Auth User or a new

diff --git a/src/AuthConfig.h b/src/auth/Config.h
similarity index 100%
rename from src/AuthConfig.h
rename to src/auth/Config.h

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 70749bc172a0844227e693a3bba9f3718618a87b..3cf57d35c4089a442992b01d8bb90f37ab282ae0 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -1,37 +1,59 @@
-#  Makefile for authentication modules in the Squid Object Cache server
-#
-#  $Id$
-#
-AUTOMAKE_OPTIONS = subdir-objects
-AM_CFLAGS = @SQUID_CFLAGS@
-AM_CXXFLAGS = @SQUID_CXXFLAGS@
-CLEANFILES =
+include $(top_srcdir)/src/Common.am
 
 EXTRA_LIBRARIES        = libbasic.a libdigest.a libntlm.a libnegotiate.a
-noinst_LIBRARIES       = @AUTH_LIBS@
+noinst_LIBRARIES = libauth.a @AUTH_LIBS_TO_BUILD@
 
-libbasic_a_SOURCES     = basic/auth_basic.cc basic/auth_basic.h
-libdigest_a_SOURCES    = digest/auth_digest.cc digest/auth_digest.h
-libntlm_a_SOURCES      = ntlm/auth_ntlm.cc ntlm/auth_ntlm.h
-libnegotiate_a_SOURCES = negotiate/auth_negotiate.cc negotiate/auth_negotiate.h negotiate/negotiateScheme.cc negotiate/negotiateScheme.h
+## authentication framework; this library is always built
+## TODO: use libtool and add @AUTH_LIBS_TO_BUILD@ to libauth.la
+libauth_a_SOURCES = \
+       Config.cc \
+       Config.h \
+       Scheme.cc \
+       Scheme.h \
+       User.h \
+       User.cci \
+       User.cc \
+       UserRequest.h \
+       UserRequest.cc
 
-INCLUDES = \
-       -I$(top_srcdir) \
-       -I. \
-       -I$(top_builddir)/include \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src
+libbasic_a_SOURCES = \
+       basic/basicScheme.cc \
+       basic/basicScheme.h \
+       basic/auth_basic.cc \
+       basic/auth_basic.h
 
-check_PROGRAMS= testHeaders
+libdigest_a_SOURCES = \
+       digest/digestScheme.cc \
+       digest/digestScheme.h \
+       digest/auth_digest.cc \
+       digest/auth_digest.h
+
+libntlm_a_SOURCES = \
+       ntlm/ntlmScheme.cc \
+       ntlm/ntlmScheme.h \
+       ntlm/auth_ntlm.cc \
+       ntlm/auth_ntlm.h
+
+libnegotiate_a_SOURCES = \
+       negotiate/negotiateScheme.cc \
+       negotiate/negotiateScheme.h \
+       negotiate/auth_negotiate.cc \
+       negotiate/auth_negotiate.h
+
+# TODO: fix #include statements so that this is not needed
+INCLUDES += -I.
+
+
+check_PROGRAMS += testHeaders
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
-testHeaders: $(top_srcdir)/src/auth/basic/*.h $(top_srcdir)/src/auth/digest/*.h $(top_srcdir)/src/auth/ntlm/*.h $(top_srcdir)/src/auth/negotiate/*.h
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "basic" || exit 1
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "digest" || exit 1
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ntlm" || exit 1
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "negotiate" || exit 1
-## ./ has no .h files
+testHeaders: $(top_srcdir)/src/auth/*.h $(top_srcdir)/src/auth/basic/*.h $(top_srcdir)/src/auth/digest/*.h $(top_srcdir)/src/auth/ntlm/*.h $(top_srcdir)/src/auth/negotiate/*.h
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/auth/" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/auth/basic" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/auth/digest" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/auth/ntlm" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/auth/negotiate" || exit 1
 
 ## No such file...
 testHeaders.c:

diff --git a/src/AuthScheme.cc b/src/auth/Scheme.cc
similarity index 98%
rename from src/AuthScheme.cc
rename to src/auth/Scheme.cc
index 55699f545ed8cf66959ec733af25e77963dc9caa..4d3bf1cb07867e58ab985b8fba49536284df3698 100644 (file)
--- a/src/AuthScheme.cc
+++ b/src/auth/Scheme.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "AuthScheme.h"
+#include "auth/Scheme.h"
 #include "authenticate.h"
-#include "AuthConfig.h"
+#include "auth/Config.h"
 
 Vector<AuthScheme*> *AuthScheme::_Schemes = NULL;
 

diff --git a/src/AuthScheme.h b/src/auth/Scheme.h
similarity index 100%
rename from src/AuthScheme.h
rename to src/auth/Scheme.h

diff --git a/src/AuthUser.cc b/src/auth/User.cc
similarity index 99%
rename from src/AuthUser.cc
rename to src/auth/User.cc
index c8a47ef98facb1d9d0f9c790b05b3acf4764d06d..f0ce00f49ed0deebe4dd3feaa52ef5e6b8999aa8 100644 (file)
--- a/src/AuthUser.cc
+++ b/src/auth/User.cc
@@ -34,16 +34,16 @@
  */
 
 #include "squid.h"
-#include "AuthUser.h"
-#include "AuthUserRequest.h"
-#include "AuthConfig.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
+#include "auth/Config.h"
 #include "authenticate.h"
 #include "ACL.h"
 #include "event.h"
 #include "SquidTime.h"
 
 #ifndef _USE_INLINE_
-#include "AuthUser.cci"
+#include "auth/User.cci"
 #endif
 
 // This should be converted into a pooled type. Does not need to be cbdata

diff --git a/src/AuthUser.cci b/src/auth/User.cci
similarity index 100%
rename from src/AuthUser.cci
rename to src/auth/User.cci

diff --git a/src/AuthUser.h b/src/auth/User.h
similarity index 99%
rename from src/AuthUser.h
rename to src/auth/User.h
index 56f00eeca474778de62463c1ec0c8ac891f52acb..47a99337e93b54e3b0655b04fcf4b0cc53adb74f 100644 (file)
--- a/src/AuthUser.h
+++ b/src/auth/User.h
@@ -112,7 +112,7 @@ private:
 };
 
 #ifdef _USE_INLINE_
-#include "AuthUser.cci"
+#include "auth/User.cci"
 #endif
 
 #endif /* SQUID_AUTHUSER_H */

diff --git a/src/AuthUserRequest.cc b/src/auth/UserRequest.cc
similarity index 99%
rename from src/AuthUserRequest.cc
rename to src/auth/UserRequest.cc
index 1343427dc3018321799d0e656bf812ea0f4a3cfc..69423e2feccc97d1446b85138d58e8979fdb4bbb 100644 (file)
--- a/src/AuthUserRequest.cc
+++ b/src/auth/UserRequest.cc
@@ -41,14 +41,14 @@
  * See acl.c for access control and client_side.c for auditing */
 
 #include "squid.h"
-#include "AuthUserRequest.h"
-#include "AuthUser.h"
+#include "auth/UserRequest.h"
+#include "auth/User.h"
 /*#include "authenticate.h"
 #include "ACL.h"
 #include "client_side.h"
 */
-#include "AuthConfig.h"
-#include "AuthScheme.h"
+#include "auth/Config.h"
+#include "auth/Scheme.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 

diff --git a/src/AuthUserRequest.h b/src/auth/UserRequest.h
similarity index 100%
rename from src/AuthUserRequest.h
rename to src/auth/UserRequest.h

diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index 8907885bec9de394d70989abcbb56fc372c513f2..81c512f33e4306f715508b209d5331c32ae7dfda 100644 (file)
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -6,9 +6,9 @@
 #ifndef __AUTH_BASIC_H__
 #define __AUTH_BASIC_H__
 #include "authenticate.h"
-#include "AuthUser.h"
-#include "AuthUserRequest.h"
-#include "AuthConfig.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
+#include "auth/Config.h"
 #include "helper.h"
 
 #define DefaultAuthenticateChildrenMax  32     /* 32 processes */

diff --git a/src/auth/basic/basicScheme.h b/src/auth/basic/basicScheme.h
index a0884994f6d794dc5a34e93e536fa70fc8ed4db0..f431b10154b69550839d59752085850220ca3c1c 100644 (file)
--- a/src/auth/basic/basicScheme.h
+++ b/src/auth/basic/basicScheme.h
@@ -34,7 +34,7 @@
 #ifndef SQUID_BASICSCHEME_H
 #define SQUID_BASICSCHEME_H
 
-#include "AuthScheme.h"
+#include "auth/Scheme.h"
 
 /// \ingroup AuthAPI
 /// \ingroup AuthSchemeAPI

diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h
index 74fce505a05f680c54f45c0558c8c7539f191dd9..b8656d3d6fd7b99caa1016ab2346d6a7a63c8fb3 100644 (file)
--- a/src/auth/digest/auth_digest.h
+++ b/src/auth/digest/auth_digest.h
@@ -7,9 +7,9 @@
 #define __AUTH_DIGEST_H__
 #include "rfc2617.h"
 #include "authenticate.h"
-#include "AuthUser.h"
-#include "AuthUserRequest.h"
-#include "AuthConfig.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
+#include "auth/Config.h"
 #include "helper.h"
 
 /* Generic */

diff --git a/src/auth/digest/digestScheme.h b/src/auth/digest/digestScheme.h
index 941d4ffc2978fee1def8e5b5841960b3d4dd4e23..156044fe799797cdbb90aa47a2964814ed82d93a 100644 (file)
--- a/src/auth/digest/digestScheme.h
+++ b/src/auth/digest/digestScheme.h
@@ -34,7 +34,7 @@
 #ifndef SQUID_DIGESTSCHEME_H
 #define SQUID_DIGESTSCHEME_H
 
-#include "AuthScheme.h"
+#include "auth/Scheme.h"
 
 /// \ingroup AuthSchemeAPI
 /// \ingroup AuthAPI

diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h
index 8f32e78213b9552e724d6c19bb0366719da99853..2d38b61cd4b0def6fc978f5a56f2cf0e3759fff7 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.h
+++ b/src/auth/negotiate/auth_negotiate.h
@@ -6,9 +6,9 @@
 #ifndef __AUTH_NEGOTIATE_H__
 #define __AUTH_NEGOTIATE_H__
 #include "authenticate.h"
-#include "AuthUser.h"
-#include "AuthUserRequest.h"
-#include "AuthConfig.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
+#include "auth/Config.h"
 #include "helper.h"
 
 /**

diff --git a/src/auth/negotiate/negotiateScheme.h b/src/auth/negotiate/negotiateScheme.h
index 6abbdc5fd6d79b730a86bfc02ba0e88c3a4560d0..8923683f9c4df5cd3c4f0d377d100386a55d57c0 100644 (file)
--- a/src/auth/negotiate/negotiateScheme.h
+++ b/src/auth/negotiate/negotiateScheme.h
@@ -34,7 +34,7 @@
 #ifndef SQUID_NEGOTIATESCHEME_H
 #define SQUID_NEGOTIATESCHEME_H
 
-#include "AuthScheme.h"
+#include "auth/Scheme.h"
 
 /// \ingroup AuthSchemeAPI
 /// \ingroup AuthAPI

diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index 684d21f280eb9953596a0cfab9b63b7860858209..97239a4e221cf2fe9efd7dba4670189cba13258c 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -6,9 +6,9 @@
 #ifndef __AUTH_NTLM_H__
 #define __AUTH_NTLM_H__
 #include "authenticate.h"
-#include "AuthUser.h"
-#include "AuthUserRequest.h"
-#include "AuthConfig.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
+#include "auth/Config.h"
 #include "helper.h"
 
 #define DefaultAuthenticateChildrenMax  32     /* 32 processes */

diff --git a/src/auth/ntlm/ntlmScheme.h b/src/auth/ntlm/ntlmScheme.h
index 9af2f3a859ef45d1eb4da6013519d2dc557d7b57..94f10a9b3355754cf3079c45ad46f9152afb29d1 100644 (file)
--- a/src/auth/ntlm/ntlmScheme.h
+++ b/src/auth/ntlm/ntlmScheme.h
@@ -34,7 +34,7 @@
 #ifndef SQUID_NTLMSCHEME_H
 #define SQUID_NTLMSCHEME_H
 
-#include "AuthScheme.h"
+#include "auth/Scheme.h"
 
 /// \ingroup AuthSchemeAPI
 /// \ingroup AuthAPI

diff --git a/src/authenticate.cc b/src/authenticate.cc
index 4676201ac3856b2d4e70f2cd8bc95a3e7e48ca5c..f3fcbc41fbcaa6f2349ec3e2471875eefd913a5f 100644 (file)
--- a/src/authenticate.cc
+++ b/src/authenticate.cc
@@ -41,9 +41,9 @@
 #include "authenticate.h"
 #include "ACL.h"
 #include "client_side.h"
-#include "AuthConfig.h"
-#include "AuthScheme.h"
-#include "AuthUser.h"
+#include "auth/Config.h"
+#include "auth/Scheme.h"
+#include "auth/User.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index d4f563d24a5dbd3ed9269587f0c9ae11388d78a8..b19bf1b10ff2b262e4edddfedcd7e44c40ea4803 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -36,8 +36,8 @@
 #include "authenticate.h"
 #include "ProtoPort.h"
 #include "HttpRequestMethod.h"
-#include "AuthConfig.h"
-#include "AuthScheme.h"
+#include "auth/Config.h"
+#include "auth/Scheme.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "SwapDir.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index e91d70d0c54c47f00080fc083817a9c2e0dfe090..4934d55126ae227d1084ca3d925d39f66b9067ca 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -85,7 +85,7 @@
 #include "client_side.h"
 #include "clientStream.h"
 #include "ProtoPort.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "Store.h"
 #include "comm.h"
 #include "HttpHdrContRange.h"

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index fc024c596f0847618f752f03ee98f85cf91cf489..277a215ff739f4f884a27bdaead8df74646332b7 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -46,7 +46,7 @@
 #include "HttpRequest.h"
 #include "forward.h"
 #include "clientStream.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #if USE_SQUID_ESI
 #include "ESI.h"
 #endif

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 781e7dcab3be139f386813fbe8c4603948edd5fa..f59e386162208f1ba459b726d0cb91370c6745b5 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -45,7 +45,7 @@
 #include "squid.h"
 #include "clientStream.h"
 #include "client_side_request.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "HttpRequest.h"
 #include "ProtoPort.h"
 #include "ACLChecklist.h"

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 026500a3431ad7893d8122f07401b6043c4222aa..02d41d746279b622282d8b9798d55c2e1c9653b8 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -35,7 +35,7 @@
 #include "config.h"
 
 #include "errorpage.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "HttpReply.h"

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 7adc8f610bf9f23f1e8302d00a1a90c8d6a347cb..7948822189b75ad88674021bafe3937b26c657a1 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -44,7 +44,7 @@
 #include "CacheManager.h"
 #include "ExternalACL.h"
 #include "ExternalACLEntry.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "SquidTime.h"
 #include "Store.h"
 #include "fde.h"

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index a5b20eefd072eaf89c140cb7f96e807c92c5b340..858fd60140cc185e7af60851fb3cc19e223a545a 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,47 +1,51 @@
-#  Makefile for storage modules in the Squid Object Cache server
-#
-#  $Id$
-#
+include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-AM_CFLAGS = @SQUID_CFLAGS@
-AM_CXXFLAGS = @SQUID_CXXFLAGS@
-CLEANFILES = 
+EXTRA_LIBRARIES = libaufs.a libdiskd.a libcoss.a libufs.a
+noinst_LIBRARIES = @STORE_LIBS_TO_BUILD@
 
-EXTRA_LIBRARIES = libcoss.a libufs.a
-noinst_LIBRARIES = @STORE_LIBS@
+## TODO: add libfs -- file system framework; this library is always built
+## TODO: use libtool and add @STORE_LIBS_TO_BUILD@ to libfs.la
+
+# aufs is a "fake" legacy store
+libaufs_a_SOURCES = \
+       aufs/StoreFSaufs.cc
+
+# diskd is a "fake" legacy store
+libdiskd_a_SOURCES = \
+       diskd/StoreFSdiskd.cc
 
 libcoss_a_SOURCES = \
+       coss/StoreFScoss.h \
+       coss/StoreFScoss.cc \
        coss/store_coss.h \
        coss/store_io_coss.cc \
        coss/store_dir_coss.cc \
        coss/CossSwapDir.h
 
-libufs_a_SOURCES = ufs/store_dir_ufs.cc ufs/store_io_ufs.cc \
+libufs_a_SOURCES = \
+       ufs/StoreFSufs.h \
+       ufs/StoreFSufs.cc \
+       ufs/store_dir_ufs.cc \
+       ufs/store_io_ufs.cc \
        ufs/ufscommon.cci \
        ufs/ufscommon.cc \
        ufs/ufscommon.h 
 
 
 EXTRA_DIST = \
-       coss/coss-notes.txt \
-       coss/StoreFScoss.h \
-       ufs/StoreFSufs.h
+       coss/coss-notes.txt
+
+# TODO: fix #include statements so that this is not needed
+INCLUDES += -I.
 
-INCLUDES = \
-       -I$(top_srcdir) \
-       -I. \
-       -I$(top_builddir)/include \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src
 
-check_PROGRAMS=testHeaders
+check_PROGRAMS += testHeaders
 
 ## Special Universal .h dependency test script
 ## aborts if error encountered
 testHeaders: $(top_srcdir)/src/fs/ufs/*.h $(top_srcdir)/src/fs/coss/*.h
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ufs" || exit 1
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "coss" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/fs/ufs" || exit 1
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/fs/coss" || exit 1
 ## diskd/ has no .h files
 ## aufs/ has no .h files
 ## ./ has no .h files

diff --git a/src/http.cc b/src/http.cc
index 2b307f7ed88e7d515529350ff4398e14d82f2506..f59de00b26b241556c3fef1f4df1bf25b95d41d4 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -42,7 +42,7 @@
 #include "errorpage.h"
 #include "MemBuf.h"
 #include "http.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "Store.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"

diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc
index 957280547295f151ee53376481b8d9fb82fce82f..5d4255ff0cf03eafed3dab1d8cbe09b927e9e792 100644 (file)
--- a/src/peer_userhash.cc
+++ b/src/peer_userhash.cc
@@ -38,7 +38,7 @@
 #include "CacheManager.h"
 #include "Store.h"
 #include "HttpRequest.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 
 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
 

diff --git a/src/redirect.cc b/src/redirect.cc
index 6d9ad53ac951f412d40e879ff9c205dca6d33821..cff7013bb2ea46c517f94102f8ce95eb894119e4 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -34,7 +34,7 @@
  */
 
 #include "squid.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "fde.h"

diff --git a/src/stat.cc b/src/stat.cc
index a7013901b120e414ccd0c573e9b1c50a5db3f00f..9bc2200ad3a7f028d72cef9bb85ae2065c3ff103 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -35,7 +35,7 @@
 #include "squid.h"
 #include "event.h"
 #include "StoreClient.h"
-#include "AuthUserRequest.h"
+#include "auth/UserRequest.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "HttpRequest.h"

diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc
index ba2dc731957d3549d207f6956d5cd9a2afb3a40a..75bc3bad535c6cc43eef815f174efe2d288116d0 100644 (file)
--- a/src/tests/testAuth.cc
+++ b/src/tests/testAuth.cc
@@ -3,9 +3,9 @@
 #include "squid.h"
 #include "testAuth.h"
 #include "authenticate.h"
-#include "AuthUserRequest.h"
-#include "AuthScheme.h"
-#include "AuthConfig.h"
+#include "auth/UserRequest.h"
+#include "auth/Scheme.h"
+#include "auth/Config.h"
 #include "Mem.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testAuth );