Author: mturk
Date: Wed Nov 16 06:46:51 2011
New Revision: 1202546
URL: http://svn.apache.org/viewvc?rev=1202546&view=rev
Log:
Remove deprecated jni code
Removed:
tomcat/jk/trunk/native/common/jk_jni_worker.c
tomcat/jk/trunk/native/common/jk_jni_worker.h
tomcat/jk/trunk/native/jni/
Modified:
tomcat/jk/trunk/native/BUILDING.txt
tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in
tomcat/jk/trunk/native/apache-1.3/Makefile.in
tomcat/jk/trunk/native/apache-1.3/Makefile.netware
tomcat/jk/trunk/native/apache-1.3/NWGNUmakefile.mak
tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in
tomcat/jk/trunk/native/apache-2.0/Makefile.in
tomcat/jk/trunk/native/apache-2.0/NWGNUmakefile
tomcat/jk/trunk/native/common/Makefile.in
tomcat/jk/trunk/native/common/jk_worker_list.h
tomcat/jk/trunk/native/common/list.mk.in
tomcat/jk/trunk/native/configure.in
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/BUILDING.txt (original)
+++ tomcat/jk/trunk/native/BUILDING.txt Wed Nov 16 06:46:51 2011
@@ -86,18 +86,7 @@
./configure --with-apxs=/usr/sbin/apxs
tomcat-connectors arguments
- -----------------------------------
- JVM related parameters:
- --with-java-home=DIR
- DIR is the patch to the JDK root directory. Something like: /opt/java/jdk12
- --with-os-type[=SUBDIR]
- SUBDIR is the os-type subdirectory, normaly configure should guess it
- correctly.
- --with-arch-type[=SUBDIR]
- SUBDIR is the arch subdirectory, normaly configure should guess it
correctly.
- --with-java-platform=VAL
- VAL is the Java platform 1 is 1.1.x and 2 is 1.2.x. It is guessed correctly.
-
+ -----------------------------------
Apache related parameters:
--with-apxs[=FILE]
FILE is the location of the apxs tool. Default is finding apxs in PATH.
@@ -113,11 +102,6 @@
will get the error message: "this module might crash under EAPI!" when
loading libjk.so in httpd.
- JNI support:
- --enable-jni
- Build the jni_connect.so and the JNI worker.
- Note that JNI support has been discontinued
-
* Static build need more tests, and we strongly recommand dynamic build
using DSO/APXS.
Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.apxs.in Wed Nov 16 06:46:51 2011
@@ -16,15 +16,11 @@
## configure should make the Makefile out of this file.
APXS=@APXS@
-OS=@OS@
-JAVA_HOME=@JAVA_HOME@
APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
JK=../common/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
-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
@@ -33,7 +29,7 @@ include ../common/list.mk
all: mod_jk.so
mod_jk.so:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL}
${APXSLDFLAGS} mod_jk.c ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} mod_jk.c
${APACHE_OBJECTS}
clean:
rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.in?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.in Wed Nov 16 06:46:51 2011
@@ -20,8 +20,6 @@ srcdir=@srcdir@
top_srcdir=@top_srcdir@
VPATH=@srcdir@
APXS=@APXS@
-OS=@OS@
-JAVA_HOME=@JAVA_HOME@
CP=@CP@
APACHE_DIR=@APACHE_DIR@
MKDIR=@MKDIR@
@@ -41,12 +39,10 @@ APACHE_FILES = Makefile.tmpl Makefile.li
JK=../common/
JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common
-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
APACHE_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@
-I${top_srcdir}/common
# Compile commands
-JK_CFLAGS = $(JK_INCL) $(JAVA_INCL) $(APACHE_CFLAGS)
+JK_CFLAGS = $(JK_INCL) $(APACHE_CFLAGS)
COMPILE = $(CC)
SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
MOD_LINK = $(LIBTOOL) --mode=link $(CC) @APXSLDFLAGS@
Modified: tomcat/jk/trunk/native/apache-1.3/Makefile.netware
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/Makefile.netware?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/Makefile.netware (original)
+++ tomcat/jk/trunk/native/apache-1.3/Makefile.netware Wed Nov 16 06:46:51 2011
@@ -24,10 +24,6 @@
ifndef AP_HOME
AP_HOME = c:/projects/cw/apache_1.3.37
endif
-# Edit the path below to point to the base of your NetWare Java SDK.
-ifndef NW_JDK
-NW_JDK = c:/projects/sdks/java-nw
-endif
# Edit the path below to point to the base of your Novell NDK.
ifndef NDKBASE
NDKBASE = c:/novell
@@ -126,7 +122,7 @@ SDK_LIBC = $(NDK_ROOT)/libc
JKCOMMON = ../common
INCLUDES = -I$(AP_HOME)/src/include -I$(AP_HOME)/src/os/netware
-INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware
+INCLUDES += -I$(JKCOMMON)
ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include
@@ -160,7 +156,6 @@ OBJS = \
$(OBJDIR)/jk_ajp_common.o \
$(OBJDIR)/jk_connect.o \
$(OBJDIR)/jk_context.o \
- $(OBJDIR)/jk_jni_worker.o \
$(OBJDIR)/jk_lb_worker.o \
$(OBJDIR)/jk_map.o \
$(OBJDIR)/jk_md5.o \
Modified: tomcat/jk/trunk/native/apache-1.3/NWGNUmakefile.mak
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/NWGNUmakefile.mak?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-1.3/NWGNUmakefile.mak (original)
+++ tomcat/jk/trunk/native/apache-1.3/NWGNUmakefile.mak Wed Nov 16 06:46:51 2011
@@ -24,10 +24,6 @@
# Make sure all needed macro's are defined
#
-ifneq "$(wildcard $(JAVA_HOME)/include/netware/jni_md.h)"
"$(JAVA_HOME)/include/netware/jni_md.h"
-$(error JAVA_HOME does not point to a valid NetWare Java SDK!)
-endif
-
LDLIBS = -l"$(METROWERKS)/Novell Support/libraries/runtime/mwcrtl.lib"
JKCOMMON = ../common
@@ -47,8 +43,6 @@ endif
#
XINCDIRS += \
$(JKCOMMON) \
- $(JAVA_HOME)/include \
- $(JAVA_HOME)/include/netware \
$(SRC)\include \
$(NWOS) \
$(EOLIST)
@@ -205,7 +199,6 @@ FILES_nlm_objs = \
$(OBJDIR)/jk_ajp_common.o \
$(OBJDIR)/jk_connect.o \
$(OBJDIR)/jk_context.o \
- $(OBJDIR)/jk_jni_worker.o \
$(OBJDIR)/jk_lb_worker.o \
$(OBJDIR)/jk_map.o \
$(OBJDIR)/jk_md5.o \
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.apxs.in Wed Nov 16 06:46:51 2011
@@ -16,15 +16,11 @@
## configure should make the Makefile out of this file.
APXS=@APXS@
-OS=@OS@
-JAVA_HOME=@JAVA_HOME@
APXSLDFLAGS=@APXSLDFLAGS@
APXSCFLAGS=@APXSCFLAGS@
JK=../common/
JK_INCL=-DUSE_APACHE_MD5 -I ${JK}
-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
@@ -33,7 +29,7 @@ include ../common/list.mk
all: mod_jk.la
mod_jk.la:
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}"
${APXSLDFLAGS} mod_jk.c ${APACHE_OBJECTS}
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS}
mod_jk.c ${APACHE_OBJECTS}
install: mod_jk.la
$(APXS) -i mod_jk.la
Modified: tomcat/jk/trunk/native/apache-2.0/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/Makefile.in?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/Makefile.in (original)
+++ tomcat/jk/trunk/native/apache-2.0/Makefile.in Wed Nov 16 06:46:51 2011
@@ -16,8 +16,6 @@
##
APXS=@APXS@
-OS=@OS@
-JAVA_HOME=@JAVA_HOME@
CP=@CP@
APACHE_DIR=@APACHE_DIR@
MKDIR=@MKDIR@
@@ -40,9 +38,7 @@ include @APACHE_CONFIG_VARS@
# Local settings ( overriding/appending to Apache's )
COMMON=../common
JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
-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
-CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${JAVA_INCL} ${APXSCPPFLAGS}
${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
+CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS}
${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
# Implicit rules
Modified: tomcat/jk/trunk/native/apache-2.0/NWGNUmakefile
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/NWGNUmakefile?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/NWGNUmakefile (original)
+++ tomcat/jk/trunk/native/apache-2.0/NWGNUmakefile Wed Nov 16 06:46:51 2011
@@ -20,10 +20,6 @@
# created by Guenter Knauf <fua...@apache.org>
#
-ifneq "$(wildcard $(JAVA_HOME)/include/netware/jni_md.h)"
"$(JAVA_HOME)/include/netware/jni_md.h"
-$(error JAVA_HOME does not point to a valid NetWare Java SDK!)
-endif
-
#
# Declare the sub-directories to be built here
#
@@ -57,8 +53,6 @@ XINCDIRS += \
$(APRUTIL)/include \
$(AP_WORK)/include \
$(NWOS) \
- $(JAVA_HOME)/include \
- $(JAVA_HOME)/include/netware \
$(EOLIST)
#
@@ -218,7 +212,6 @@ FILES_nlm_objs = \
$(OBJDIR)/jk_ajp_common.o \
$(OBJDIR)/jk_connect.o \
$(OBJDIR)/jk_context.o \
- $(OBJDIR)/jk_jni_worker.o \
$(OBJDIR)/jk_lb_worker.o \
$(OBJDIR)/jk_map.o \
$(OBJDIR)/jk_md5.o \
Modified: tomcat/jk/trunk/native/common/Makefile.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/Makefile.in?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/Makefile.in (original)
+++ tomcat/jk/trunk/native/common/Makefile.in Wed Nov 16 06:46:51 2011
@@ -31,8 +31,7 @@ CC = @CC@
OEXT=.lo
include list.mk
-JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@
-CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
+CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
include @top_srcdir@/scripts/build/rules.mk
Modified: tomcat/jk/trunk/native/common/jk_worker_list.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_worker_list.h?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_worker_list.h (original)
+++ tomcat/jk/trunk/native/common/jk_worker_list.h Wed Nov 16 06:46:51 2011
@@ -43,9 +43,6 @@
#include "jk_ajp12_worker.h"
#include "jk_ajp13_worker.h"
#include "jk_ajp14_worker.h"
-#ifdef HAVE_JNI
-#include "jk_jni_worker.h"
-#endif
#include "jk_lb_worker.h"
#include "jk_status.h"
@@ -71,13 +68,6 @@ static worker_factory_record_t worker_fa
*/
{JK_AJP14_WORKER_NAME, JK_AJP14_WORKER_TYPE, ajp14_worker_factory},
/*
- * In process JNI based worker. Requires the server to be
- * multithreaded and to use native threads.
- */
-#ifdef HAVE_JNI
- {JK_JNI_WORKER_NAME, JK_JNI_WORKER_TYPE, jni_worker_factory},
-#endif
- /*
* Load balancing worker. Performs round robin with sticky
* session load balancing.
*/
Modified: tomcat/jk/trunk/native/common/list.mk.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/list.mk.in?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/list.mk.in (original)
+++ tomcat/jk/trunk/native/common/list.mk.in Wed Nov 16 06:46:51 2011
@@ -21,7 +21,7 @@ APACHE_OBJECTS= ${JK}jk_ajp12_worker${OE
${JK}jk_lb_worker${OEXT} ${JK}jk_sockbuf${OEXT} \
${JK}jk_map${OEXT} ${JK}jk_uri_worker_map${OEXT} \
${JK}jk_ajp14${OEXT} ${JK}jk_ajp14_worker${OEXT} \
- ${JK}jk_md5${OEXT} ${JK}jk_shm${OEXT} @JK_JNI_WORKER@ \
+ ${JK}jk_md5${OEXT} ${JK}jk_shm${OEXT} \
${JK}jk_ajp_common${OEXT} ${JK}jk_context${OEXT} \
${JK}jk_url${OEXT} \
${JK}jk_status${OEXT}
Modified: tomcat/jk/trunk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.in?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/native/configure.in (original)
+++ tomcat/jk/trunk/native/configure.in Wed Nov 16 06:46:51 2011
@@ -476,18 +476,6 @@ AC_ARG_ENABLE(netscape,
AC_MSG_RESULT(no netscape given)
])
-dnl Check for enable-jni
-JK_JNI_WORKER=""
-AC_ARG_ENABLE(jni,
-[AS_HELP_STRING([--enable-jni],[DEPRECATED: Build jni_connect.so and enable
jni_worker])],
-[
- AC_MSG_RESULT(jni enable (need JDK))
- CFLAGS="${CFLAGS} -DHAVE_JNI"
- JK_JNI_WORKER="\${JK}jk_jni_worker\${OEXT}"
- WARN_JNI=1
-])dnl
-AC_SUBST(JK_JNI_WORKER)
-
dnl CFLAGS for EAPI mod_ssl (Apache 1.3)
dnl it also allows the CFLAGS environment variable.
CFLAGS="${CFLAGS}"
@@ -602,186 +590,6 @@ JK_PREFIX_IF_MISSING(APXSLDFLAGS, [-Wl,]
AC_SUBST(APXSLDFLAGS)
-if ${TEST} -n "${JK_JNI_WORKER}" ; then
-
-WEBSERVER="jni ${WEBSERVER}"
-
-dnl Find the JDK
-dnl Results go in JAVA_HOME
-dnl Also sets JAVA_PLATFORM to 1 for 1.1 and to 2 for 1.2
-
-AC_MSG_CHECKING([for JDK location (please wait)])
-
-dnl The order is: --with-java-home first, environment second, guessed value
third.
-
-dnl This is a safe default. Could screw up on the security features, but
-dnl oh well, this is what --with-java2 is for.
-
-if ${TEST} -n "${JAVA_HOME}" ; then
- JAVA_HOME_ENV="${JAVA_HOME}"
-else
- JAVA_HOME_ENV=""
-fi
-JAVA_HOME=""
-JAVA_PLATFORM="1"
-
-AC_ARG_WITH(java-home,
-[AS_HELP_STRING([--with-java-home=DIR],[DEPRECATED: Where is your JDK root
directory])],
-[
-
- # This stuff works if the command line parameter --with-java-home was
- # specified, so it takes priority rightfully.
-
- JAVA_HOME=${withval}
-
- if ${TEST} ! -d "${JAVA_HOME}" ; then
- AC_MSG_ERROR(Not a directory: ${JAVA_HOME})
- fi
-
- AC_MSG_RESULT(${JAVA_HOME})
-
-],
-[
- # This works if the parameter was NOT specified, so it's a good time
- # to see what the enviroment says.
-
- # Since Sun uses JAVA_HOME a lot, we check it first and ignore the
- # JAVA_HOME, otherwise just use whatever JAVA_HOME was specified.
-
- if ${TEST} -n "${JAVA_HOME_ENV}" ; then
-
- JAVA_HOME=${JAVA_HOME_ENV}
- AC_MSG_RESULT(${JAVA_HOME_ENV} from environment)
- fi
-])
-
-if ${TEST} -z "${JAVA_HOME}" ; then
-
- # Oh well, nobody set neither JAVA_HOME nor JAVA_HOME, have to guess
-
- # The following code is based on the code submitted by Henner Zeller
- # for ${srcdir}/src/scripts/package/rpm/ApacheJServ.spec
-
- # Two variables will be set as a result:
- #
- # JAVA_HOME
- # JAVA_PLATFORM
- AC_MSG_CHECKING([Try to guess JDK location])
-
-
- for JAVA_PREFIX in \
- /usr/local \
- /usr/local/lib \
- /usr \
- /usr/lib \
- /opt \
- /
- do
- for JAVA_PLATFORM in 3 2 1 ;
- do
-
- for subversion in .9 .8 .7 .6 .5 .4 .3 .2 .1 "" ;
- do
- for VARIANT in IBMJava2- java java- jdk jdk-;
- do
-
GUESS="${JAVA_PREFIX}/${VARIANT}1.${JAVA_PLATFORM}${subversion}"
-dnl AC_MSG_CHECKING([${GUESS}])
- if ${TEST} -d "${GUESS}/bin" \
- && ${TEST} -d "${GUESS}/include" ; then
-
- JAVA_HOME="${GUESS}"
- AC_MSG_RESULT([${GUESS}])
- break
- fi
-
- done
-
- if ${TEST} -n "${JAVA_HOME}" ; then
- break;
- fi
-
- done
-
- if ${TEST} -n "${JAVA_HOME}" ; then
- break;
- fi
-
- done
-
- if ${TEST} -n "${JAVA_HOME}" ; then
- break;
- fi
-
- done
-
- if ${TEST} -n "${JAVA_HOME}" ; then
-
- dnl Just to have the messages looking uniformly
-
- AC_MSG_CHECKING(Java platform)
- AC_MSG_RESULT([guess ${JAVA_PLATFORM}])
- fi
-
-
-else
-
- AC_MSG_CHECKING(Java platform)
-
- AC_ARG_WITH(java-platform,
- [AS_HELP_STRING([--with-java-platform=VAL],
- [DEPRECATED: Force the Java platform
- (value is 1 for 1.1.x or 2 for 1.2.x or greater)])],
- [
- dnl This requires a bit of tweaking to be handled properly, but
- dnl the default is good enough
-
- JAVA_PLATFORM="2"
- ])
-
- AC_MSG_RESULT(forced Java ${JAVA_PLATFORM})
-
-fi
-dnl end of JServ ;=)
-
-dnl test if --enable-jni give but not valid JAVA_HOME
-if ${TEST} -z "${JAVA_HOME}" ; then
- AC_MSG_ERROR([JDK home not found, please specify one with --with-java-home
option (run ./configure --help for more options)])
-fi
-
-dnl guess OS = OS_TYPE for jni_md.h
-OS=""
-AC_ARG_WITH(os-type,
-[AS_HELP_STRING([--with-os-type=SUBDIR],[DEPRECATED: Where is your JDK os-type
subdirectory])],
-[
- OS=${withval}
-
- if ${TEST} ! -d "${JAVA_HOME}/${OS}" ; then
- AC_MSG_ERROR(Not a directory: ${JAVA_HOME}/${OS})
- fi
-],
-[
- AC_MSG_CHECKING(os_type directory)
- if ${TEST} -f ${JAVA_HOME}/include/jni_md.h; then
- OS=""
- else
- for f in ${JAVA_HOME}/include/*/jni_md.h; do
- if ${TEST} -f $f; then
- OS=`dirname ${f}`
- OS=`basename ${OS}`
- echo " ${OS}"
- fi
- done
- if ${TEST} -z "${OS}"; then
- AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${OS})
- AC_MSG_ERROR(You should retry --with-os-type=SUBDIR)
- fi
- fi
-])
-fi
-AC_SUBST(JAVA_HOME)
-AC_SUBST(OS)
-
-
dnl Check that a WEBSERVER has been given
if ${TEST} -z "$WEBSERVER" ; then
AC_MSG_ERROR(Cannot find the WebServer)
@@ -819,24 +627,8 @@ AC_OUTPUT([
common/Makefile
common/list.mk
common/jk_types.h
- jni/Makefile
])
-if ${TEST} -n "${WARN_JNI}" ; then
- AC_MSG_WARN([===========================================])
- AC_MSG_WARN([You have used one of the following options:])
- AC_MSG_WARN([ --enable-jni])
- AC_MSG_WARN([ --with-java-home])
- AC_MSG_WARN([ --with-java-platform])
- AC_MSG_WARN([ --with-os-type])
- AC_MSG_WARN([These options are only necessary if])
- AC_MSG_WARN([you want to use a worker of type jni.])
- AC_MSG_WARN([These workers have been deprecated.])
- AC_MSG_WARN([They do not work and will be removed from])
- AC_MSG_WARN([a future release])
- AC_MSG_WARN([===========================================])
-fi
-
if ${TEST} -n "${WARN_CC}" ; then
AC_MSG_WARN([===========================================])
AC_MSG_WARN([Using CC from environment:])
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1202546&r1=1202545&r2=1202546&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Wed Nov 16 06:46:51 2011
@@ -44,6 +44,9 @@
<br />
<subsection name="Native">
<changelog>
+ <update>
+ Remove deprecated JNI worker and build dependency on Java SDK. (mturk)
+ </update>
<fix>
<bug>51253</bug>: Forward WWW-Authenticate header when using
server generated error pages (rjung, mturk).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
