cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi Makefile.in jk_dsapi_plugin.c jk_logger_domino.c config.h
andya 2004/04/29 10:05:17
Modified:jk/native2/server/dsapi Makefile.in jk_dsapi_plugin.c
jk_logger_domino.c config.h
Log:
Added code to lookup the real Notes username for authenticated users and pass that
as the request username.
Revision ChangesPath
1.2 +10 -4 jakarta-tomcat-connectors/jk/native2/server/dsapi/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 26 Mar 2004 13:53:06 - 1.1
+++ Makefile.in 29 Apr 2004 17:05:17 - 1.2
@@ -7,6 +7,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -20,6 +21,10 @@
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
+NOTES_INCL=-I ${NOTESAPI}/include
+NOTES_OBJS=${NOTESAPI}/lib/linux/notes0.o
+NOTES_CFLAGS=-DUNIX -DLINUX
+
JK_DIR := ../..
BUILD_DIR = ${JK_DIR}/../build/jk2/dsapi
@@ -30,13 +35,14 @@
INCLUDES= -I${JK_DIR}/include \
${APR_INCL} \
${DOMINO_INCL} \
- ${JAVA_INCL}
+ ${JAVA_INCL} \
+ ${NOTES_INCL}
JK_CFLAGS=-DCHUNK_SIZE=4096 @APR_CFLAGS@ -DHAVE_MMAP @HAVE_JNI@ @HAS_PCRE@
JK_LDFLAGS=-lcrypt ${APR_LDFLAGS} @PCRE_LIBS@
## Based on rules.mk ##
-ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
+ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(NOTES_CFLAGS) $(CFLAGS)
ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
ALL_LDFLAGS = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
ALL_LIBS = $(EXTRA_LIBS) $(NOTEST_LIBS) $(LIBS)
@@ -93,13 +99,13 @@
#all: prepare ${BUILD_DIR}/libtomcat2.so ${BUILD_DIR}/libjkjni.so
all: prepare ${BUILD_DIR}/libtomcat2.so
-${BUILD_DIR}/libtomcat2.la: ${COMMON_LO_FILES} ${DSAPI_LO_FILES}
+${BUILD_DIR}/libtomcat2.la: ${COMMON_LO_FILES} ${DSAPI_LO_FILES} ${NOTES_OBJS}
${MOD_LINK} -o $@ $^ ${JK_LDFLAGS}
${BUILD_DIR}/libtomcat2.so: ${BUILD_DIR}/libtomcat2.la
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
-#${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
+#${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES} ${NOTES_OBJS}
#$(MOD_LINK) -o $@ $(JK_LDFLAGS) $^
#${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
1.11 +123 -6
jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c
Index: jk_dsapi_plugin.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/jk_dsapi_plugin.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_dsapi_plugin.c 29 Apr 2004 12:22:38 - 1.10
+++ jk_dsapi_plugin.c 29 Apr 2004 17:05:17 - 1.11
@@ -50,7 +50,11 @@
#include apr_general.h
/* Domino DSAPI filter definitions */
-#include dsapifilter.h
+#include global.h
+#include addin.h
+#include dsapi.h
+#include osmem.h
+#include lookup.h
int JK_METHOD jk2_logger_domino_factory(jk_env_t *env, jk_pool_t *pool, jk_bean_t
*result, const char *type, const char *name);
@@ -78,6 +82,7 @@
static int tomcatTimeout= TOMCAT_STARTSTOP_TO;
static const char *crlf = \r\n;
+static const char *filterdesc = FILTERDESC;
#define WORKPOOL globalPool
@@ -641,6 +646,108 @@
return kFilterHandledRequest;
}
+/* Get the info from the lookup buffer
+ */
+static int getLookupInfo(FilterContext *context, char *pMatch, int itemNumber, char
**pInfo, int *pInfoLen) {
+unsigned int reserved = 0;
+unsigned int errID;
+char *pValue = NULL;
+WORD lValue, type;
+STATUS error;
+
+if (NULL == pMatch || NULL == pInfo || NULL == pInfoLen || (itemNumber 0)) {
+return -1;
+}
+
+/* Initialize output */
+*pInfo = NULL;
+*pInfoLen = 0;
+
+/* Check the type and length of the info */
+pValue = (char *) NAMELocateItem(pMatch, itemNumber, type, lValue);
+
+if (NULL == pValue || lValue == 0) {
+return -1;
+}
+
+lValue -= sizeof(WORD); /* remove datatype word included in the list length */
+
+/* check the value type */
+if (type != TYPE_TEXT_LIST type != TYPE_TEXT) {
+return -1;
+}
+
+/* Allocate space for the info. This memory will be freed automatically when
the thread terminates */
+if (*pInfo = context-AllocMem(context, lValue+1, reserved, errID), NULL ==
*pInfo) {
+return -1;
+}
+
+/* Get the info */
+if (error =
cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi Makefile.in
andya 2004/04/29 10:37:05
Modified:jk/native2/server/dsapi Makefile.in
Log:
Removed notes0.o from object files. It isn't necessary to link against the Notes
library in Linux - the module links against libnotes.so when it loads.
Revision ChangesPath
1.3 +2 -3 jakarta-tomcat-connectors/jk/native2/server/dsapi/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 29 Apr 2004 17:05:17 - 1.2
+++ Makefile.in 29 Apr 2004 17:37:05 - 1.3
@@ -22,7 +22,6 @@
endif
NOTES_INCL=-I ${NOTESAPI}/include
-NOTES_OBJS=${NOTESAPI}/lib/linux/notes0.o
NOTES_CFLAGS=-DUNIX -DLINUX
JK_DIR := ../..
@@ -99,13 +98,13 @@
#all: prepare ${BUILD_DIR}/libtomcat2.so ${BUILD_DIR}/libjkjni.so
all: prepare ${BUILD_DIR}/libtomcat2.so
-${BUILD_DIR}/libtomcat2.la: ${COMMON_LO_FILES} ${DSAPI_LO_FILES} ${NOTES_OBJS}
+${BUILD_DIR}/libtomcat2.la: ${COMMON_LO_FILES} ${DSAPI_LO_FILES}
${MOD_LINK} -o $@ $^ ${JK_LDFLAGS}
${BUILD_DIR}/libtomcat2.so: ${BUILD_DIR}/libtomcat2.la
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
-#${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES} ${NOTES_OBJS}
+#${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
#$(MOD_LINK) -o $@ $(JK_LDFLAGS) $^
#${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi Makefile.in
This is a computer-generated response confirming that your e-mail
message was received by There. Please do not respond to this message.
Thank you for contacting us. We will make every effort to respond to
your message as soon as possible.
Please do not send multiple e-mail messages (regarding the same
subject) before you have received a response as this can cause confusion and
possibly delay our response to you.
Our Customer Support team is also available via the Live Help link on There
Central, from the Help link on www.there.com, or in-world (Get HelpThere
Live Help). Live Help is available M-F, 2-8pm PT.
Thank You,
There Customer Support
[THREAD ID: 1-1R8G36]
-Original Message-
From: [EMAIL PROTECTED]
Sent: 4/29/2004 10:37:05 AM
To: [EMAIL PROTECTED]
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi Makefile.in
andya 2004/04/29 10:37:05
Modified:jk/native2/server/dsapi Makefile.in
Log:
Removed notes0.o from object files. It isn't necessary to link against the Notes
library in Linux - the module links against libnotes.so when it loads.
Revision ChangesPath
1.3 +2 -3 jakarta-tomcat-connectors/jk/native2/server/dsapi/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/dsapi/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 29 Apr 2004 17:05:17 - 1.2
+++ Makefile.in 29 Apr 2004 17:37:05 - 1.3
@@ -22,7 +22,6 @@
endif
NOTES_INCL=-I ${NOTESAPI}/include
-NOTES_OBJS=${NOTESAPI}/lib/linux/notes0.o
NOTES_CFLAGS=-DUNIX -DLINUX
JK_DIR := ../..
@@ -99,13 +98,13 @@
#all: prepare ${BUILD_DIR}/libtomcat2.so ${BUILD_DIR}/libjkjni.so
all: prepare ${BUILD_DIR}/libtomcat2.so
-${BUILD_DIR}/libtomcat2.la: ${COMMON_LO_FILES} ${DSAPI_LO_FILES} ${NOTES_OBJS}
+${BUILD_DIR}/libtomcat2.la: ${COMMON_LO_FILES} ${DSAPI_LO_FILES}
${MOD_LINK} -o $@ $^ ${JK_LDFLAGS}
${BUILD_DIR}/libtomcat2.so: ${BUILD_DIR}/libtomcat2.la
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
-#${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES} ${NOTES_OBJS}
+#${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
#$(MOD_LINK) -o $@ $(JK_LDFLAGS) $^
#${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2/server/dsapi Makefile.in
andya 2004/03/26 05:53:06
Added: jk/native2/server/dsapi Makefile.in
Log:
Added to allow Linux build
Revision ChangesPath
1.1 jakarta-tomcat-connectors/jk/native2/server/dsapi/Makefile.in
Index: Makefile.in
===
# Gnu makefile and libtool are required
# use -D options to overrides defaults
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@/apr-config --ldflags --libs` [EMAIL
PROTECTED]@/apu-config --ldflags --libs`
ifneq ($(strip $(JAVA_HOME)),)
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
endif
JK_DIR := ../..
BUILD_DIR = ${JK_DIR}/../build/jk2/dsapi
top_builddir=../..
[EMAIL PROTECTED]@
# It doesn't hurt if we include all
INCLUDES= -I${JK_DIR}/include \
${APR_INCL} \
${DOMINO_INCL} \
${JAVA_INCL}
JK_CFLAGS=-DCHUNK_SIZE=4096 @APR_CFLAGS@ -DHAVE_MMAP @HAVE_JNI@ @HAS_PCRE@
JK_LDFLAGS=-lcrypt ${APR_LDFLAGS} @PCRE_LIBS@
## Based on rules.mk ##
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
ALL_LDFLAGS = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
ALL_LIBS = $(EXTRA_LIBS) $(NOTEST_LIBS) $(LIBS)
ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
# Compile commands
COMPILE = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
MOD_LINK = $(LIBTOOL) --mode=link $(CC) -avoid-version -module -rpath ${DOMINO_HOME}
$(LT_LDFLAGS) $(ALL_LDFLAGS)
MOD_INSTALL = $(LIBTOOL) --mode=install $(CP)
#
COMMON_C_FILES := $(wildcard ${JK_DIR}/common/*.c )
# -- File list creation
# Same behavior as ant - 'all files from a dir'.
# Excludes are not yet implemented.
#JNI_C_FILES := $(wildcard ${JK_DIR}/jni/*.c )
DSAPI_C_FILES := $(wildcard ${JK_DIR}/server/dsapi/*.c )
H_FILES := $(wildcard ${JK_DIR}/include/*.h )
COMMON_LO_FILES := $(patsubst ${JK_DIR}/common/%, ${BUILD_DIR}/%, \
$(patsubst %c, %lo, ${COMMON_C_FILES} ))
#JNI_LO_FILES := $(patsubst ${JK_DIR}/jni/%, ${BUILD_DIR}/%, \
# $(patsubst %c, %lo, ${JNI_C_FILES} ))
DSAPI_LO_FILES := $(patsubst ${JK_DIR}/server/dsapi/%, ${BUILD_DIR}/%, \
$(patsubst %c, %lo, ${DSAPI_C_FILES} ))
# -- Compile rules
.PHONY: all
VPATH=.:../../common
.c.lo:
${SH_COMPILE} -c $ -o $
${BUILD_DIR}/%.lo: ${JK_DIR}/common/%.c
${SH_COMPILE} -c $ -o $@
#${BUILD_DIR}/%.lo: ${JK_DIR}/jni/%.c
# ${SH_COMPILE} -c $ -o $@
${BUILD_DIR}/%.lo: ${JK_DIR}/server/dsapi/%.c
${SH_COMPILE} -c $ -o $@
# -- Targets
#all: prepare ${BUILD_DIR}/libtomcat2.so ${BUILD_DIR}/libjkjni.so
all: prepare ${BUILD_DIR}/libtomcat2.so
${BUILD_DIR}/libtomcat2.la: ${COMMON_LO_FILES} ${DSAPI_LO_FILES}
${MOD_LINK} -o $@ $^ ${JK_LDFLAGS}
${BUILD_DIR}/libtomcat2.so: ${BUILD_DIR}/libtomcat2.la
$(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
#${BUILD_DIR}/libjkjni.la: ${JNI_LO_FILES} ${COMMON_LO_FILES}
# $(MOD_LINK) -o $@ $(JK_LDFLAGS) $^
#${BUILD_DIR}/libjkjni.so: ${BUILD_DIR}/libjkjni.la
# $(MOD_INSTALL) $^ `pwd`/${BUILD_DIR}
${COMMON_C_FILES} ${DSAPI_C_FILES}: ${H_FILES}
prepare:
mkdir -p ${BUILD_DIR}
clean:
rm -rf ${BUILD_DIR}/*.lo ${BUILD_DIR}/*.la ${BUILD_DIR}/*.o ${BUILD_DIR}/.libs
${BUILD_DIR}/*.so
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
