headers
rjung | 1 Jan 11:52
Picon
Favicon

svn commit: r730523 - in /tomcat/connectors/trunk/jni: java/org/apache/tomcat/jni/ native/src/

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
(Continue reading)

Permalink | Reply | 3 comments |
headers
rjung | 1 Jan 12:24
Picon
Favicon

svn commit: r730528 - /tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java

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
Permalink | Reply | 0 comments |
headers
Remy Maucherat | 1 Jan 12:44
Picon
Favicon
Gravatar

Re: svn commit: r730523 - in /tomcat/connectors/trunk/jni: java/org/apache/tomcat/jni/ native/src/

On Thu, 2009-01-01 at 10:52 +0000, rjung <at> apache.org 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
Permalink | Reply | 2 comments |
headers
Rainer Jung | 1 Jan 13:23
Picon
Favicon

Re: svn commit: r730523 - in /tomcat/connectors/trunk/jni:java/org/apache/tomcat/jni/ native/src/

On 01.01.2009 12:44, Remy Maucherat wrote:
> On Thu, 2009-01-01 at 10:52 +0000, rjung <at> apache.org 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
Permalink | Reply | 1 comment |
headers
Rainer Jung | 1 Jan 13:26
Picon
Favicon

JNI svn structure wierdness

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,
(Continue reading)

Permalink | Reply | 0 comments |
headers
rjung | 1 Jan 13:57
Picon
Favicon

svn commit: r730538 - /tomcat/trunk/java/org/apache/tomcat/jni/OS.java

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);
(Continue reading)

Permalink | Reply | 0 comments |
headers
rjung | 1 Jan 14:11
Picon
Favicon

svn commit: r730542 - /tomcat/trunk/java/org/apache/tomcat/jni/Socket.java

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);

     /**
Permalink | Reply | 0 comments |
headers
bugzilla | 1 Jan 14:18
Picon
Favicon

DO NOT REPLY [Bug 36911] Make fails while building jsvc on mac os x, multiple errors

https://issues.apache.org/bugzilla/show_bug.cgi?id=36911

Mark Thomas <markt <at> apache.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|REOPENED                    |RESOLVED
         Resolution|                            |INVALID

--- Comment #5 from Mark Thomas <markt <at> apache.org>  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.
Permalink | Reply | 0 comments |
headers
Remy Maucherat | 1 Jan 14:32
Picon
Favicon
Gravatar

Re: svn commit: r730523 - in /tomcat/connectors/trunk/jni:java/org/apache/tomcat/jni/ native/src/

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
Permalink | Reply | 0 comments |
headers
rjung | 1 Jan 14:37
Picon
Favicon

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

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
(Continue reading)

Permalink | Reply | 0 comments |

Gmane