hgomez 2004/02/03 07:28:25
Modified: jk/native2/server/apache13 mod_jk2.dsp
jk/native2/server/isapi isapi.dsp
jk/native2/server/aolserver nsjk2.dsp
jk/native2/jni jkjni.dsp
Removed: jk/native2/common jk_channel_socket.c
Log:
Remove obsolete jk_channel_socket.c
Revision Changes Path
1.4 +0 -4 jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp
Index: mod_jk2.dsp
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/mod_jk2.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_jk2.dsp 3 May 2003 18:09:26 -0000 1.3
+++ mod_jk2.dsp 3 Feb 2004 15:28:25 -0000 1.4
@@ -162,10 +162,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\common\jk_channel_socket.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\common\jk_channel_un.c
# End Source File
# Begin Source File
1.23 +406 -410 jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp
Index: isapi.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/isapi.dsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- isapi.dsp 30 Oct 2003 20:14:33 -0000 1.22
+++ isapi.dsp 3 Feb 2004 15:28:25 -0000 1.23
@@ -1,410 +1,406 @@
-# Microsoft Developer Studio Project File - Name="isapi" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=isapi - 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 "isapi.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 "isapi.mak" CFG="isapi - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "isapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "isapi - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugS"
-# PROP BASE Intermediate_Dir "DebugS"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\..\srclib\apr\include"
/I "..\..\srclib\apr-util\include" /I "..\..\srclib\apr-iconv\include" /I
"..\..\srclib\pcre" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D
"ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/debug /machine:I386 /out:"Debug/isapi_redirector2.dll" /pdbtype:sept
/libpath:"$(APACHE2_HOME)\lib"
-# SUBTRACT BASE LINK32 /nodefaultlib
-# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib
pcre.lib pcreposix.lib /nologo /dll /debug /machine:I386
/out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"..\..\srclib\apr\libD"
/libpath:"..\..\srclib\apr-util\libD" /libpath:"..\..\srclib\apr-iconv\libD"
/libpath:"..\..\srclib\pcre\libD"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ELSEIF "$(CFG)" == "isapi - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /FR /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "..\..\srclib\apr\include" /I
"..\..\srclib\apr-util\include" /I "..\..\srclib\apr-iconv\include" /I
"..\..\srclib\pcre" /D "NDEBUG" /D "_WIN32" /D "APR_DECLARE_STATIC" /D
"APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib"
-# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib
pcre.lib pcreposix.lib /nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll"
/libpath:"..\..\srclib\apr\libR" /libpath:"..\..\srclib\apr-util\libR"
/libpath:"..\..\srclib\apr-iconv\libR" /libpath:"..\..\srclib\pcre\libD"
-
-!ENDIF
-
-# Begin Target
-
-# Name "isapi - Win32 Debug"
-# Name "isapi - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\isapi.def
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_channel.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_channel_apr_socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_channel_jni.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_channel_socket.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_channel_un.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_config.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_config_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_endpoint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_env.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_handler_logon.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_handler_response.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jk_iis_thread_pool.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jk_isapi_plugin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\jni\jk_jni_aprImpl.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_logger_file.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_logger_win32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_map.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_msg_ajp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_mutex.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_mutex_proc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_mutex_thread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_nwmain.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_objCache.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_pool.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_pool_apr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_registry.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_requtil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\jk_service_iis.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_shm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_signal.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_uriEnv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_uriMap.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_user.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_vm_default.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_worker_ajp13.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_worker_jni.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_worker_lb.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_worker_run.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_worker_status.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_workerEnv.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\jk_channel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_endpoint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_env.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_global.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_handler.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\jk_iis.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_logger.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_logger_win32_message.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_map.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_md5.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_msg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_mt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_objCache.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_pool.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_registry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_requtil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_service.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_shm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_uriEnv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_uriMap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_vm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_worker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\jk_workerEnv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\common\jk_logger_win32_message.mc
-
-!IF "$(CFG)" == "isapi - Win32 Debug"
-
-# PROP BASE Ignore_Default_Tool 1
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating resources from $(InputPath)
-InputDir=\WORK\PROJECTS\apache\jk2\common
-InputPath=..\..\common\jk_logger_win32_message.mc
-
-"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- mc -h $(InputDir) -r $(InputDir) $(InputPath)
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "isapi - Win32 Release"
-
-# Begin Custom Build - Creating resources from $(InputPath)
-InputDir=\WORK\PROJECTS\apache\jk2\common
-InputPath=..\..\common\jk_logger_win32_message.mc
-
-"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- mc -h $(InputDir) -r $(InputDir) $(InputPath)
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\jk_logger_win32_message.rc
-# End Source File
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="isapi" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=isapi - 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 "isapi.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 "isapi.mak" CFG="isapi - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "isapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "isapi - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "DebugS"
+# PROP BASE Intermediate_Dir "DebugS"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I
"$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\..\srclib\apr\include"
/I "..\..\srclib\apr-util\include" /I "..\..\srclib\apr-iconv\include" /I
"..\..\srclib\pcre" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /D
"API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D
"ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/debug /machine:I386 /out:"Debug/isapi_redirector2.dll" /pdbtype:sept
/libpath:"$(APACHE2_HOME)\lib"
+# SUBTRACT BASE LINK32 /nodefaultlib
+# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib
pcre.lib pcreposix.lib /nologo /dll /debug /machine:I386
/out:"Debug/isapi_redirector2.dll" /pdbtype:sept /libpath:"..\..\srclib\apr\libD"
/libpath:"..\..\srclib\apr-util\libD" /libpath:"..\..\srclib\apr-iconv\libD"
/libpath:"..\..\srclib\pcre\libD"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ELSEIF "$(CFG)" == "isapi - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include"
/I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I
"$(APACHE2_HOME)\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /I "..\..\srclib\apr\include" /I
"..\..\srclib\apr-util\include" /I "..\..\srclib\apr-iconv\include" /I
"..\..\srclib\pcre" /D "NDEBUG" /D "_WIN32" /D "APR_DECLARE_STATIC" /D
"APU_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ISAPI_EXPORTS" /D "HAVE_JNI" /D "HAS_APR" /D "HAS_PCRE" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 libapr.lib libaprutil.lib wsock32.lib advapi32.lib /nologo /dll
/machine:I386 /out:"Release/isapi_redirector2.dll" /libpath:"$(APACHE2_HOME)\lib"
+# ADD LINK32 apr.lib aprutil.lib apriconv.lib ws2_32.lib wsock32.lib advapi32.lib
pcre.lib pcreposix.lib /nologo /dll /machine:I386 /out:"Release/isapi_redirector2.dll"
/libpath:"..\..\srclib\apr\libR" /libpath:"..\..\srclib\apr-util\libR"
/libpath:"..\..\srclib\apr-iconv\libR" /libpath:"..\..\srclib\pcre\libD"
+
+!ENDIF
+
+# Begin Target
+
+# Name "isapi - Win32 Debug"
+# Name "isapi - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\isapi.def
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_channel.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_channel_apr_socket.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_channel_jni.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_channel_un.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_config.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_config_file.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_endpoint.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_env.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_handler_logon.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_handler_response.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jk_iis_thread_pool.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jk_isapi_plugin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jni\jk_jni_aprImpl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_logger_file.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_logger_win32.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_map.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_md5.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_msg_ajp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_mutex.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_mutex_proc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_mutex_thread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_nwmain.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_objCache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_pool.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_pool_apr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_registry.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_requtil.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\jk_service_iis.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_shm.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_signal.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_uriEnv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_uriMap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_user.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_vm_default.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_worker_ajp13.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_worker_jni.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_worker_lb.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_worker_run.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_worker_status.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_workerEnv.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\include\jk_channel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_endpoint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_env.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_global.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\jk_iis.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_logger.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_logger_win32_message.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_map.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_msg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_mt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_objCache.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_pool.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_registry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_requtil.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_service.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_shm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_uriEnv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_uriMap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_vm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_worker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\jk_workerEnv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\jni\org_apache_jk_apr_AprImpl.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\..\common\jk_logger_win32_message.mc
+
+!IF "$(CFG)" == "isapi - Win32 Debug"
+
+# PROP BASE Ignore_Default_Tool 1
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating resources from $(InputPath)
+InputDir=\WORK\PROJECTS\apache\jk2\common
+InputPath=..\..\common\jk_logger_win32_message.mc
+
+"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ mc -h $(InputDir) -r $(InputDir) $(InputPath)
+
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "isapi - Win32 Release"
+
+# Begin Custom Build - Creating resources from $(InputPath)
+InputDir=\WORK\PROJECTS\apache\jk2\common
+InputPath=..\..\common\jk_logger_win32_message.mc
+
+"..\..\common\jk_logger_win32_message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ mc -h $(InputDir) -r $(InputDir) $(InputPath)
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\common\jk_logger_win32_message.rc
+# End Source File
+# End Group
+# End Target
+# End Project
1.2 +0 -4 jakarta-tomcat-connectors/jk/native2/server/aolserver/nsjk2.dsp
Index: nsjk2.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/aolserver/nsjk2.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsjk2.dsp 5 May 2003 06:37:20 -0000 1.1
+++ nsjk2.dsp 3 Feb 2004 15:28:25 -0000 1.2
@@ -232,10 +232,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\common\jk_channel_socket.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\common\jk_channel_un.c
# End Source File
# Begin Source File
1.6 +0 -4 jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp
Index: jkjni.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/jni/jkjni.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jkjni.dsp 8 Aug 2002 18:21:41 -0000 1.5
+++ jkjni.dsp 3 Feb 2004 15:28:25 -0000 1.6
@@ -104,10 +104,6 @@
# End Source File
# Begin Source File
-SOURCE=..\common\jk_channel_socket.c
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_channel_un.c
# End Source File
# Begin Source File
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
