From kempmelanie@example.net Thu Jan 01 10:53:18 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 90523 invoked from network); 1 Jan 2009 10:53:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 10:53:18 -0000 Received: (qmail 197 invoked by uid 500); 1 Jan 2009 10:53:11 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 149 invoked by uid 500); 1 Jan 2009 10:53:11 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 138 invoked by uid 99); 1 Jan 2009 10:53:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 02:53:11 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 10:53:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7668623888F1; Thu, 1 Jan 2009 02:52:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730523 - in /tomcat/connectors/trunk/jni: java/org/apache/tomcat/jni/ native/src/ Date: Thu, 01 Jan 2009 10:52:46 -0000 To: kempmelanie@example.net From: kempmelanie@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <kempmelanie@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Jan 1 02:52:46 2009 New Revision: 730523 URL: http://svn.apache.org/viewvc?rev=730523&view=rev Log: Sync methods implemented natively with their Java references. Fixes BZ 46457 and several other inconsistencies: Changes to Java code: Buffer: rename alloc() to malloc() Buffer: change return type of size() from int to long File: add getStat() and getInfo() Registry: change val parameter in setValueJ() from int to long Socket: add acceptx() SSLContext: add setRandom() SSLContext: rename setShutdowType() to setShutdownType() Stdlib: change num parameter in calloc() from long to int Changes to native code: address.c: change return type of equal() from int to boolean file.c: change pool parameter in mktemp() from int to long lock.c: refer to Java method destroy instead of destoy in Global and Lock multicast.c: refer to Java class Multicast instead of Mulicast ssl.c: add randSet() in non-OpenSSL case sslcontext.c: whitespace Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Registry.java tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Socket.java tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Stdlib.java tomcat/connectors/trunk/jni/native/src/address.c tomcat/connectors/trunk/jni/native/src/file.c tomcat/connectors/trunk/jni/native/src/lock.c tomcat/connectors/trunk/jni/native/src/multicast.c tomcat/connectors/trunk/jni/native/src/ssl.c tomcat/connectors/trunk/jni/native/src/sslcontext.c Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Buffer.java Thu Jan 1 02:52:46 2009 @@ -32,7 +32,7 @@ * @param size The amount of memory to allocate * @return The ByteBuffer with allocated memory */ - public static native ByteBuffer alloc(int size); + public static native ByteBuffer malloc(int size); /** * Allocate a new ByteBuffer from memory and set all of the memory to 0 @@ -86,6 +86,6 @@ * Returns the allocated memory size of the ByteBuffer. * @param buf Previously allocated ByteBuffer. */ - public static native int size(ByteBuffer buf); + public static native long size(ByteBuffer buf); } Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java Thu Jan 1 02:52:46 2009 @@ -693,6 +693,16 @@ public static native int stat(FileInfo finfo, String fname, int wanted, long pool); /** + * Get the specified file's stats. The file is specified by filename, + * instead of using a pre-opened file. + * @param fname The name of the file to stat. + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values + * @param pool the pool to use to allocate the new file. + * @return FileInfo object. + */ + public static native FileInfo getStat(String fname, int wanted, long pool); + + /** * Get the specified file's stats. * @param finfo Where to store the information about the file. * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values @@ -700,4 +710,13 @@ */ public static native int infoGet(FileInfo finfo, int wanted, long thefile); + + /** + * Get the specified file's stats. + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values + * @param thefile The file to get information about. + * @return FileInfo object. + */ + public static native FileInfo getInfo(int wanted, long thefile); + } Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Registry.java?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Registry.java Thu Jan 1 02:52:46 2009 @@ -156,7 +156,7 @@ * @param val The the value to set * @return If the function succeeds, the return value is 0 */ - public static native int setValueJ(long key, String name, int val); + public static native int setValueJ(long key, String name, long val); /** * Set the Registry value for REG_SZ Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java Thu Jan 1 02:52:46 2009 @@ -226,6 +226,13 @@ throws Exception; /** + * Set file for randomness + * @param ctx Server or Client context to use. + * @param file random file. + */ + public static native void setRandom(long ctx, String file) + + /** * Set SSL connection shutdown type * <br /> * The following levels are available for level: @@ -237,7 +244,7 @@ * @param ctx Server or Client context to use. * @param type Shutdown type to use. */ - public static native void setShutdowType(long ctx, int type); + public static native void setShutdownType(long ctx, int type); /** * Set Type of Client Certificate verification and Maximum depth of CA Certificates Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Socket.java?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Socket.java Thu Jan 1 02:52:46 2009 @@ -170,6 +170,16 @@ * made the connection request. This is the socket which should * be used for all future communication. */ + public static native long acceptx(long sock, long pool) + throws Exception; + + /** + * Accept a new connection request + * @param sock The socket we are listening on. + * @return A copy of the socket that is connected to the socket that + * made the connection request. This is the socket which should + * be used for all future communication. + */ public static native long accept(long sock) throws Exception; Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Stdlib.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Stdlib.java?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Stdlib.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Stdlib.java Thu Jan 1 02:52:46 2009 @@ -67,7 +67,7 @@ * @param num Number of elements. * @param sz Length in bytes of each element. */ - public static native long calloc(long num, int sz); + public static native long calloc(int num, int sz); /** * Deallocates or frees a memory block. Modified: tomcat/connectors/trunk/jni/native/src/address.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/address.c?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/native/src/address.c (original) +++ tomcat/connectors/trunk/jni/native/src/address.c Thu Jan 1 02:52:46 2009 @@ -103,8 +103,8 @@ return P2J(sa); } -TCN_IMPLEMENT_CALL(jint, Address, equal)(TCN_STDARGS, - jlong a, jlong b) +TCN_IMPLEMENT_CALL(jboolean, Address, equal)(TCN_STDARGS, + jlong a, jlong b) { apr_sockaddr_t *sa = J2P(a, apr_sockaddr_t *); apr_sockaddr_t *sb = J2P(b, apr_sockaddr_t *); Modified: tomcat/connectors/trunk/jni/native/src/file.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/file.c?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/native/src/file.c (original) +++ tomcat/connectors/trunk/jni/native/src/file.c Thu Jan 1 02:52:46 2009 @@ -92,7 +92,7 @@ TCN_IMPLEMENT_CALL(jlong, File, mktemp)(TCN_STDARGS, jstring templ, jint flags, - jint pool) + jlong pool) { apr_pool_t *p = J2P(pool, apr_pool_t *); apr_file_t *f = NULL; Modified: tomcat/connectors/trunk/jni/native/src/lock.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/lock.c?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/native/src/lock.c (original) +++ tomcat/connectors/trunk/jni/native/src/lock.c Thu Jan 1 02:52:46 2009 @@ -84,7 +84,7 @@ return (jint)apr_proc_mutex_unlock(m); } -TCN_IMPLEMENT_CALL(jint, Lock, destoy)(TCN_STDARGS, jlong mutex) +TCN_IMPLEMENT_CALL(jint, Lock, destroy)(TCN_STDARGS, jlong mutex) { apr_proc_mutex_t *m = J2P(mutex, apr_proc_mutex_t *); @@ -192,7 +192,7 @@ return (jint)apr_global_mutex_unlock(m); } -TCN_IMPLEMENT_CALL(jint, Global, destoy)(TCN_STDARGS, jlong mutex) +TCN_IMPLEMENT_CALL(jint, Global, destroy)(TCN_STDARGS, jlong mutex) { apr_global_mutex_t *m = J2P(mutex, apr_global_mutex_t *); Modified: tomcat/connectors/trunk/jni/native/src/multicast.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/multicast.c?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/native/src/multicast.c (original) +++ tomcat/connectors/trunk/jni/native/src/multicast.c Thu Jan 1 02:52:46 2009 @@ -22,9 +22,9 @@ #include "tcn.h" -TCN_IMPLEMENT_CALL(jint, Mulicast, join)(TCN_STDARGS, - jlong sock, jlong join, - jlong iface, jlong source) +TCN_IMPLEMENT_CALL(jint, Multicast, join)(TCN_STDARGS, + jlong sock, jlong join, + jlong iface, jlong source) { tcn_socket_t *s = J2P(sock, tcn_socket_t *); apr_sockaddr_t *ja = J2P(join, apr_sockaddr_t *); @@ -34,9 +34,9 @@ return (jint)apr_mcast_join(s->sock, ja, ia, sa); }; -TCN_IMPLEMENT_CALL(jint, Mulicast, leave)(TCN_STDARGS, - jlong sock, jlong addr, - jlong iface, jlong source) +TCN_IMPLEMENT_CALL(jint, Multicast, leave)(TCN_STDARGS, + jlong sock, jlong addr, + jlong iface, jlong source) { tcn_socket_t *s = J2P(sock, tcn_socket_t *); apr_sockaddr_t *aa = J2P(addr, apr_sockaddr_t *); @@ -46,16 +46,16 @@ return (jint)apr_mcast_leave(s->sock, aa, ia, sa); }; -TCN_IMPLEMENT_CALL(jint, Mulicast, hops)(TCN_STDARGS, - jlong sock, jint ttl) +TCN_IMPLEMENT_CALL(jint, Multicast, hops)(TCN_STDARGS, + jlong sock, jint ttl) { tcn_socket_t *s = J2P(sock, tcn_socket_t *); UNREFERENCED_STDARGS; return (jint)apr_mcast_hops(s->sock, (apr_byte_t)ttl); }; -TCN_IMPLEMENT_CALL(jint, Mulicast, loopback)(TCN_STDARGS, - jlong sock, jboolean opt) +TCN_IMPLEMENT_CALL(jint, Multicast, loopback)(TCN_STDARGS, + jlong sock, jboolean opt) { tcn_socket_t *s = J2P(sock, tcn_socket_t *); apr_byte_t on = 0; @@ -65,8 +65,8 @@ return (jint)apr_mcast_loopback(s->sock, on); }; -TCN_IMPLEMENT_CALL(jint, Mulicast, ointerface)(TCN_STDARGS, - jlong sock, jlong iface) +TCN_IMPLEMENT_CALL(jint, Multicast, ointerface)(TCN_STDARGS, + jlong sock, jlong iface) { tcn_socket_t *s = J2P(sock, tcn_socket_t *); apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *); Modified: tomcat/connectors/trunk/jni/native/src/ssl.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/ssl.c?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/native/src/ssl.c (original) +++ tomcat/connectors/trunk/jni/native/src/ssl.c Thu Jan 1 02:52:46 2009 @@ -859,6 +859,12 @@ return JNI_FALSE; } +TCN_IMPLEMENT_CALL(void, SSL, randSet)(TCN_STDARGS, jstring file) +{ + UNREFERENCED_STDARGS; + UNREFERENCED(file); +} + TCN_IMPLEMENT_CALL(jlong, SSL, newBIO)(TCN_STDARGS, jlong pool, jobject callback) { Modified: tomcat/connectors/trunk/jni/native/src/sslcontext.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/sslcontext.c?rev=730523&r1=730522&r2=730523&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/native/src/sslcontext.c (original) +++ tomcat/connectors/trunk/jni/native/src/sslcontext.c Thu Jan 1 02:52:46 2009 @@ -494,7 +494,7 @@ jstring file) { tcn_ssl_ctxt_t *c = J2P(ctx, tcn_ssl_ctxt_t *); - TCN_ALLOC_CSTRING(file); + TCN_ALLOC_CSTRING(file); TCN_ASSERT(ctx != 0); UNREFERENCED(o); --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 11:25:14 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 98777 invoked from network); 1 Jan 2009 11:25:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 11:25:14 -0000 Received: (qmail 12852 invoked by uid 500); 1 Jan 2009 11:25:07 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 12742 invoked by uid 500); 1 Jan 2009 11:25:06 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 12731 invoked by uid 99); 1 Jan 2009 11:25:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 03:25:05 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 11:25:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 99F2523888F1; Thu, 1 Jan 2009 03:24:42 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730528 - /tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java Date: Thu, 01 Jan 2009 11:24:42 -0000 To: kempmelanie@example.net From: kempmelanie@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <kempmelanie@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Jan 1 03:24:40 2009 New Revision: 730528 URL: http://svn.apache.org/viewvc?rev=730528&view=rev Log: Fix syntax error introduced in r730523. Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java?rev=730528&r1=730527&r2=730528&view=diff ============================================================================== --- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java (original) +++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java Thu Jan 1 03:24:40 2009 @@ -230,7 +230,7 @@ * @param ctx Server or Client context to use. * @param file random file. */ - public static native void setRandom(long ctx, String file) + public static native void setRandom(long ctx, String file); /** * Set SSL connection shutdown type --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 11:44:54 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 3553 invoked from network); 1 Jan 2009 11:44:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 11:44:54 -0000 Received: (qmail 18968 invoked by uid 500); 1 Jan 2009 11:44:43 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 18908 invoked by uid 500); 1 Jan 2009 11:44:42 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 18896 invoked by uid 99); 1 Jan 2009 11:44:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 03:44:42 -0800 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [83.161.120.155] (HELO smtp7-g19.free.fr) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 11:44:34 +0000 Received: from smtp7-g19.free.fr (localhost [83.161.120.155]) by smtp7-g19.free.fr (Postfix) with ESMTP id D3BA3B0142 for <kempmelanie@example.net>; Thu, 1 Jan 2009 12:44:12 +0100 (CET) Received: from [83.161.120.155] (lap34-1-82-224-140-72.fbx.proxad.net [83.161.120.155]) by smtp7-g19.free.fr (Postfix) with ESMTP id ADAACB013D for <kempmelanie@example.net>; Thu, 1 Jan 2009 12:44:12 +0100 (CET) Subject: Re: svn commit: r730523 - in /tomcat/connectors/trunk/jni: java/org/apache/tomcat/jni/ native/src/ From: Remy Maucherat <kempmelanie@example.net> To: Tomcat Developers List <kempmelanie@example.net> In-Reply-To: <kempmelanie@example.net> References: <kempmelanie@example.net> Content-Type: text/plain; charset=utf-8 Date: Thu, 01 Jan 2009 12:44:11 +0100 Message-Id: <kempmelanie@example.net> Mime-Version: 1.0 X-Mailer: Evolution 83.161.120.155 (83.161.120.155-1.fc9) Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org On Thu, 2009-01-01 at 10:52 +0000, kempmelanie@example.net wrote: > Author: rjung > Date: Thu Jan 1 02:52:46 2009 > New Revision: 730523 > > URL: http://svn.apache.org/viewvc?rev=730523&view=rev > Log: > Sync methods implemented natively with their Java > references. > > Fixes BZ 46457 and several other inconsistencies: -1. This trunk is used for the stable tomcat-native, and it does change method signatures. Rémy --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 12:24:54 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 20399 invoked from network); 1 Jan 2009 12:24:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 12:24:54 -0000 Received: (qmail 27812 invoked by uid 500); 1 Jan 2009 12:24:47 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 27765 invoked by uid 500); 1 Jan 2009 12:24:47 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 27754 invoked by uid 99); 1 Jan 2009 12:24:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 04:24:47 -0800 X-ASF-Spam-Status: No, hits=-4.0 required=10.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [83.161.120.155] (HELO mailserver.kippdata.de) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 12:24:40 +0000 Received: from [83.161.120.155] ([83.161.120.155]) by mailserver.kippdata.de (8.13.5/8.13.5) with ESMTP id n01COIcC019770 for <kempmelanie@example.net>; Thu, 1 Jan 2009 13:24:18 +0100 (CET) Message-ID: <kempmelanie@example.net> Date: Thu, 01 Jan 2009 13:23:38 +0100 From: Rainer Jung <kempmelanie@example.net> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b3pre) Gecko/20081204 Thunderbird/3.0b1 MIME-Version: 1.0 To: Tomcat Developers List <kempmelanie@example.net> Subject: Re: svn commit: r730523 - in /tomcat/connectors/trunk/jni:java/org/apache/tomcat/jni/ native/src/ References: <kempmelanie@example.net> <kempmelanie@example.net> In-Reply-To: <kempmelanie@example.net> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org On 01.01.2009 12:44, Remy Maucherat wrote: > On Thu, 2009-01-01 at 10:52 +0000, kempmelanie@example.net wrote: >> Author: rjung >> Date: Thu Jan 1 02:52:46 2009 >> New Revision: 730523 >> >> URL: http://svn.apache.org/viewvc?rev=730523&view=rev >> Log: >> Sync methods implemented natively with their Java >> references. >> >> Fixes BZ 46457 and several other inconsistencies: > > -1. This trunk is used for the stable tomcat-native, and it does change > method signatures. Rémy, we do have a 1.1.x branch in tcnative which is supposed to be the stable brach. Nevertheless I just noticed the dependency between TC 5.5 and this trunk. I'll write a separate mail to discuss. If we don't find a better solution, I'll revert. Please check my separate message. Regards, Rainer --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 12:28:08 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 21366 invoked from network); 1 Jan 2009 12:28:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 12:28:08 -0000 Received: (qmail 30747 invoked by uid 500); 1 Jan 2009 12:28:01 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 30687 invoked by uid 500); 1 Jan 2009 12:28:01 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 30676 invoked by uid 99); 1 Jan 2009 12:28:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 04:28:01 -0800 X-ASF-Spam-Status: No, hits=-4.0 required=10.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [83.161.120.155] (HELO mailserver.kippdata.de) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 12:27:54 +0000 Received: from [83.161.120.155] ([83.161.120.155]) by mailserver.kippdata.de (8.13.5/8.13.5) with ESMTP id n01CRVh4019870 for <kempmelanie@example.net>; Thu, 1 Jan 2009 13:27:32 +0100 (CET) Message-ID: <kempmelanie@example.net> Date: Thu, 01 Jan 2009 13:26:52 +0100 From: Rainer Jung <kempmelanie@example.net> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b3pre) Gecko/20081204 Thunderbird/3.0b1 MIME-Version: 1.0 To: Tomcat Developers List <kempmelanie@example.net> Subject: JNI svn structure wierdness Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Hi, I just fixed some glitches in tcnative. I noticed the following problem: We now have two branches for jni, 1.1.x and trunk, actually they are complete branches of the full connectors, so especially both contain the native and the java side of JNI. TC 5.5.x has an external reference to connectors trunk. I would expect, that we would like it to use connectors trunk in general, but branches/1.1.x for the jni related stuff (the Java side we bundle in tomcat-apr.jar). It looks like we need another external reference directly pointing to the jni branch and enhance build.xml to use the Java jni stuff from that one. Another option would be to split up connectors and move the parts independently versioned outside and into separate directories. Any better ideas? For TC6 and trunk I see no such problem, because they already have their private copy of connectors Java classes. For TC4.1 we don't bundle any of the JNI stuff except in the src distribution (more or less by accident). Regards, Rainer --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 12:58:09 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 28549 invoked from network); 1 Jan 2009 12:58:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 12:58:08 -0000 Received: (qmail 36123 invoked by uid 500); 1 Jan 2009 12:58:02 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 36070 invoked by uid 500); 1 Jan 2009 12:58:02 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 36059 invoked by uid 99); 1 Jan 2009 12:58:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 04:58:01 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 12:57:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E963123888A5; Thu, 1 Jan 2009 04:57:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730538 - /tomcat/trunk/java/org/apache/tomcat/jni/OS.java Date: Thu, 01 Jan 2009 12:57:36 -0000 To: kempmelanie@example.net From: kempmelanie@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <kempmelanie@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Jan 1 04:57:36 2009 New Revision: 730538 URL: http://svn.apache.org/viewvc?rev=730538&view=rev Log: Port r708867 from tcnative trunk to tc trunk. Modified: tomcat/trunk/java/org/apache/tomcat/jni/OS.java Modified: tomcat/trunk/java/org/apache/tomcat/jni/OS.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/OS.java?rev=730538&r1=730537&r2=730538&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/OS.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/OS.java Thu Jan 1 04:57:36 2009 @@ -33,6 +33,7 @@ private static final int LINUX = 5; private static final int SOLARIS = 6; private static final int BSD = 7; + private static final int MACOSX = 8; public static final int LOG_EMERG = 1; public static final int LOG_ERROR = 2; @@ -54,6 +55,7 @@ public static final boolean IS_LINUX = is(LINUX); public static final boolean IS_SOLARIS = is(SOLARIS); public static final boolean IS_BSD = is(BSD); + public static final boolean IS_MACOSX = is(MACOSX); /** * Get the name of the system default characer set. --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 13:11:53 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 31262 invoked from network); 1 Jan 2009 13:11:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 13:11:53 -0000 Received: (qmail 42202 invoked by uid 500); 1 Jan 2009 13:11:47 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 42145 invoked by uid 500); 1 Jan 2009 13:11:46 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 42134 invoked by uid 99); 1 Jan 2009 13:11:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 05:11:46 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 13:11:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D66CC238899A; Thu, 1 Jan 2009 05:11:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730542 - /tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Date: Thu, 01 Jan 2009 13:11:25 -0000 To: kempmelanie@example.net From: kempmelanie@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <kempmelanie@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Jan 1 05:11:25 2009 New Revision: 730542 URL: http://svn.apache.org/viewvc?rev=730542&view=rev Log: Port r706574 from tcnative trunk to tc trunk. "Fix API function name recvFrom -> recvfrom." Function is actually not used in TC trunk. Modified: tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Modified: tomcat/trunk/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Socket.java?rev=730542&r1=730541&r2=730542&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Thu Jan 1 05:11:25 2009 @@ -387,7 +387,7 @@ * @param nbytes The number of bytes to read (-1) for full array. * @return the number of bytes received. */ - public static native int recvFrom(long from, long sock, int flags, + public static native int recvfrom(long from, long sock, int flags, byte[] buf, int offset, int nbytes); /** --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 13:19:05 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 32005 invoked from network); 1 Jan 2009 13:19:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 13:19:04 -0000 Received: (qmail 45784 invoked by uid 500); 1 Jan 2009 13:18:58 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 45732 invoked by uid 500); 1 Jan 2009 13:18:58 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 45721 invoked by uid 99); 1 Jan 2009 13:18:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 05:18:58 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO brutus.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 13:18:57 +0000 Received: by brutus.apache.org (Postfix, from userid 33) id A199B234C4A9; Thu, 1 Jan 2009 05:18:36 -0800 (PST) From: kempmelanie@example.net To: kempmelanie@example.net Subject: DO NOT REPLY [Bug 36911] Make fails while building jsvc on mac os x, multiple errors X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: newchanged X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Tomcat 5 X-Bugzilla-Component: Unknown X-Bugzilla-Keywords: X-Bugzilla-Severity: minor X-Bugzilla-Who: kempmelanie@example.net X-Bugzilla-Status: RESOLVED X-Bugzilla-Priority: P2 X-Bugzilla-Assigned-To: kempmelanie@example.net X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: Status Resolution In-Reply-To: <kempmelanie@example.net/bugzilla/> References: <kempmelanie@example.net/bugzilla/> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Message-Id: <kempmelanie@example.net> Date: Thu, 1 Jan 2009 05:18:36 -0800 (PST) X-Virus-Checked: Checked by ClamAV on apache.org https://issues.apache.org/bugzilla/show_bug.cgi?id=36911 Mark Thomas <kempmelanie@example.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Resolution| |INVALID --- Comment #5 from Mark Thomas <kempmelanie@example.net> 2009-01-01 05:18:35 PST --- jsvc is part of commons daemon so this really belongs in the commons daemon bug tracker. I've taken a quick look and there is already an issue for this along with some patches: https://issues.apache.org/jira/browse/DAEMON-98 There hasn't been much activity on commons daemon for a while - I'll ping the commons-dev list to see if I can stimulate some / get commit privs on daemon. I am marking this as INVALID for Tomcat which doesn't mean that this isn't an issue but that it is an issue with a non-Tomcat component and needs to be tracked on that component's bug tracker. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 13:32:47 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 37899 invoked from network); 1 Jan 2009 13:32:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 13:32:47 -0000 Received: (qmail 52153 invoked by uid 500); 1 Jan 2009 13:32:40 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 52105 invoked by uid 500); 1 Jan 2009 13:32:40 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 52094 invoked by uid 99); 1 Jan 2009 13:32:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 05:32:40 -0800 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [83.161.120.155] (HELO smtp1-g21.free.fr) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 13:32:32 +0000 Received: from smtp1-g21.free.fr (localhost [83.161.120.155]) by smtp1-g21.free.fr (Postfix) with ESMTP id 86AE355F for <kempmelanie@example.net>; Thu, 1 Jan 2009 14:32:06 +0100 (CET) Received: from [83.161.120.155] (lap34-1-82-224-140-72.fbx.proxad.net [83.161.120.155]) by smtp1-g21.free.fr (Postfix) with ESMTP id 9682417E for <kempmelanie@example.net>; Thu, 1 Jan 2009 14:32:04 +0100 (CET) Subject: Re: svn commit: r730523 - in /tomcat/connectors/trunk/jni:java/org/apache/tomcat/jni/ native/src/ From: Remy Maucherat <kempmelanie@example.net> To: Tomcat Developers List <kempmelanie@example.net> In-Reply-To: <kempmelanie@example.net> References: <kempmelanie@example.net> <kempmelanie@example.net> <kempmelanie@example.net> Content-Type: text/plain; charset=utf-8 Date: Thu, 01 Jan 2009 14:32:03 +0100 Message-Id: <kempmelanie@example.net> Mime-Version: 1.0 X-Mailer: Evolution 83.161.120.155 (83.161.120.155-1.fc9) Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org On Thu, 2009-01-01 at 13:23 +0100, Rainer Jung wrote: > Rémy, > > we do have a 1.1.x branch in tcnative which is supposed to be the stable > brach. Nevertheless I just noticed the dependency between TC 5.5 and > this trunk. I'll write a separate mail to discuss. If we don't find a > better solution, I'll revert. Please check my separate message. Ok. I thought this was still also used in 6.0. OTOH, the library should be renamed so that both v1.1 and this new incompatible one could be used at the same time, right ? Rémy --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 13:38:09 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 41613 invoked from network); 1 Jan 2009 13:38:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 13:38:09 -0000 Received: (qmail 54868 invoked by uid 500); 1 Jan 2009 13:38:02 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 54799 invoked by uid 500); 1 Jan 2009 13:38:02 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 54788 invoked by uid 99); 1 Jan 2009 13:38:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 05:38:02 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 13:38:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 709C6238889F; Thu, 1 Jan 2009 05:37:40 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730544 - in /tomcat/trunk/java/org/apache/tomcat/jni: Buffer.java File.java Registry.java SSL.java SSLContext.java Socket.java Stdlib.java Thread.java Date: Thu, 01 Jan 2009 13:37:40 -0000 To: kempmelanie@example.net From: kempmelanie@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <kempmelanie@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Jan 1 05:37:39 2009 New Revision: 730544 URL: http://svn.apache.org/viewvc?rev=730544&view=rev Log: Port r730523 from tcnative trunk to tc trunk. Add Thread.java and Buffer.java. Change SSL.randSet() javadoc to the tcnative one. Add Socket.sendib() and Socket.sendibb from tcnative. All renames methods and method signature changes are compatible, because those methods are not used by Tomcat. Changes of return types are compatible, because the return values have not been used. Added: tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java (with props) tomcat/trunk/java/org/apache/tomcat/jni/Thread.java (with props) Modified: tomcat/trunk/java/org/apache/tomcat/jni/File.java tomcat/trunk/java/org/apache/tomcat/jni/Registry.java tomcat/trunk/java/org/apache/tomcat/jni/SSL.java tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java tomcat/trunk/java/org/apache/tomcat/jni/Socket.java tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java Added: tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java?rev=730544&view=auto ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java (added) +++ tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java Thu Jan 1 05:37:39 2009 @@ -0,0 +1,91 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tomcat.jni; + +import java.nio.ByteBuffer; + +/** Buffer + * + * @author Mladen Turk + * @version $Revision$, $Date$ + */ + +public class Buffer { + + /** + * Allocate a new ByteBuffer from memory + * @param size The amount of memory to allocate + * @return The ByteBuffer with allocated memory + */ + public static native ByteBuffer malloc(int size); + + /** + * Allocate a new ByteBuffer from memory and set all of the memory to 0 + * @param num Number of elements. + * @param size Length in bytes of each element. + * @return The ByteBuffer with allocated memory + */ + public static native ByteBuffer calloc(int num, int size); + + /** + * Allocate a new ByteBuffer from a pool + * @param p The pool to allocate from + * @param size The amount of memory to allocate + * @return The ByteBuffer with allocated memory + */ + public static native ByteBuffer palloc(long p, int size); + + /** + * Allocate a new ByteBuffer from a pool and set all of the memory to 0 + * @param p The pool to allocate from + * @param size The amount of memory to allocate + * @return The ByteBuffer with allocated memory + */ + public static native ByteBuffer pcalloc(long p, int size); + + /** + * Allocate a new ByteBuffer from already allocated memory. + * <br />Allocated memory must be provided from call to the + * Stdlib.alloc or Stdlib.calloc methods. + * @param mem The memory to use + * @param size The amount of memory to use + * @return The ByteBuffer with attached memory + */ + public static native ByteBuffer create(long mem, int size); + + /** + * Deallocates or frees a memory block used by ByteBuffer + * <br /><b>Warning :</b> Call this method only on ByteBuffers + * that were created by calling Buffer.alloc or Buffer.calloc. + * @param buf Previously allocated ByteBuffer to be freed. + */ + public static native void free(ByteBuffer buf); + + /** + * Returns the memory address of the ByteBuffer. + * @param buf Previously allocated ByteBuffer. + */ + public static native long address(ByteBuffer buf); + + /** + * Returns the allocated memory size of the ByteBuffer. + * @param buf Previously allocated ByteBuffer. + */ + public static native long size(ByteBuffer buf); + +} Propchange: tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/tomcat/jni/Buffer.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: tomcat/trunk/java/org/apache/tomcat/jni/File.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/File.java?rev=730544&r1=730543&r2=730544&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/File.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/File.java Thu Jan 1 05:37:39 2009 @@ -693,6 +693,16 @@ public static native int stat(FileInfo finfo, String fname, int wanted, long pool); /** + * Get the specified file's stats. The file is specified by filename, + * instead of using a pre-opened file. + * @param fname The name of the file to stat. + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values + * @param pool the pool to use to allocate the new file. + * @return FileInfo object. + */ + public static native FileInfo getStat(String fname, int wanted, long pool); + + /** * Get the specified file's stats. * @param finfo Where to store the information about the file. * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values @@ -700,4 +710,13 @@ */ public static native int infoGet(FileInfo finfo, int wanted, long thefile); + + /** + * Get the specified file's stats. + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values + * @param thefile The file to get information about. + * @return FileInfo object. + */ + public static native FileInfo getInfo(int wanted, long thefile); + } Modified: tomcat/trunk/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Registry.java?rev=730544&r1=730543&r2=730544&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Registry.java Thu Jan 1 05:37:39 2009 @@ -156,7 +156,7 @@ * @param val The the value to set * @return If the function succeeds, the return value is 0 */ - public static native int setValueJ(long key, String name, int val); + public static native int setValueJ(long key, String name, long val); /** * Set the Registry value for REG_SZ Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=730544&r1=730543&r2=730544&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Thu Jan 1 05:37:39 2009 @@ -227,12 +227,6 @@ public static native int initialize(String engine); /** - * Set source of entropy to use in SSL - * @param filename Filename containing random data - */ - public static native boolean randSet(String filename); - - /** * Add content of the file to the PRNG * @param filename Filename containing random data. * If null the default file will be tested. @@ -261,6 +255,14 @@ boolean base64); /** + * Sets global random filename. + * @param filename Filename to use. + * If set it will be used for SSL initialization + * and all contexts where explicitly not set. + */ + public static native void randSet(String filename); + + /** * Initialize new BIO * @param pool The pool to use. * @param callback BIOCallback to use Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=730544&r1=730543&r2=730544&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Thu Jan 1 05:37:39 2009 @@ -226,6 +226,13 @@ throws Exception; /** + * Set file for randomness + * @param ctx Server or Client context to use. + * @param file random file. + */ + public static native void setRandom(long ctx, String file) + + /** * Set SSL connection shutdown type * <br /> * The following levels are available for level: @@ -237,7 +244,7 @@ * @param ctx Server or Client context to use. * @param type Shutdown type to use. */ - public static native void setShutdowType(long ctx, int type); + public static native void setShutdownType(long ctx, int type); /** * Set Type of Client Certificate verification and Maximum depth of CA Certificates Modified: tomcat/trunk/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Socket.java?rev=730544&r1=730543&r2=730544&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Thu Jan 1 05:37:39 2009 @@ -170,6 +170,16 @@ * made the connection request. This is the socket which should * be used for all future communication. */ + public static native long acceptx(long sock, long pool) + throws Exception; + + /** + * Accept a new connection request + * @param sock The socket we are listening on. + * @return A copy of the socket that is connected to the socket that + * made the connection request. This is the socket which should + * be used for all future communication. + */ public static native long accept(long sock) throws Exception; @@ -241,6 +251,30 @@ */ public static native int sendb(long sock, ByteBuffer buf, int offset, int len); + + /** + * Send data over a network without retry + * <PRE> + * This functions acts like a blocking write by default. To change + * this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK + * socket option. + * + * It is possible for both bytes to be sent and an error to be returned. + * + * </PRE> + * @param sock The socket to send the data over. + * @param buf The Byte buffer which contains the data to be sent. + * @param offset The offset within the buffer array of the first buffer from + * which bytes are to be retrieved; must be non-negative + * and no larger than buf.length + * @param len The maximum number of buffers to be accessed; must be non-negative + * and no larger than buf.length - offset + * @return The number of bytes send. + * + */ + public static native int sendib(long sock, ByteBuffer buf, + int offset, int len); + /** * Send data over a network using internally set ByteBuffer */ @@ -248,6 +282,13 @@ int offset, int len); /** + * Send data over a network using internally set ByteBuffer + * without internal retry. + */ + public static native int sendibb(long sock, + int offset, int len); + + /** * Send multiple packets of data over a network. * <PRE> * This functions acts like a blocking write by default. To change @@ -526,4 +567,22 @@ * @param buf The ByteBuffer */ public static native void setrbb(long sock, ByteBuffer buf); + + /** + * Set the data associated with the current socket. + * @param sock The currently open socket. + * @param data The user data to associate with the socket. + * @param key The key to associate with the data. + * @param cleanup The cleanup to call when the socket is destroyed. + */ + public static native int dataSet(long sock, String key, Object data); + + /** + * Return the data associated with the current socket + * @param data The user data associated with the socket. + * @param key The key to associate with the user data. + * @param sock The currently open socket. + * @return Data or null in case of error. + */ + public static native Object dataGet(long sock, String key); } Modified: tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java?rev=730544&r1=730543&r2=730544&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Stdlib.java Thu Jan 1 05:37:39 2009 @@ -67,7 +67,7 @@ * @param num Number of elements. * @param sz Length in bytes of each element. */ - public static native long calloc(long num, int sz); + public static native long calloc(int num, int sz); /** * Deallocates or frees a memory block. Added: tomcat/trunk/java/org/apache/tomcat/jni/Thread.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Thread.java?rev=730544&view=auto ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/Thread.java (added) +++ tomcat/trunk/java/org/apache/tomcat/jni/Thread.java Thu Jan 1 05:37:39 2009 @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tomcat.jni; + +/** Thread + * + * @author Mladen Turk + * @version $Revision$, $Date$ + */ + +public class Thread { + + /** + * Get the current thread ID handle. + */ + public static native long current(); + +} Propchange: tomcat/trunk/java/org/apache/tomcat/jni/Thread.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/tomcat/jni/Thread.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 13:54:32 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 52140 invoked from network); 1 Jan 2009 13:54:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 13:54:32 -0000 Received: (qmail 60826 invoked by uid 500); 1 Jan 2009 13:54:30 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 60763 invoked by uid 500); 1 Jan 2009 13:54:30 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 60752 invoked by uid 99); 1 Jan 2009 13:54:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 05:54:30 -0800 X-ASF-Spam-Status: No, hits=-4.0 required=10.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mailserver.kippdata.de) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 13:54:21 +0000 Received: from [83.161.120.155] ([83.161.120.155]) by mailserver.kippdata.de (8.13.5/8.13.5) with ESMTP id n01Ds0HA025618 for <kempmelanie@example.net>; Thu, 1 Jan 2009 14:54:00 +0100 (CET) Message-ID: <kempmelanie@example.net> Date: Thu, 01 Jan 2009 14:53:20 +0100 From: Rainer Jung <kempmelanie@example.net> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b3pre) Gecko/20081204 Thunderbird/3.0b1 MIME-Version: 1.0 To: Tomcat Developers List <kempmelanie@example.net> Subject: tcnative API stability/compatibility Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org Hi, we now have tcnative 1.1.x and trunk. What's our goal w.r.t. API stability? Citing from an earlier thread: >> > we do have a 1.1.x branch in tcnative which is supposed to be the stable >> > brach. > > Ok. I thought this was still also used in 6.0. OTOH, the library should > be renamed so that both v1.1 and this new incompatible one could be used > at the same time, right ? > > Rémy We have native and Java code in tcnative. I guess we are talking here mainly about the Java side, i.e. the native one is the implementation, which is only exposed via the Java code and the Java code represents the API we do make public. I expect we want the following situation: - new methods can be added to tcnative trunk - old methods are not allowed to be removed either from trunk or from 1.1.x Trunk will most likely result in 1.2.x versions, and code using tcnative should be able to update from 1.1 to 1.2 without incompatibilities. Otherwise we would already now decide, that trunk will become a 2.x. Methods could get deprecated in trunk though. Exception: There are some methods which wouldn't have worked any time in the past, because they refer to native functions that don't exist. I think it is a good cleanup to remove/rename them now in trunk and 1.1.x. Anyone fine with that? Concerning the native side. What is the compatibility goal between the Java code and the native lib? Do we want to urge each using software to use a) exactly the same version of native, than the version of the Java code b) the same minor version, but patch version greater or equal to the Java side c) the same major version and any minor/patch greater or equal ... I guess we want a) or b), I think it's to early for c). If we go for b) and trunk is for a 1.2.x version, we don't need to support loading multiple copies of the native library. So I guess, b) is what we should do? Regards, Rainer --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 14:01:23 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 55940 invoked from network); 1 Jan 2009 14:01:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 14:01:23 -0000 Received: (qmail 62265 invoked by uid 500); 1 Jan 2009 14:01:16 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 62210 invoked by uid 500); 1 Jan 2009 14:01:16 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 62199 invoked by uid 99); 1 Jan 2009 14:01:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 06:01:16 -0800 X-ASF-Spam-Status: No, hits=-4.0 required=10.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mailserver.kippdata.de) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 14:01:08 +0000 Received: from [83.161.120.155] ([83.161.120.155]) by mailserver.kippdata.de (8.13.5/8.13.5) with ESMTP id n01E0lG7026026 for <kempmelanie@example.net>; Thu, 1 Jan 2009 15:00:47 +0100 (CET) Message-ID: <kempmelanie@example.net> Date: Thu, 01 Jan 2009 15:00:07 +0100 From: Rainer Jung <kempmelanie@example.net> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b3pre) Gecko/20081204 Thunderbird/3.0b1 MIME-Version: 1.0 To: Tomcat Developers List <kempmelanie@example.net> Subject: Logging in tcnative Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Hi, during syncing tcnative trunk with tc trunk I noticed the following change to jni/Library.java: http://svn.eu.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/Library.java?r1=466585&r2=671153&diff_format=h It includes a call to Throwable.printStackTrace() to ease error diagnosis. So if we want to keep tcnative trunk and tc trunk in sync, then we'll write to STDERR without using proper logging. This special case is only during startup but it shows a general question: do we want to establish correct logging in tcnative, and if so, which framework/dependency do we want to use, juli (good for the use in Tomcat, bad for others who would need a new dependency), commons-logging or log4j, or ... Of course we could do it in some clever way like using juli if available and no log framework or java.util.logging otherwise. Any ideas? Regards, Rainer --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 14:16:38 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 64160 invoked from network); 1 Jan 2009 14:16:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 14:16:38 -0000 Received: (qmail 68898 invoked by uid 500); 1 Jan 2009 14:16:35 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 68835 invoked by uid 500); 1 Jan 2009 14:16:35 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 68824 invoked by uid 99); 1 Jan 2009 14:16:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 06:16:35 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 14:16:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD9A723888F1; Thu, 1 Jan 2009 06:16:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730550 - /tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Date: Thu, 01 Jan 2009 14:16:14 -0000 To: kempmelanie@example.net From: kempmelanie@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <kempmelanie@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Thu Jan 1 06:16:14 2009 New Revision: 730550 URL: http://svn.apache.org/viewvc?rev=730550&view=rev Log: Every fault needs to be done at least twice. Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=730550&r1=730549&r2=730550&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/SSLContext.java Thu Jan 1 06:16:14 2009 @@ -230,7 +230,7 @@ * @param ctx Server or Client context to use. * @param file random file. */ - public static native void setRandom(long ctx, String file) + public static native void setRandom(long ctx, String file); /** * Set SSL connection shutdown type --------------------------------------------------------------------- To unsubscribe, e-mail: kempmelanie@example.net For additional commands, e-mail: kempmelanie@example.net From kempmelanie@example.net Thu Jan 01 14:30:12 2009 Return-Path: <kempmelanie@example.net> Delivered-To: kempmelanie@example.net Received: (qmail 71026 invoked from network); 1 Jan 2009 14:30:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jan 2009 14:30:11 -0000 Received: (qmail 74797 invoked by uid 500); 1 Jan 2009 14:30:05 -0000 Delivered-To: kempmelanie@example.net Received: (qmail 74726 invoked by uid 500); 1 Jan 2009 14:30:05 -0000 Mailing-List: contact kempmelanie@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:kempmelanie@example.net> List-Unsubscribe: <mailto:kempmelanie@example.net> List-Post: <mailto:kempmelanie@example.net> List-Id: <dev.tomcat.apache.org> Reply-To: "Tomcat Developers List" <kempmelanie@example.net> Delivered-To: mailing list kempmelanie@example.net Received: (qmail 74715 invoked by uid 99); 1 Jan 2009 14:30:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 06:30:05 -0800 X-ASF-Spam-Status: No, hits=-4.0 required=10.0 tests=RCVD_IN_DNSWL_MED,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mailserver.kippdata.de) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jan 2009 14:29:57 +0000 Received: from [83.161.120.155] ([83.161.120.155]) by mailserver.kippdata.de (8.13.5/8.13.5) with ESMTP id n01ETaNV027278 for <kempmelanie@example.net>; Thu, 1 Jan 2009 15:29:36 +0100 (CET) Message-ID: <kempmelanie@example.net> Date: Thu, 01 Jan 2009 15:28:56 +0100 From: Rainer Jung <kempmelanie@example.net> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1b3pre) Gecko/20081204 Thunderbird/3.0b1 MIME-Version: 1.0 To: Tomcat Developers List <kempmelanie@example.net> Subject: Missing tcnative function implementations Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org When checking the consistency between the native and the Java code of tcnative I found the following differences, which are still open: General differences =================== Methods implemented in pool.c but not available in Pool.java ------------------------------------------------------------ (jlong, Pool, palloc)(TCN_STDARGS, jlong pool, jint size) (jlong, Pool, pcalloc)(TCN_STDARGS, jlong pool, jint size) I'm not sure, whether we want to make them available or drop them completely. All other allocation methods in pool.c use DirectByteBuffers, those two do not. Are they intended to be made part of the public API? Platform specific differences ============================= Missing implementation on netware --------------------------------- (all avaliable via OS.java) public static native String expand(String str); public static native void sysloginit(String domain); public static native void syslog(int level, String message); (all available via Local.java): public static native long create(String path, long cont) public static native int bind(long sock, long sa); public static native int listen(long sock, int backlog); public static native int connect(long sock, long sa); Missing on Unix and Netware --------------------------- (but also not published in the Java API) system.c: (jstring, OS, syserror)(TCN_STDARGS, jint err) Only existing for Windows ------------------------- (but all published via Registry.java) public static native long create(int root, String name, int sam, long pool) public static native long open(int root, String name, int sam, long pool) public static native int getType(long key, String name); public static native int getValueI(long key, String name) public static native long getValueJ(long key, String name) public static native int getSize(long key, String name); public static native String getValueS(long key, String name) public static native String[] getValueA(long key, String name) public static native byte[] getValueB(long key, String name) public static native int setValueI(long key, String name, int val); public static native int setValueJ(long key, String name, long val); public static native int setValueS(long key, String name, String val); public static native int setValueE(long
{'source': 'Apache Software Foundation Public Mail Archives'}