s/mod_example/mod_example_hooks/

and move mod_example_hooks, mod_case_filter[_in] to modules/examples/

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

diff --git a/Apache.dsw b/Apache.dsw
index 6be21790a020a7e251e79c0a530f06089966a773..0a1f2b0d9f854bfd3d44b16f8f9c003f0c47f999 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -66,7 +66,7 @@ Package=<4>
     Project_Dep_Name mod_echo
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_example
+    Project_Dep_Name mod_example_hooks
     End Project Dependency
 }}}
 
@@ -1213,7 +1213,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_case_filter"=.\modules\experimental\mod_case_filter.dsp - Package Owner=<4>
+Project: "mod_case_filter"=.\modules\examples\mod_case_filter.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1234,9 +1234,9 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_case_filter_in"=.\modules\experimental\mod_case_filter_in.dsp - Package Owner=<4>
+Project: "mod_case_filter_in"=.\modules\examples\mod_case_filter_in.dsp - Package Owner=<4>
 
-Package=<5>
+Packag=<5>
 {{{
 }}}
 
@@ -1537,7 +1537,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_example"=.\modules\experimental\mod_example.dsp - Package Owner=<4>
+Project: "mod_example_hooks"=.\modules\examples\mod_example_hooks.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Makefile.win b/Makefile.win
index 17c54886c81e68980ae31e67807754f7310bf9df..e0836d5dfa2b96bc2707479e15bc527a51419154 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -285,12 +285,14 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_echo.mak        CFG="mod_echo - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
        cd ..\..
-       cd modules\experimental
 !IFDEF ALL
+       cd modules\examples
         $(MAKE) $(MAKEOPT) -f mod_case_filter.mak CFG="mod_case_filter - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_case_filter_in.mak CFG="mod_case_filter_in - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_example.mak     CFG="mod_example - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_example_hooks.mak  CFG="mod_example_hooks - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+       cd ..\..
 !ENDIF
+       cd modules\experimental
         $(MAKE) $(MAKEOPT) -f mod_substitute.mak CFG="mod_substitute - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd modules\filters
@@ -471,9 +473,9 @@ _copybin:
        copy modules\debugging\$(LONG)\mod_dumpio.$(src_so)     "$(inst_so)" <.y
 !IFDEF ALL
        copy modules\echo\$(LONG)\mod_echo.$(src_so)            "$(inst_so)" <.y
-       copy modules\experimental\$(LONG)\mod_case_filter.$(src_so)     "$(inst_so)" <.y
-       copy modules\experimental\$(LONG)\mod_case_filter_in.$(src_so)  "$(inst_so)" <.y
-       copy modules\experimental\$(LONG)\mod_example.$(src_so)         "$(inst_so)" <.y
+       copy modules\examples\$(LONG)\mod_case_filter.$(src_so) "$(inst_so)" <.y
+       copy modules\examples\$(LONG)\mod_case_filter_in.$(src_so)      "$(inst_so)" <.y
+       copy modules\examples\$(LONG)\mod_example_hooks.$(src_so)       "$(inst_so)" <.y
 !ENDIF
        copy modules\experimental\$(LONG)\mod_substitute.$(src_so)      "$(inst_so)" <.y
        copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y

diff --git a/modules/examples/mod_example_hooks.dsp b/modules/examples/mod_example_hooks.dsp
index 47b6fe339ec82a033eed0f1d78671eb1061f6df1..abf2fc43a3d4769cd39e30ef8fda5ea422d9d4df 100644 (file)
--- a/modules/examples/mod_example_hooks.dsp
+++ b/modules/examples/mod_example_hooks.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="mod_example" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_example_hooks" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=mod_example - Win32 Debug
+CFG=mod_example_hooks - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "mod_example.mak".
+!MESSAGE NMAKE /f "mod_example_hooks.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "mod_example.mak" CFG="mod_example - Win32 Debug"
+!MESSAGE NMAKE /f "mod_example_hooks.mak" CFG="mod_example_hooks - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "mod_example - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "mod_example - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_example_hooks - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_example_hooks - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "mod_example - Win32 Release"
+!IF  "$(CFG)" == "mod_example_hooks - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -43,25 +43,25 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_example_src" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_example_hooks_src" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /fo"Release/mod_example.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_example.so" /d LONG_NAME="example_module for Apache"
+# ADD RSC /l 0x409 /fo"Release/mod_example_hooks.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_example_hooks.so" /d LONG_NAME="example_hooks_module for Apache"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_example.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example.so
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_example.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example.so /opt:ref
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_example_hooks.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example_hooks.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_example_hooks.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example_hooks.so /opt:ref
 # Begin Special Build Tool
-TargetPath=.\Release\mod_example.so
+TargetPath=.\Release\mod_example_hooks.so
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
 # End Special Build Tool
 
-!ELSEIF  "$(CFG)" == "mod_example - Win32 Debug"
+!ELSEIF  "$(CFG)" == "mod_example_hooks - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -75,19 +75,19 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_example_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_example_hooks_src" /FD /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /fo"Debug/mod_example.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_example.so" /d LONG_NAME="example_module for Apache"
+# ADD RSC /l 0x409 /fo"Debug/mod_example_hooks.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_example_hooks.so" /d LONG_NAME="example_hooks_module for Apache"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_example.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example.so
-# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_example.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example.so
+# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_example_hooks.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example_hooks.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_example_hooks.so" /base:@..\..\os\win32\BaseAddr.ref,mod_example_hooks.so
 # Begin Special Build Tool
-TargetPath=.\Debug\mod_example.so
+TargetPath=.\Debug\mod_example_hooks.so
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -97,11 +97,11 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma
 
 # Begin Target
 
-# Name "mod_example - Win32 Release"
-# Name "mod_example - Win32 Debug"
+# Name "mod_example_hooks - Win32 Release"
+# Name "mod_example_hooks - Win32 Debug"
 # Begin Source File
 
-SOURCE=.\mod_example.c
+SOURCE=.\mod_example_hooks.c
 # End Source File
 # Begin Source File
 

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 2db22f5c7538c796b066900f28727b71163fbff9..86f8ea0297c65f5fc16ccab21158794c3956042c 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -79,7 +79,7 @@ mod_proxy_fcgi.so       0x6F9D0000    0x00010000
 mod_authn_core.so       0x6F9C0000    0x00010000
 mod_authz_dbd.so        0x6F9B0000    0x00010000
 mod_authz_owner.so      0x6F9A0000    0x00010000
-mod_example.so          0x6F990000    0x00010000
+mod_example_hooks.so    0x6F990000    0x00010000
 mod_case_filter.so      0x6F980000    0x00010000
 mod_case_filter_in.so   0x6F970000    0x00010000
 mod_substitute.so       0x6F960000    0x00010000