mturk 2004/12/23 10:33:37 Modified: jk/native/nt_service jk_nt_service.c nt_service.dsp Log: Allow nt_service to build again. Patch prowided by wrowe. Revision Changes Path 1.12 +45 -44 jakarta-tomcat-connectors/jk/native/nt_service/jk_nt_service.c Index: jk_nt_service.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/nt_service/jk_nt_service.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk_nt_service.c 5 Nov 2004 15:28:39 -0000 1.11 +++ jk_nt_service.c 23 Dec 2004 18:33:37 -0000 1.12 @@ -871,7 +871,7 @@ } if(jk_resolve("localhost", port, &in)) { - int sd = jk_open_socket(&in, JK_TRUE, 0, NULL); + int sd = jk_open_socket(&in, JK_TRUE, 0, -1, NULL); if(sd >0) { int rc = JK_FALSE; @@ -954,8 +954,8 @@ sizeof(prp_file))) { jk_map_t *init_map; - if(map_alloc(&init_map)) { - if(map_read_properties(init_map, prp_file)) { + if(jk_map_alloc(&init_map)) { + if(jk_map_read_properties(init_map, prp_file)) { jk_tomcat_startup_data_t data; jk_pool_t p; jk_pool_atom_t buf[HUGE_POOL_SIZE]; @@ -1127,29 +1127,29 @@ /* All this is wrong - you just need to configure cmd_line */ /* Optional - you may have cmd_line defined */ - data->server_file = map_get_string(init_map, - "wrapper.server_xml", + data->server_file = jk_map_get_string(init_map, + "wrapper.server_xml", + NULL); + data->classpath = jk_map_get_string(init_map, + "wrapper.class_path", + NULL); + data->tomcat_home = jk_map_get_string(init_map, + "wrapper.tomcat_home", + NULL); + data->java_bin = jk_map_get_string(init_map, + "wrapper.javabin", NULL); - data->classpath = map_get_string(init_map, - "wrapper.class_path", + data->tomcat_class = jk_map_get_string(init_map, + "wrapper.startup_class", + "org.apache.tomcat.startup.Tomcat"); + + data->cmd_line = jk_map_get_string(init_map, + "wrapper.cmd_line", NULL); - data->tomcat_home = map_get_string(init_map, - "wrapper.tomcat_home", + + data->stop_cmd = jk_map_get_string(init_map, + "wrapper.stop_cmd", NULL); - data->java_bin = map_get_string(init_map, - "wrapper.javabin", - NULL); - data->tomcat_class = map_get_string(init_map, - "wrapper.startup_class", - "org.apache.tomcat.startup.Tomcat"); - - data->cmd_line = map_get_string(init_map, - "wrapper.cmd_line", - NULL); - - data->stop_cmd = map_get_string(init_map, - "wrapper.stop_cmd", - NULL); if(NULL == data->cmd_line && ( (NULL == data->tomcat_class) || @@ -1185,24 +1185,25 @@ strcat(data->cmd_line, data->server_file); } - data->shutdown_port = map_get_int(init_map, - "wrapper.shutdown_port", - 8007); - - data->shutdown_secret = map_get_string(init_map, - "wrapper.shutdown_secret", NULL ); + data->shutdown_port = jk_map_get_int(init_map, + "wrapper.shutdown_port", + 8007); + + data->shutdown_secret = jk_map_get_string(init_map, + "wrapper.shutdown_secret", + NULL); - data->shutdown_protocol = map_get_string(init_map, - "wrapper.shutdown_protocol", - AJP12_TAG); - - data->extra_path = map_get_string(init_map, - "wrapper.ld_path", - NULL); - - data->stdout_file = map_get_string(init_map, - "wrapper.stdout", - NULL); + data->shutdown_protocol = jk_map_get_string(init_map, + "wrapper.shutdown_protocol", + AJP12_TAG); + + data->extra_path = jk_map_get_string(init_map, + "wrapper.ld_path", + NULL); + + data->stdout_file = jk_map_get_string(init_map, + "wrapper.stdout", + NULL); if(NULL == data->stdout_file && NULL == data->tomcat_home ) { return JK_FALSE; @@ -1214,9 +1215,9 @@ strcat(data->stdout_file, "\\stdout.log"); } - data->stderr_file = map_get_string(init_map, - "wrapper.stderr", - NULL); + data->stderr_file = jk_map_get_string(init_map, + "wrapper.stderr", + NULL); if(NULL == data->stderr_file) { data->stderr_file = jk_pool_alloc(p, strlen(data->tomcat_home) + 2 + strlen("\\stderr.log")); 1.9 +8 -8 jakarta-tomcat-connectors/jk/native/nt_service/nt_service.dsp Index: nt_service.dsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/nt_service/nt_service.dsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nt_service.dsp 12 Mar 2002 19:12:18 -0000 1.8 +++ nt_service.dsp 23 Dec 2004 18:33:37 -0000 1.9 @@ -41,16 +41,16 @@ # PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "../common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /W3 /GX /Zi /O2 /I "../common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Release/jk_nt_service_src" /FD /c # 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release/jk_nt_service.exe" +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Release/jk_nt_service.exe" /opt:ref !ELSEIF "$(CFG)" == "nt_service - Win32 Debug" @@ -65,16 +65,16 @@ # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE CPP /nologo /MD /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fd"Debug/jk_nt_service_src" /FD /c # 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/jk_nt_service.exe" /pdbtype:sept +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/jk_nt_service.exe" !ENDIF --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]