andya 01/06/13 14:26:49
Modified: jk/native/domino Makefile jk_dsapi_plugin.c dsapi.dsp
Log:
Tidied up a few minor syntax errors that were breaking the build with Visual Studio
Revision Changes Path
1.3 +7 -5 jakarta-tomcat-connectors/jk/native/domino/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 2001/06/07 14:16:18 1.2
+++ Makefile 2001/06/13 21:26:42 1.3
@@ -47,11 +47,13 @@
INC=-I$(NOTESINC) -I$(JAVAINC) -I$(JKINC)
DEFS=-DLINUX -DUNIX
-JKOBJ = ../jk/jk_ajp12_worker.o ../jk/jk_ajp13.o ../jk/jk_ajp13_worker.o
../jk/jk_connect.o \
- ../jk/jk_jni_worker.o ../jk/jk_lb_worker.o ../jk/jk_map.o ../jk/jk_msg_buff.o \
- ../jk/jk_nwmain.o ../jk/jk_pool.o ../jk/jk_sockbuf.o ../jk/jk_uri_worker_map.o
\
- ../jk/jk_util.o ../jk/jk_worker.o ../jk/jk_ajp14.o ../jk/jk_ajp14_worker.o \
- ../jk/jk_context.o ../jk/jk_md5.o ../jk/jk_ajp_common.o
+JKOBJ = ../common/jk_ajp12_worker.o ../common/jk_ajp13.o
../common/jk_ajp13_worker.o \
+ ../common/jk_connect.o ../common/jk_jni_worker.o ../common/jk_lb_worker.o \
+ ../common/jk_map.o ../common/jk_msg_buff.o ../common/jk_nwmain.o \
+ ../common/jk_pool.o ../common/jk_sockbuf.o ../common/jk_uri_worker_map.o \
+ ../common/jk_util.o ../common/jk_worker.o ../common/jk_ajp14.o \
+ ../common/jk_ajp14_worker.o ../common/jk_context.o ../common/jk_md5.o \
+ ../common/jk_ajp_common.o
LOBJ = jk_dsapi_plugin.o inifile.o
OBJ = $(JKOBJ) $(LOBJ)
1.5 +5 -3 jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c
Index: jk_dsapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/jk_dsapi_plugin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_dsapi_plugin.c 2001/06/08 14:57:52 1.4
+++ jk_dsapi_plugin.c 2001/06/13 21:26:43 1.5
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: DSAPI plugin for Lotus Domino *
* Author: Andy Armstrong <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
/* Based on the IIS redirector by Gal Shachor <[EMAIL PROTECTED]> */
@@ -525,9 +525,11 @@
if (map_alloc(&map))
{
if (map_read_properties(map, workerFile))
+#if 0
/* we add the URI->WORKER MAP since workers using AJP14 will feed it */
worker_env.uri_to_worker = &uw_map;
GETVARIABLE("SERVER_SOFTWARE", &worker_env.server_name, "Lotus
Domino");
+#endif
if (wc_open(map, &worker_env, logger))
rc = JK_TRUE;
@@ -888,7 +890,7 @@
/* There's no point in doing this because Domino never seems to
* set any of these CGI variables.
*/
- /*
+#if 0
if (s->is_ssl)
{
char *sslNames[] =
@@ -941,7 +943,7 @@
s->num_attributes = varCount;
}
}
- */
+#endif
/* Duplicate all the headers now */
1.6 +1 -50 jakarta-tomcat-connectors/jk/native/domino/dsapi.dsp
Index: dsapi.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/domino/dsapi.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dsapi.dsp 2001/06/08 15:02:57 1.5
+++ dsapi.dsp 2001/06/13 21:26:45 1.6
@@ -55,10 +55,6 @@
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
/nologo /dll /machine:I386
# ADD 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
wsock32.lib notes.lib /nologo /dll /machine:I386 /out:"Release/tomcat_redirector.dll"
/libpath:"C:\notesapi\lib\mswin32"
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Release\tomcat_redirector.dll \\london\c$\lotus\domino
-# End Special Build Tool
!ELSEIF "$(CFG)" == "dsapi - Win32 Debug"
@@ -161,29 +157,6 @@
SOURCE=..\jk\jk_worker.c
# End Source File
# End Group
-
-SOURCE=..\jk\jk_worker_ajp14.c
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_ajp14.c
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_context.c
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_ajp_common.c
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_md5.c
-# End Source File
-# End Group
-
-# End Source File
-# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
@@ -272,35 +245,13 @@
SOURCE=..\jk\jk_worker_list.h
# End Source File
# End Group
-
-SOURCE=..\jk\jk_worker_ajp14.h
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_ajp14.h
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_context.h
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_ajp_common.h
-# End Source File
-# End Group
-
-SOURCE=..\jk\jk_md5.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"
# End Group
# Begin Source File
-SOURCE=.\HISTORY
+SOURCE=.\ReadMe.txt
# End Source File
# End Target
# End Project
