Author: mturk
Date: Wed Nov 16 07:07:10 2011
New Revision: 1202556
URL: http://svn.apache.org/viewvc?rev=1202556&view=rev
Log:
Axe deprecated JNI references from more places
Modified:
tomcat/jk/trunk/native/README.txt
tomcat/jk/trunk/native/TODO.txt
tomcat/jk/trunk/native/apache-2.0/bldjk.qclsrc
tomcat/jk/trunk/native/apache-2.0/bldjk54.qclsrc
tomcat/jk/trunk/native/build.xml
tomcat/jk/trunk/native/netscape/Makefile.linux
Modified: tomcat/jk/trunk/native/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/README.txt?rev=1202556&r1=1202555&r2=1202556&view=diff
==============================================================================
--- tomcat/jk/trunk/native/README.txt (original)
+++ tomcat/jk/trunk/native/README.txt Wed Nov 16 07:07:10 2011
@@ -31,9 +31,7 @@ force.
From mod_jk we gain :
* A connector (plugin) for many Web Server, including
- Apache HTTP Server, Netscape/IPLanet NES and Microsoft IIS
- It also support JNI (and seems to used at least by IBM under
- AS/400 for Apache/WebSphere connectivity).
+ Apache HTTP Server, Netscape/IPLanet NES and Microsoft IIS.
* Fault-tolerance and load-balancing. mod_jk use the concept of
workers which handle a particular request, and a special worker
Modified: tomcat/jk/trunk/native/TODO.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/TODO.txt?rev=1202556&r1=1202555&r2=1202556&view=diff
==============================================================================
--- tomcat/jk/trunk/native/TODO.txt (original)
+++ tomcat/jk/trunk/native/TODO.txt Wed Nov 16 07:07:10 2011
@@ -333,6 +333,7 @@ What about the other ifdef'd features?
23) Remove JNI worker
=====================
+Done
24) Watchdog reload of uriworkermap.properties
==============================================
Modified: tomcat/jk/trunk/native/apache-2.0/bldjk.qclsrc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/bldjk.qclsrc?rev=1202556&r1=1202555&r2=1202556&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/bldjk.qclsrc (original)
+++ tomcat/jk/trunk/native/apache-2.0/bldjk.qclsrc Wed Nov 16 07:07:10 2011
@@ -1,7 +1,7 @@
PGM
CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('mod_jk.c') +
OPTIMIZE(40) +
@@ -13,7 +13,7 @@ CRTCMOD MODULE(MOD_JK/MOD_JK) +
CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp_common.c') +
OPTIMIZE(40) +
@@ -25,7 +25,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp12_worker.c') +
OPTIMIZE(40) +
@@ -37,7 +37,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
CRTCMOD MODULE(MOD_JK/JK_AJP13) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13.c') +
OPTIMIZE(40) +
@@ -49,7 +49,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP13) +
CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13_worker.c') +
OPTIMIZE(40) +
@@ -61,7 +61,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
CRTCMOD MODULE(MOD_JK/JK_AJP14) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14.c') +
OPTIMIZE(40) +
@@ -73,7 +73,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP14) +
CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14_worker.c') +
OPTIMIZE(40) +
@@ -85,7 +85,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT' 'USE_SO_RCVTIMEO' +
'USE_SO_SNDTIMEO' ) +
TEXT('jk_connect.c') +
@@ -98,7 +98,7 @@ CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
CRTCMOD MODULE(MOD_JK/JK_CONTEXT) +
SRCSTMF('/home/apache/jk/native/common/jk_context.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_context.c') +
OPTIMIZE(40) +
@@ -108,22 +108,9 @@ CRTCMOD MODULE(MOD_JK/JK_CONTEXT) +
TGTRLS(*CURRENT) +
INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-CRTCMOD MODULE(MOD_JK/JK_JNI_WOR) +
- SRCSTMF('/home/apache/jk/native/common/jk_jni_worker.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' 'OS400_JVM_12' +
- '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' +
- '_REENTRANT') +
- TEXT('jk_jni_worker.c') +
- OPTIMIZE(40) +
- LOCALETYPE(*LOCALE) +
- SYSIFCOPT(*IFSIO) +
- LANGLVL(*EXTENDED) +
- TGTRLS(*CURRENT) +
- INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
CRTCMOD MODULE(MOD_JK/JK_LB_WORK) +
SRCSTMF('/home/apache/jk/native/common/jk_lb_worker.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_lb_worker.c') +
OPTIMIZE(40) +
@@ -135,7 +122,7 @@ CRTCMOD MODULE(MOD_JK/JK_LB_WORK) +
CRTCMOD MODULE(MOD_JK/JK_MAP) +
SRCSTMF('/home/apache/jk/native/common/jk_map.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_map.c') +
OPTIMIZE(40) +
@@ -147,7 +134,7 @@ CRTCMOD MODULE(MOD_JK/JK_MAP) +
CRTCMOD MODULE(MOD_JK/JK_MD5) +
SRCSTMF('/home/apache/jk/native/common/jk_md5.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_md5.c') +
OPTIMIZE(40) +
@@ -159,7 +146,7 @@ CRTCMOD MODULE(MOD_JK/JK_MD5) +
CRTCMOD MODULE(MOD_JK/JK_MSG_BUF) +
SRCSTMF('/home/apache/jk/native/common/jk_msg_buff.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_msg_buff.c') +
OPTIMIZE(40) +
@@ -171,7 +158,7 @@ CRTCMOD MODULE(MOD_JK/JK_MSG_BUF) +
CRTCMOD MODULE(MOD_JK/JK_POOL) +
SRCSTMF('/home/apache/jk/native/common/jk_pool.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_pool.c') +
OPTIMIZE(40) +
@@ -183,7 +170,7 @@ CRTCMOD MODULE(MOD_JK/JK_POOL) +
CRTCMOD MODULE(MOD_JK/JK_SOCKBUF) +
SRCSTMF('/home/apache/jk/native/common/jk_sockbuf.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_sockbuf.c') +
OPTIMIZE(40) +
@@ -195,7 +182,7 @@ CRTCMOD MODULE(MOD_JK/JK_SOCKBUF) +
CRTCMOD MODULE(MOD_JK/JK_URI_W_M) +
SRCSTMF('/home/apache/jk/native/common/jk_uri_worker_map.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_uri_worker_map.c') +
OPTIMIZE(40) +
@@ -207,7 +194,7 @@ CRTCMOD MODULE(MOD_JK/JK_URI_W_M) +
CRTCMOD MODULE(MOD_JK/JK_URL) +
SRCSTMF('/home/apache/jk/native/common/jk_url.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_url.c') +
OPTIMIZE(40) +
@@ -219,7 +206,7 @@ CRTCMOD MODULE(MOD_JK/JK_URL) +
CRTCMOD MODULE(MOD_JK/JK_UTIL) +
SRCSTMF('/home/apache/jk/native/common/jk_util.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_util.c') +
OPTIMIZE(40) +
@@ -231,7 +218,7 @@ CRTCMOD MODULE(MOD_JK/JK_UTIL) +
CRTCMOD MODULE(MOD_JK/JK_WORKER) +
SRCSTMF('/home/apache/jk/native/common/jk_worker.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_worker.c') +
OPTIMIZE(40) +
@@ -243,7 +230,7 @@ CRTCMOD MODULE(MOD_JK/JK_WORKER) +
CRTCMOD MODULE(MOD_JK/JK_STATUS) +
SRCSTMF('/home/apache/jk/native/common/jk_status.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_status.c') +
OPTIMIZE(40) +
@@ -255,7 +242,7 @@ CRTCMOD MODULE(MOD_JK/JK_STATUS) +
CRTCMOD MODULE(MOD_JK/JK_SHM) +
SRCSTMF('/home/apache/jk/native/common/jk_shm.c') +
- DEFINE('AS400' 'HAVE_JNI' 'HAVE_APR' '_XOPEN_SOURCE=520' +
+ DEFINE('AS400' 'HAVE_APR' '_XOPEN_SOURCE=520' +
'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_shm.c') +
OPTIMIZE(40) +
@@ -271,7 +258,7 @@ CRTSRVPGM SRVPGM(MOD_JK/MOD_JK) +
MOD_JK/JK_AJP13 MOD_JK/JK_AJP13_W +
MOD_JK/JK_AJP14 MOD_JK/JK_AJP14_W +
MOD_JK/JK_CONNECT MOD_JK/JK_CONTEXT +
- MOD_JK/JK_JNI_WOR MOD_JK/JK_LB_WORK +
+ MOD_JK/JK_LB_WORK +
MOD_JK/JK_MAP MOD_JK/JK_MD5 +
MOD_JK/JK_MSG_BUF MOD_JK/JK_POOL +
MOD_JK/JK_SOCKBUF MOD_JK/JK_URI_W_M +
Modified: tomcat/jk/trunk/native/apache-2.0/bldjk54.qclsrc
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/bldjk54.qclsrc?rev=1202556&r1=1202555&r2=1202556&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/bldjk54.qclsrc (original)
+++ tomcat/jk/trunk/native/apache-2.0/bldjk54.qclsrc Wed Nov 16 07:07:10 2011
@@ -1,7 +1,7 @@
PGM
CRTCMOD MODULE(MOD_JK/MOD_JK) +
SRCSTMF('/home/apache/jk/native/apache-2.0/mod_jk.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('mod_jk.c') +
OPTIMIZE(40) +
@@ -14,7 +14,7 @@ CRTCMOD MODULE(MOD_JK/MOD_JK) +
CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp_common.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp_common.c') +
OPTIMIZE(40) +
@@ -27,7 +27,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP_COM) +
CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp12_worker.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp12_worker.c') +
OPTIMIZE(40) +
@@ -40,7 +40,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP12_W) +
CRTCMOD MODULE(MOD_JK/JK_AJP13) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13.c') +
OPTIMIZE(40) +
@@ -53,7 +53,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP13) +
CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp13_worker.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp13_worker.c') +
OPTIMIZE(40) +
@@ -66,7 +66,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP13_W) +
CRTCMOD MODULE(MOD_JK/JK_AJP14) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14.c') +
OPTIMIZE(40) +
@@ -79,7 +79,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP14) +
CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
SRCSTMF('/home/apache/jk/native/common/jk_ajp14_worker.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_ajp14_worker.c') +
OPTIMIZE(40) +
@@ -92,7 +92,7 @@ CRTCMOD MODULE(MOD_JK/JK_AJP14_W) +
CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
SRCSTMF('/home/apache/jk/native/common/jk_connect.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT' +
'USE_SO_RCVTIMEO' + 'USE_SO_SNDTIMEO' ) +
TEXT('jk_connect.c') +
@@ -106,7 +106,7 @@ CRTCMOD MODULE(MOD_JK/JK_CONNECT) +
CRTCMOD MODULE(MOD_JK/JK_CONTEXT) +
SRCSTMF('/home/apache/jk/native/common/jk_context.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_context.c') +
OPTIMIZE(40) +
@@ -117,23 +117,9 @@ CRTCMOD MODULE(MOD_JK/JK_CONTEXT) +
TGTRLS(*CURRENT) +
INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-CRTCMOD MODULE(MOD_JK/JK_JNI_WOR) +
- SRCSTMF('/home/apache/jk/native/common/jk_jni_worker.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' 'OS400_JVM_12' +
- '_XOPEN_SOURCE=520' + 'USE_APACHE_MD5' +
- '_REENTRANT') +
- TEXT('jk_jni_worker.c') +
- OPTIMIZE(40) +
- LOCALETYPE(*LOCALEUTF) +
- SYSIFCOPT(*IFSIO) +
- LANGLVL(*EXTENDED) +
- TERASPACE(*YES) +
- TGTRLS(*CURRENT) +
- INCDIR('/home/apache/jk/native/common' '/QIBM/ProdData/HTTPA/Include')
-
CRTCMOD MODULE(MOD_JK/JK_LB_WORK) +
SRCSTMF('/home/apache/jk/native/common/jk_lb_worker.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_lb_worker.c') +
OPTIMIZE(40) +
@@ -146,7 +132,7 @@ CRTCMOD MODULE(MOD_JK/JK_LB_WORK) +
CRTCMOD MODULE(MOD_JK/JK_MAP) +
SRCSTMF('/home/apache/jk/native/common/jk_map.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_map.c') +
OPTIMIZE(40) +
@@ -159,7 +145,7 @@ CRTCMOD MODULE(MOD_JK/JK_MAP) +
CRTCMOD MODULE(MOD_JK/JK_MD5) +
SRCSTMF('/home/apache/jk/native/common/jk_md5.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_md5.c') +
OPTIMIZE(40) +
@@ -172,7 +158,7 @@ CRTCMOD MODULE(MOD_JK/JK_MD5) +
CRTCMOD MODULE(MOD_JK/JK_MSG_BUF) +
SRCSTMF('/home/apache/jk/native/common/jk_msg_buff.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_msg_buff.c') +
OPTIMIZE(40) +
@@ -185,7 +171,7 @@ CRTCMOD MODULE(MOD_JK/JK_MSG_BUF) +
CRTCMOD MODULE(MOD_JK/JK_POOL) +
SRCSTMF('/home/apache/jk/native/common/jk_pool.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_pool.c') +
OPTIMIZE(40) +
@@ -198,7 +184,7 @@ CRTCMOD MODULE(MOD_JK/JK_POOL) +
CRTCMOD MODULE(MOD_JK/JK_SOCKBUF) +
SRCSTMF('/home/apache/jk/native/common/jk_sockbuf.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_sockbuf.c') +
OPTIMIZE(40) +
@@ -211,7 +197,7 @@ CRTCMOD MODULE(MOD_JK/JK_SOCKBUF) +
CRTCMOD MODULE(MOD_JK/JK_URI_W_M) +
SRCSTMF('/home/apache/jk/native/common/jk_uri_worker_map.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_uri_worker_map.c') +
OPTIMIZE(40) +
@@ -224,7 +210,7 @@ CRTCMOD MODULE(MOD_JK/JK_URI_W_M) +
CRTCMOD MODULE(MOD_JK/JK_URL) +
SRCSTMF('/home/apache/jk/native/common/jk_url.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_url.c') +
OPTIMIZE(40) +
@@ -237,7 +223,7 @@ CRTCMOD MODULE(MOD_JK/JK_URL) +
CRTCMOD MODULE(MOD_JK/JK_UTIL) +
SRCSTMF('/home/apache/jk/native/common/jk_util.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_util.c') +
OPTIMIZE(40) +
@@ -250,7 +236,7 @@ CRTCMOD MODULE(MOD_JK/JK_UTIL) +
CRTCMOD MODULE(MOD_JK/JK_WORKER) +
SRCSTMF('/home/apache/jk/native/common/jk_worker.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_worker.c') +
OPTIMIZE(40) +
@@ -263,7 +249,7 @@ CRTCMOD MODULE(MOD_JK/JK_WORKER) +
CRTCMOD MODULE(MOD_JK/JK_STATUS) +
SRCSTMF('/home/apache/jk/native/common/jk_status.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_status.c') +
OPTIMIZE(40) +
@@ -276,7 +262,7 @@ CRTCMOD MODULE(MOD_JK/JK_STATUS) +
CRTCMOD MODULE(MOD_JK/JK_SHM) +
SRCSTMF('/home/apache/jk/native/common/jk_shm.c') +
- DEFINE('AS400' 'AS400_UTF8' 'HAVE_JNI' 'HAVE_APR' +
+ DEFINE('AS400' 'AS400_UTF8' 'HAVE_APR' +
'_XOPEN_SOURCE=520' 'USE_APACHE_MD5' '_REENTRANT') +
TEXT('jk_shm.c') +
OPTIMIZE(40) +
@@ -293,7 +279,7 @@ CRTSRVPGM SRVPGM(MOD_JK/MOD_JK) +
MOD_JK/JK_AJP13 MOD_JK/JK_AJP13_W +
MOD_JK/JK_AJP14 MOD_JK/JK_AJP14_W +
MOD_JK/JK_CONNECT MOD_JK/JK_CONTEXT +
- MOD_JK/JK_JNI_WOR MOD_JK/JK_LB_WORK +
+ MOD_JK/JK_LB_WORK +
MOD_JK/JK_MAP MOD_JK/JK_MD5 +
MOD_JK/JK_MSG_BUF MOD_JK/JK_POOL +
MOD_JK/JK_SOCKBUF MOD_JK/JK_URI_W_M +
Modified: tomcat/jk/trunk/native/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/build.xml?rev=1202556&r1=1202555&r2=1202556&view=diff
==============================================================================
--- tomcat/jk/trunk/native/build.xml (original)
+++ tomcat/jk/trunk/native/build.xml Wed Nov 16 07:07:10 2011
@@ -49,7 +49,7 @@
<!-- ==================== Targets ==================== -->
- <target name="main" depends="init,apache20,apache13,iis,netscape,jni">
+ <target name="main" depends="init,apache20,apache13,iis,netscape">
</target>
<target name="init" >
@@ -88,78 +88,6 @@
</target>
- <target name="jni" depends="init">
- <mkdir dir="${jk.build}/jk/jni" />
- <so sofile="jni_connect"
- buildDir="${jk.build}/jk/jni"
- optimize="${so.optimize}"
- debug="${so.debug}"
- profile="${so.profile}"
- >
- <jniConfig />
- <src dir="${native.dir}">
- <include name="jni/*.c" />
- <include name="common/jk_map.c" />
- <include name="common/jk_util.c" />
- <include name="common/jk_pool.c" />
- <include name="common/jk_logger.c" />
- <include name="common/jk_nwmain.c" if="netware" />
- <include name="common/apr/*.c" unless="HAVE_APR" />
- </src>
- <includes>
- <include name="${native.dir}/common" />
- <include name="${native.dir}/jni" />
- <include name="${java.home}/../include" />
- <include name="${build.compiler.base}/include" />
-
- <!-- Platform specific includes -->
- <include name="${novellndk.home}/include/nlm" if="netware" />
- <include name="${novellndk.home}/include" if="netware" />
- <include name="${java.home}/../include/netware" if="netware" />
- <include name="${java.home}/../include/solaris" if="solaris" />
- <include name="${java.home}/../include/hp-ux" if="hpux" />
- <include name="${java.home}/../include/linux" if="linux"/>
- <include name="${java.home}/../include/win32" if="win32"
unless="netware" />
- </includes>
- <depends>
- <fileset dir="${native.dir}/common" includes="*.h" />
- </depends>
-
- <!-- Platform-specific tags -->
- <altSoFile value="jni_conn" if="netware" />
-
- <def name="N_PLAT_NLM" if="netware"
- info="Building for NetWare platform" />
- <def name="NETWARE" if="netware"
- info="Building for NetWare platform" />
- <def name="XP_NETWARE" if="netware"
- info="Building for NetWare platform" />
-
- <import fileName="${novellndk.home}/imports/clib.imp" if="netware" />
- <import fileName="${novellndk.home}/imports/lib0.imp" if="netware" />
- <import fileName="${novellndk.home}/imports/nlmlib.imp" if="netware" />
- <import fileName="${novellndk.home}/imports/threads.imp" if="netware" />
- <import fileName="${novellndk.home}/imports/socklib.imp" if="netware" />
- <export fileName="${native.dir}/jni/jk_jnicb.exp" if="netware" />
- <linkOpt value="-desc "JNI Natives for Tomcat"" if="netware" />
- <linkOpt value="-screenname "System Console"" if="netware" />
- <linkOpt value="-nlmversion 1,2,6" if="netware" />
- <linkOpt value="-threadname "JK_JNI Thread"" if="netware" />
- <linkOpt value="-stacksize 64000" if="netware" />
-
- <def name="HPUX11" if="hpux" />
-
- <def name="WIN32" if="win32" unless="netware" />
- <def name="DEBUG" if="win32.debug" unless="netware" />
- <def name="NDEBUG" if="win32.release" unless="netware" />
- <def name="_WINDOWS" if="win32" unless="netware" />
- <def name="_MBCS" if="win32" unless="netware" />
- <def name="_USRDLL" if="win32" unless="netware" />
- <def name="JNI_CONNECT_EXPORTS" if="win32" unless="netware" />
- <linkOpt value="/libpath:"${build.compiler.base}/lib""
if="win32" unless="netware" />
- </so>
- </target>
-
<target name="apache20" depends="init" if="apache2.detect">
<mkdir dir="${jk.build}/jk/apache2" />
<so sofile="mod_jk"
Modified: tomcat/jk/trunk/native/netscape/Makefile.linux
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.linux?rev=1202556&r1=1202555&r2=1202556&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.linux (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.linux Wed Nov 16 07:07:10 2011
@@ -37,8 +37,6 @@ VPATH=.:$(JK_DIR)
JK_SRCS = $(shell \ls $(JK_DIR)/*.c)
JK_OBJECTS = $(patsubst $(JK_DIR)/%.c,%.o,$(JK_SRCS))
-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 \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
