Author: mturk
Date: Mon Nov 14 15:02:15 2011
New Revision: 1201736
URL: http://svn.apache.org/viewvc?rev=1201736&view=rev
Log:
Axe jni worker from build files, and remove jni build dependency
Modified:
tomcat/jk/trunk/native/apache-1.3/Makefile.vc
tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp
tomcat/jk/trunk/native/netscape/Makefile.vc
tomcat/jk/trunk/native/netscape/nsapi.dsp
Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.vc?rev=1201736&r1=1201735&r2=1201736&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.vc (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.vc Mon Nov 14 15:02:15 2011
@@ -31,7 +31,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_ajp_common.obj"
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
- -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -70,7 +69,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_ajp_common.obj" \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
- "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -90,7 +88,7 @@ LINK32_OBJS= \
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(APACHE1_HOME)\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" $(DEF_EAPI) /D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\mod_jk_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(APACHE1_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" $(DEF_EAPI) /D "MOD_JK_EXPORTS" /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\mod_jk_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -173,12 +171,6 @@ SOURCE=..\common\jk_context.c
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
SOURCE=..\common\jk_lb_worker.c
"$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp?rev=1201736&r1=1201735&r2=1201736&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.dsp Mon Nov 14 15:02:15 2011
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I
"$(APACHE1_HOME)\src\os\win32" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Release\mod_jk_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "..\common" /I
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I
"$(APACHE1_HOME)\src\os\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Release\mod_jk_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MOD_JK_EXPORTS" /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I
"$(APACHE1_HOME)\src\os\win32" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Debug\mod_jk_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(APACHE1_HOME)\include" /I "$(APACHE1_HOME)\src\include" /I
"$(APACHE1_HOME)\src\os\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "MOD_JK_EXPORTS" /Fd"Debug\mod_jk_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -124,10 +124,6 @@ SOURCE=..\common\jk_context.c
# End Source File
# Begin Source File
-SOURCE=..\common\jk_jni_worker.c
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_lb_worker.c
# End Source File
# Begin Source File
@@ -220,10 +216,6 @@ SOURCE=..\common\jk_global.h
# End Source File
# Begin Source File
-SOURCE=..\common\jk_jni_worker.h
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_lb_worker.h
# End Source File
# Begin Source File
Modified: tomcat/jk/trunk/native/netscape/Makefile.vc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.vc?rev=1201736&r1=1201735&r2=1201736&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.vc (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.vc Mon Nov 14 15:02:15 2011
@@ -44,7 +44,6 @@ CLEAN :
-@erase "$(INTDIR)\jk_ajp_common.obj"
-@erase "$(INTDIR)\jk_connect.obj"
-@erase "$(INTDIR)\jk_context.obj"
- -@erase "$(INTDIR)\jk_jni_worker.obj"
-@erase "$(INTDIR)\jk_lb_worker.obj"
-@erase "$(INTDIR)\jk_map.obj"
-@erase "$(INTDIR)\jk_md5.obj"
@@ -69,7 +68,7 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(IPLANET_HOME)\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c
+CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I
"$(IPLANET_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\nsapi_redirect_src" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -120,7 +119,6 @@ LINK32_OBJS= \
"$(INTDIR)\jk_ajp_common.obj" \
"$(INTDIR)\jk_connect.obj" \
"$(INTDIR)\jk_context.obj" \
- "$(INTDIR)\jk_jni_worker.obj" \
"$(INTDIR)\jk_lb_worker.obj" \
"$(INTDIR)\jk_map.obj" \
"$(INTDIR)\jk_md5.obj" \
@@ -199,12 +197,6 @@ SOURCE=..\common\jk_context.c
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\common\jk_jni_worker.c
-
-"$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
SOURCE=..\common\jk_lb_worker.c
"$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)"
Modified: tomcat/jk/trunk/native/netscape/nsapi.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/nsapi.dsp?rev=1201736&r1=1201735&r2=1201736&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/nsapi.dsp (original)
+++ tomcat/jk/trunk/native/netscape/nsapi.dsp Mon Nov 14 15:02:15 2011
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I
"$(IPLANET_HOME)\plugins\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fd"Release/nsapi_redirect_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I
"$(IPLANET_HOME)\plugins\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D
"MCC_HTTPD" /D "SPAPI20" /Fd"Release/nsapi_redirect_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /YX /FD /GZ
/c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(IPLANET_HOME)\plugins\include" /I "$(JAVA_HOME)\include" /I
"$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D "MCC_HTTPD" /D
"SPAPI20" /Fd"Debug/nsapi_redirect_src" /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I
"$(IPLANET_HOME)\plugins\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "JK_NSAPI" /D "NSAPI_EXPORTS" /D "XP_WIN32" /D
"MCC_HTTPD" /D "SPAPI20" /Fd"Debug/nsapi_redirect_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -124,10 +124,6 @@ SOURCE=..\common\jk_context.c
# End Source File
# Begin Source File
-SOURCE=..\common\jk_jni_worker.c
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_lb_worker.c
# End Source File
# Begin Source File
@@ -216,10 +212,6 @@ SOURCE=..\common\jk_global.h
# End Source File
# Begin Source File
-SOURCE=..\common\jk_jni_worker.h
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_lb_worker.h
# End Source File
# Begin Source File
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
