httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r772848 - in /httpd/httpd/trunk: ./ modules/core/ modules/mappers/
Date Fri, 08 May 2009 05:46:29 GMT
Author: wrowe
Date: Fri May  8 05:46:28 2009
New Revision: 772848

URL: http://svn.apache.org/viewvc?rev=772848&view=rev
Log:
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.

Added:
    httpd/httpd/trunk/modules/core/
    httpd/httpd/trunk/modules/core/Makefile.in   (props changed)
      - copied unchanged from r772819, httpd/httpd/trunk/modules/mappers/Makefile.in
    httpd/httpd/trunk/modules/core/config.m4
      - copied, changed from r772819, httpd/httpd/trunk/modules/mappers/config.m4
    httpd/httpd/trunk/modules/core/mod_so.c   (props changed)
      - copied unchanged from r771610, httpd/httpd/trunk/modules/mappers/mod_so.c
    httpd/httpd/trunk/modules/core/mod_so.h   (props changed)
      - copied unchanged from r771610, httpd/httpd/trunk/modules/mappers/mod_so.h
    httpd/httpd/trunk/modules/core/mod_watchdog.c   (props changed)
      - copied unchanged from r771610, httpd/httpd/trunk/modules/mappers/mod_watchdog.c
    httpd/httpd/trunk/modules/core/mod_watchdog.dsp   (props changed)
      - copied unchanged from r771610, httpd/httpd/trunk/modules/mappers/mod_watchdog.dsp
    httpd/httpd/trunk/modules/core/mod_watchdog.h   (props changed)
      - copied unchanged from r771610, httpd/httpd/trunk/modules/mappers/mod_watchdog.h
Removed:
    httpd/httpd/trunk/modules/mappers/config.m4
    httpd/httpd/trunk/modules/mappers/mod_so.c
    httpd/httpd/trunk/modules/mappers/mod_so.h
    httpd/httpd/trunk/modules/mappers/mod_watchdog.c
    httpd/httpd/trunk/modules/mappers/mod_watchdog.dsp
    httpd/httpd/trunk/modules/mappers/mod_watchdog.h
Modified:
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/Makefile.in
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/configure.in
    httpd/httpd/trunk/libhttpd.dsp

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=772848&r1=772847&r2=772848&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Fri May  8 05:46:28 2009
@@ -2996,7 +2996,7 @@
 
 ###############################################################################
 
-Project: "mod_watchdog"=.\modules\mappers\mod_watchdog.dsp - Package Owner=<4>
+Project: "mod_watchdog"=.\modules\core\mod_watchdog.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=772848&r1=772847&r2=772848&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Fri May  8 05:46:28 2009
@@ -181,6 +181,9 @@
 	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 @@
 	$(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:

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=772848&r1=772847&r2=772848&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Fri May  8 05:46:28 2009
@@ -340,6 +340,9 @@
 	 $(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 @@
 	 $(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 @@
 		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

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=772848&r1=772847&r2=772848&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Fri May  8 05:46:28 2009
@@ -216,7 +216,7 @@
   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

Modified: httpd/httpd/trunk/libhttpd.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/libhttpd.dsp?rev=772848&r1=772847&r2=772848&view=diff
==============================================================================
--- httpd/httpd/trunk/libhttpd.dsp (original)
+++ httpd/httpd/trunk/libhttpd.dsp Fri May  8 05:46:28 2009
@@ -284,16 +284,16 @@
 # 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 @@
 
 # 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
 

Propchange: httpd/httpd/trunk/modules/core/Makefile.in
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/Makefile.in
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: httpd/httpd/trunk/modules/core/config.m4 (from r772819, httpd/httpd/trunk/modules/mappers/config.m4)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/config.m4?p2=httpd/httpd/trunk/modules/core/config.m4&p1=httpd/httpd/trunk/modules/mappers/config.m4&r1=772819&r2=772848&rev=772848&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/config.m4 (original)
+++ httpd/httpd/trunk/modules/core/config.m4 Fri May  8 05:46:28 2009
@@ -2,7 +2,7 @@
 
 dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 
-APACHE_MODPATH_INIT(mappers)
+APACHE_MODPATH_INIT(core)
 
 APR_CHECK_APR_DEFINE(APR_HAS_DSO)
 

Propchange: httpd/httpd/trunk/modules/core/mod_so.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/mod_so.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May  8 05:46:28 2009
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/mappers/mod_so.c:723609-723841

Propchange: httpd/httpd/trunk/modules/core/mod_so.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/mod_so.h
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May  8 05:46:28 2009
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/mappers/mod_so.h:723609-723841

Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May  8 05:46:28 2009
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.c:723609-723841

Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.dsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.dsp
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May  8 05:46:28 2009
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.dsp:723609-723841

Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/core/mod_watchdog.h
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May  8 05:46:28 2009
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/mappers/mod_watchdog.h:723609-723841



Mime
View raw message