Author: mturk
Date: Wed Nov 16 06:55:32 2011
New Revision: 1202548
URL: http://svn.apache.org/viewvc?rev=1202548&view=rev
Log:
Remove deprecated jni code
Modified:
tomcat/jk/trunk/native/netscape/Makefile.linux
tomcat/jk/trunk/native/netscape/Makefile.netware
tomcat/jk/trunk/native/netscape/Makefile.solaris
Modified: tomcat/jk/trunk/native/netscape/Makefile.linux
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.linux?rev=1202548&r1=1202547&r2=1202548&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.linux (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.linux Wed Nov 16 06:55:32 2011
@@ -32,19 +32,17 @@ LD_SHAREDCMD=$(CC) $(LDFLAGS) $(CFLAGS)
OS_TYPE=linux
INCLUDEDIR=$(IPLANET_HOME)/include
-JAVA_INCLUDE=$(JAVA_HOME)/include
JK_DIR=../common
VPATH=.:$(JK_DIR)
JK_SRCS = $(shell \ls $(JK_DIR)/*.c)
JK_OBJECTS = $(patsubst $(JK_DIR)/%.c,%.o,$(JK_SRCS))
-JK_JNI_OBJECTS = jk_jni_worker.o jk_nwmain.o
JK_OBJS = $(filter-out $(JK_JNI_OBJECTS),$(JK_OBJECTS))
PLUGIN_OBJ = jk_nsapi_plugin.o
INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \
- -I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE)
-I$(JAVA_INCLUDE)/$(OS_TYPE)
+ -I$(INCLUDEDIR)/frame
all: nsapi_redirector.so
Modified: tomcat/jk/trunk/native/netscape/Makefile.netware
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.netware?rev=1202548&r1=1202547&r2=1202548&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.netware (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.netware Wed Nov 16 06:55:32 2011
@@ -24,10 +24,6 @@
ifndef NS_HOME
NS_HOME = c:/projects/sdks/netscape
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
@@ -122,7 +118,7 @@ SDK_LIBC = $(NDK_ROOT)/libc
JKCOMMON = ../common
INCLUDES = -I$(NS_HOME)/include -I$(NS_HOME)/include/base
-INCLUDES += -I$(JKCOMMON) -I$(NW_JDK)/include -I$(NW_JDK)/include/netware
+INCLUDES += -I$(JKCOMMON)
ifeq ($(LIBARCH),LIBC)
INCLUDES += -I$(SDK_LIBC)/include
@@ -156,7 +152,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/netscape/Makefile.solaris
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.solaris?rev=1202548&r1=1202547&r2=1202548&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.solaris (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.solaris Wed Nov 16 06:55:32 2011
@@ -52,24 +52,34 @@ JAVA_INCLUDE=$(JAVA_HOME)/include
JK_DIR=../common
VPATH=.:$(JK_DIR)
-JK_OBJS = ap_snprintf.o jk_md5.o \
-jk_ajp12_worker.o jk_msg_buff.o \
-jk_ajp13.o jk_nwmain.o \
-jk_ajp13_worker.o jk_pool.o \
-jk_ajp14.o jk_shm.o \
-jk_ajp14_worker.o jk_sockbuf.o \
-jk_ajp_common.o jk_status.o \
-jk_connect.o jk_uri_worker_map.o \
-jk_context.o jk_url.o \
-jk_jni_worker.o jk_util.o \
-jk_lb_worker.o jk_worker.o \
-jk_map.o
+JK_OBJS = ap_snprintf.o \
+ jk_md5.o \
+ jk_ajp12_worker.o \
+ jk_msg_buff.o \
+ jk_ajp13.o \
+ jk_nwmain.o \
+ jk_ajp13_worker.o \
+ jk_pool.o \
+ jk_ajp14.o \
+ jk_shm.o \
+ jk_ajp14_worker.o \
+ jk_sockbuf.o \
+ jk_ajp_common.o \
+ jk_status.o \
+ jk_connect.o \
+ jk_uri_worker_map.o \
+ jk_context.o \
+ jk_url.o \
+ jk_util.o \
+ jk_lb_worker.o \
+ jk_worker.o \
+ jk_map.o
PLUGIN_OBJ = jk_nsapi_plugin.o
INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \
- -I$(INCLUDEDIR)/frame -I$(JAVA_INCLUDE)
-I$(JAVA_INCLUDE)/$(OS_TYPE)
+ -I$(INCLUDEDIR)/frame
all: nsapi_redirector.so
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
