costin 02/04/10 22:20:49
Modified: jk/native2 build.xml
Log:
A bigger change in the way we build native2.
So far we had a jni_connect ( I changed the name to libjkjni since it conflicts with
jk1 )
It contained a subset of jk and the native methods ( the minimum amount required to
get
jni working ). I changed this to include the whole thing - that will allow java to
access all the features of jk, including the future scoreboard and all channels/etc.
( and more APR features will be used/exposed directly or in jk objects at a higher
level)
A second change is in the mod_jk2.so - it didn't include any jni method. That's
a source of big problems since the jni worker will try to load jni_connect and is
likely to run into conflicts.
The JNI methods do not have _any_ dependency on java - just plain C methods taking
some pointer parameters. The JNI header and the pointers to functions are doing
all the magic. So if we include support for the JNI worker ( i.e. we have jni.h )
we can also include the jni methods in the same .so
Revision Changes Path
1.20 +6 -8 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 10 Apr 2002 23:41:22 -0000 1.19
+++ build.xml 11 Apr 2002 05:20:48 -0000 1.20
@@ -97,6 +97,7 @@
<include name="server/apache2/*.c" />
<include name="common/*.c" />
<include name="common/apr/*.c" />
+ <include name="jni/*.c" />
</src>
<includes>
<include name="${native.dir}/common" />
@@ -155,20 +156,15 @@
<target name="jni" depends="init">
<mkdir dir="${build.dir}/jni" />
- <so sofile="jni_connect"
+ <so sofile="libjkjni"
buildDir="${build.dir}/jni"
optimize="${so.optimize}"
debug="${so.debug}"
profile="${so.profile}" >
<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="apr/*.c" if="HAVE_APR" />
- <exclude name="jni/jk_jni_aprImpl.c" unless="HAVE_APR" />
+ <include name="common/*.c" />
+ <exclude name="common/jk_nwmain.c" unless="netware" />
</src>
<includes>
<include name="${native.dir}/common" />
@@ -329,6 +325,7 @@
<exclude name="jk_nwmain.c"
unless="netware" />
<include name="common/apr/*.c" unless="HAVE_APR" />
+ <include name="jni/*.c" />
</src>
<includes>
<include name="${java.home}/../include" />
@@ -378,6 +375,7 @@
<exclude name="jk_nwmain.c"
unless="netware" />
<include name="common/apr/*.c" unless="HAVE_APR" />
+ <include name="jni/*.c" />
</src>
<includes>
<include name="${native.dir}/common" />
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
