Here's the simpler solution to the two groups of mappers/ modules...

The mod_so and mod_watchdog are truly not mappers/ at all.  Very open
to better names than modules/core/ but these are clearly API's which
are to be consumed by the httpd core, or generically, any module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772848 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 22 insertions, 17 deletions

diff --git a/Apache.dsw b/Apache.dsw
index f7d642e396..dc4bbbb73b 100644
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -2996,7 +2996,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_watchdog"=.\modules\mappers\mod_watchdog.dsp - Package Owner=<4>
+Project: "mod_watchdog"=.\modules\core\mod_watchdog.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/Makefile.in b/Makefile.in
index f00eef6a2d..55a624804a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -181,6 +181,9 @@ INSTALL_HEADERS = \
 	include/*.h \
 	$(srcdir)/include/*.h \
 	$(srcdir)/os/$(OS_DIR)/os.h \
+	$(srcdir)/modules/core/mod_so.h \
+	$(srcdir)/modules/core/mod_watchdog.h \
+	$(srcdir)/modules/cache/mod_cache.h \
 	$(srcdir)/modules/database/mod_dbd.h \
 	$(srcdir)/modules/dav/main/mod_dav.h \
 	$(srcdir)/modules/filters/mod_include.h \
@@ -192,10 +195,6 @@ INSTALL_HEADERS = \
 	$(srcdir)/modules/proxy/mod_serf.h \
         ${srcdir}/modules/session/mod_session.h \
 	$(srcdir)/modules/ssl/mod_ssl.h \
-	$(srcdir)/modules/mappers/mod_so.h \
-	$(srcdir)/modules/mappers/mod_rewrite.h \
-	$(srcdir)/modules/mappers/mod_watchdog.h \
-	$(srcdir)/modules/cache/mod_cache.h \
 	$(srcdir)/os/$(OS_DIR)/*.h
 
 install-include:
diff --git a/Makefile.win b/Makefile.win
index e1e2faf8a9..973765eefb 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -340,6 +340,9 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_socache_memcache.mak CFG="mod_socache_memcache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_socache_shmcb.mak CFG="mod_socache_shmcb - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
+	cd modules\core
+	 $(MAKE) $(MAKEOPT) -f mod_watchdog.mak    CFG="mod_watchdog - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+	cd ..\..
 	cd modules\cluster
 	 $(MAKE) $(MAKEOPT) -f mod_heartbeat.mak   CFG="mod_heartbeat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_heartmonitor.mak CFG="mod_heartmonitor - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -416,7 +419,6 @@ _build:
 	 $(MAKE) $(MAKEOPT) -f mod_speling.mak     CFG="mod_speling - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_userdir.mak     CFG="mod_userdir - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_vhost_alias.mak CFG="mod_vhost_alias - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	 $(MAKE) $(MAKEOPT) -f mod_watchdog.mak    CFG="mod_watchdog - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ..\..
 	cd modules\metadata
 	 $(MAKE) $(MAKEOPT) -f mod_cern_meta.mak   CFG="mod_cern_meta - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -906,19 +908,20 @@ BEGIN {
 		srclib\apr-util\include\*.h \
 		include\*.h \
 		os\win32\os.h \
+		modules\cache\mod_cache.h \
+		modules\core\mod_so.h \
+		modules\core\mod_watchdog.h \
 		modules\database\mod_dbd.h \
 		modules\dav\main\mod_dav.h \
 		modules\filters\mod_include.h \
 		modules\generators\mod_cgi.h \
 		modules\generators\mod_status.h \
 		modules\loggers\mod_log_config.h \
+		modules\mappers\mod_rewrite.h \
 		modules\proxy\mod_proxy.h \
 		modules\proxy\mod_serf.h \
 		modules\ssl\mod_ssl.h \
-		modules\mappers\mod_so.h \
-		modules\mappers\mod_rewrite.h \
-		modules\mappers\mod_watchdog.h \
-		modules\cache\mod_cache.h ) do \
+          ) do \
 	    @copy %f "$(INSTDIR)\include" < .y > nul
 	copy srclib\apr\Lib$(SHORT)\apr-1.lib		"$(INSTDIR)\lib" <.y
 	copy srclib\apr\Lib$(SHORT)\apr-1.pdb		"$(INSTDIR)\lib" <.y
diff --git a/configure.in b/configure.in
index b93773bc24..44fcf3ff0e 100644
--- a/configure.in
+++ b/configure.in
@@ -216,7 +216,7 @@ if test "$abs_builddir" != "$abs_srcdir"; then
   APR_ADDTO(INCLUDES, [-I\$(top_builddir)/include])
 fi
 
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/aaa -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/modules/session -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators -I\$(top_srcdir)/modules/mappers -I\$(top_srcdir)/modules/database])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/aaa -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/modules/session -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/core -I\$(top_srcdir)/modules/generators  -I\$(top_srcdir)/modules/mappers -I\$(top_srcdir)/modules/database])
 
 # apr/apr-util --includes may pick up system paths for dependent
 # libraries, so ensure these are later in INCLUDES than local source
diff --git a/libhttpd.dsp b/libhttpd.dsp
index 72856b9e08..01d7524fde 100644
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -284,16 +284,16 @@ InputPath=.\modules\proxy\mod_proxy.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\mappers\mod_so.h
+SOURCE=.\modules\core\mod_so.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating include/mod_so.h
-InputPath=.\modules\mappers\mod_so.h
+InputPath=.\modules\core\mod_so.h
 
 ".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\modules\mappers\mod_so.h > .\include\mod_so.h
+	type .\modules\core\mod_so.h > .\include\mod_so.h
 
 # End Custom Build
 
@@ -301,10 +301,10 @@ InputPath=.\modules\mappers\mod_so.h
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build - Creating include/mod_so.h
-InputPath=.\modules\mappers\mod_so.h
+InputPath=.\modules\core\mod_so.h
 
 ".\include\mod_so.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	type .\modules\mappers\mod_so.h > .\include\mod_so.h
+	type .\modules\core\mod_so.h > .\include\mod_so.h
 
 # End Custom Build
 
diff --git a/modules/core/Makefile.in b/modules/core/Makefile.in
new file mode 100644
index 0000000000..167b343d0d
--- /dev/null
+++ b/modules/core/Makefile.in
@@ -0,0 +1,3 @@
+
+include $(top_srcdir)/build/special.mk
+
diff --git a/modules/mappers/config.m4 b/modules/core/config.m4
index 5cecf0f5d7..84e71060ec 100644
--- a/modules/mappers/config.m4
+++ b/modules/core/config.m4
@@ -2,7 +2,7 @@ dnl modules enabled in this directory by default
 
 dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
-APACHE_MODPATH_INIT(mappers)
+APACHE_MODPATH_INIT(core)
 
 APR_CHECK_APR_DEFINE(APR_HAS_DSO)
 
diff --git a/modules/mappers/mod_so.c b/modules/core/mod_so.c
index d7bd2e71a4..d7bd2e71a4 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/core/mod_so.c
diff --git a/modules/mappers/mod_so.h b/modules/core/mod_so.h
index d4ee05b149..d4ee05b149 100644
--- a/modules/mappers/mod_so.h
+++ b/modules/core/mod_so.h
diff --git a/modules/mappers/mod_watchdog.c b/modules/core/mod_watchdog.c
index 838171b098..838171b098 100644
--- a/modules/mappers/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
diff --git a/modules/mappers/mod_watchdog.dsp b/modules/core/mod_watchdog.dsp
index fcb1f28c9f..fcb1f28c9f 100644
--- a/modules/mappers/mod_watchdog.dsp
+++ b/modules/core/mod_watchdog.dsp
diff --git a/modules/mappers/mod_watchdog.h b/modules/core/mod_watchdog.h
index c99712f8d7..c99712f8d7 100644
--- a/modules/mappers/mod_watchdog.h
+++ b/modules/core/mod_watchdog.h