[jboss-svn-commits] JBL Code SVN: r6738 - labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni

[jboss-svn-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2006-10-11 05:06:24 -0400 (Wed, 11 Oct 2006)
New Revision: 6738

Added:
   labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Thread.java
Modified:
   labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/SSL.java
   labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Socket.java
Log:
Sync with the current Tomcat head.

Modified: labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/SSL.java
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/SSL.java	2006-10-11 06:54:25 UTC (rev 6737)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/SSL.java	2006-10-11 09:06:24 UTC (rev 6738)
@@ -254,6 +254,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: labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Socket.java
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Socket.java	2006-10-11 06:54:25 UTC (rev 6737)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Socket.java	2006-10-11 09:06:24 UTC (rev 6738)
@@ -525,4 +525,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);
 }

Added: labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Thread.java
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Thread.java	2006-10-11 06:54:25 UTC (rev 6737)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Thread.java	2006-10-11 09:06:24 UTC (rev 6738)
@@ -0,0 +1,32 @@
+/*
+ *  Copyright 2000-2005 The Apache Software Foundation
+ *
+ *  Licensed 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: 300969 $, $Date: 2005-07-12 16:56:11 +0200 (uto, 12 srp 2005) $
+ */
+
+public class Thread {
+    
+    /**
+     * Get the current thread ID handle.
+     */
+    public static native long current();    
+
+}


Property changes on: labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/jni/Thread.java
___________________________________________________________________
Name: svn:eol-style
   + native