costin 02/05/16 17:31:55
Modified: jk/native2/server/apache13 Makefile.apxs.in
jk/native2/server/apache2 Makefile.apxs.in Makefile.in
jk_service_apache2.c mod_jk2.c
Log:
mod_jk2.so for apache will include all the jni code.
libjkjni.so will include all common and jni code.
The first is used by apache ( including inprocess worker ). The second
is used only by java - for unix socket, shm, and other native operations.
Revision Changes Path
1.3 +1 -4
jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in
Index: Makefile.apxs.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache13/Makefile.apxs.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.apxs.in 16 May 2002 23:50:12 -0000 1.2
+++ Makefile.apxs.in 17 May 2002 00:31:54 -0000 1.3
@@ -2,15 +2,12 @@
APXS=@APXS@
OS=@OS@
-JAVA_HOME=@JAVA_HOME@
APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
JK=../../common/
JKINC=../../include/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK} -I ${JKINC} -DHAVE_MMAP
-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
## read the object (.c) from the list file.
OEXT=.c
@@ -19,7 +16,7 @@
all: mod_jk2.so
mod_jk2.so:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL} "${APXSLDFLAGS}"
mod_jk2.c ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${APXSLDFLAGS}" mod_jk2.c
${APACHE_OBJECTS}
clean:
rm -f *.o *.so
1.3 +2 -0
jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in
Index: Makefile.apxs.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.apxs.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.apxs.in 13 May 2002 10:25:33 -0000 1.2
+++ Makefile.apxs.in 17 May 2002 00:31:55 -0000 1.3
@@ -16,6 +16,8 @@
OEXT=.c
include ../../common/list.mk
APACHE2_OBJECTS=jk_logger_apache2.c jk_map_aprtable.c jk_service_apache2.c
+## Must include the jni stuff
+
all: mod_jk2.la
mod_jk2.la:
1.3 +2 -2 jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 14 May 2002 11:21:46 -0000 1.2
+++ Makefile.in 17 May 2002 00:31:55 -0000 1.3
@@ -89,10 +89,10 @@
all: prepare ${BUILD_DIR}/mod_jk2.so ${BUILD_DIR}/jkjni.so
-${BUILD_DIR}/jkjni.so: ${JNI_LO_FILES}
+${BUILD_DIR}/jkjni.so: ${JNI_LO_FILES} ${COMMON_LO_FILES}
$(MOD_LINK) -o $@ $^
-${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${A2_LO_FILES}
+${BUILD_DIR}/mod_jk2.so: ${COMMON_LO_FILES} ${JNI_LO_FILES} ${A2_LO_FILES}
${MOD_LINK} -o $@ $^
${COMMON_C_FILES} ${A2_C_FILES}: ${H_FILES}
1.22 +3 -2
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
Index: jk_service_apache2.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_service_apache2.c 16 May 2002 20:54:18 -0000 1.21
+++ jk_service_apache2.c 17 May 2002 00:31:55 -0000 1.22
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat
* Author: Gal Shachor <[EMAIL PROTECTED]>
* Henri Gomez <[EMAIL PROTECTED]>
- * Version: $Revision: 1.21 $
+ * Version: $Revision: 1.22 $
*/
#include "apu_compat.h"
@@ -74,7 +74,8 @@
#include "http_core.h"
#include "http_protocol.h"
#include "http_main.h"
-#include "http_log.h"
+#include "http_log.h"
+#include "scoreboard.h"
#include "util_script.h"
/*
1.24 +2 -1 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_jk2.c 16 May 2002 20:54:18 -0000 1.23
+++ mod_jk2.c 17 May 2002 00:31:55 -0000 1.24
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.23 $ *
+ * Version: $Revision: 1.24 $ *
***************************************************************************/
/*
@@ -275,6 +275,7 @@
#ifdef NO_APACHE_LOGGER
jkb=env->createBean2( env, env->globalPool, "logger.file", "");
env->alias( env, "logger.file:", "logger");
+ env->alias( env, "logger.file:", "logger:");
l = jkb->object;
#else
env->registerFactory( env, "logger.apache2", jk2_logger_apache2_factory );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
