Author: markt
Date: Tue Apr 7 15:05:41 2015
New Revision: 1671866
URL: http://svn.apache.org/r1671866
Log:
CTR: Javadoc / whitespace updates to align with 7.0.x and 8.0.x
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Address.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Address
*
* @author Mladen Turk
- *
*/
public class Address {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/BIOCallback.java Tue Apr 7
15:05:41 2015
@@ -20,14 +20,13 @@ package org.apache.tomcat.jni;
/** Open SSL BIO Callback Interface
*
* @author Mladen Turk
- *
*/
public interface BIOCallback {
/**
* Write data
- * @param buf containg the bytes to write.
+ * @param buf containing the bytes to write.
* @return Number of characters written.
*/
public int write(byte [] buf);
@@ -49,7 +48,7 @@ public interface BIOCallback {
/**
* Read string up to the len or CLRLF
* @param len Maximum number of characters to read
- * @return String with up to len bytes readed
+ * @return String with up to len bytes read
*/
public String gets(int len);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Directory.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Directory
*
* @author Mladen Turk
- *
*/
public class Directory {
@@ -28,7 +27,7 @@ public class Directory {
/**
* Create a new directory on the file system.
* @param path the path for the directory to be created. (use / on all
systems)
- * @param perm Permissions for the new direcoty.
+ * @param perm Permissions for the new directory.
* @param pool the pool to use.
*/
public static native int make(String path, int perm, long pool);
@@ -37,7 +36,7 @@ public class Directory {
* 'mkdir -p'. Creates intermediate directories as required. No error
* will be reported if PATH already exists.
* @param path the path for the directory to be created. (use / on all
systems)
- * @param perm Permissions for the new direcoty.
+ * @param perm Permissions for the new directory.
* @param pool the pool to use.
*/
public static native int makeRecursive(String path, int perm, long pool);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Error.java Tue Apr 7
15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** Error
*
* @author Mladen Turk
- *
*/
-
public class Error extends Exception {
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/File.java Tue Apr 7
15:05:41 2015
@@ -18,12 +18,11 @@
package org.apache.tomcat.jni;
/* Import needed classes */
import java.nio.ByteBuffer;
+
/** File
*
* @author Mladen Turk
- *
*/
-
public class File {
/** Open the file for reading */
@@ -59,7 +58,7 @@ public class File {
*/
public static final int APR_FOPEN_SENDFILE_ENABLED = 0x01000;
/** Platform dependent flag to enable large file support;
- * <br /><b>Warning :</b> The APR_LARGEFILE flag only has effect on some
platforms
+ * <br><b>Warning :</b> The APR_LARGEFILE flag only has effect on some
platforms
* where sizeof(apr_off_t) == 4. Where implemented, it allows opening
* and writing to a file which exceeds the size which can be
* represented by apr_off_t (2 gigabytes). When a file's size does
@@ -108,7 +107,7 @@ public class File {
/* apr_filetype_e values for the filetype member of the
* apr_file_info_t structure
- * <br /><b>Warning :</b>: Not all of the filetypes below can be
determined.
+ * <br><b>Warning :</b>: Not all of the filetypes below can be determined.
* For example, a given platform might not correctly report
* a socket descriptor as APR_SOCK if that type isn't
* well-identified on that platform. In such cases where
@@ -174,7 +173,7 @@ public class File {
public static final int APR_FINFO_GPROT = 0x00200000; /** Group
protection bits */
public static final int APR_FINFO_WPROT = 0x00400000; /** World
protection bits */
public static final int APR_FINFO_ICASE = 0x01000000; /** if dev is case
insensitive */
- public static final int APR_FINFO_NAME = 0x02000000; /** ->name in
proper case */
+ public static final int APR_FINFO_NAME = 0x02000000; /** ->name in
proper case */
public static final int APR_FINFO_MIN = 0x00008170; /** type, mtime,
ctime, atime, size */
public static final int APR_FINFO_IDENT = 0x00003000; /** dev and inode */
@@ -264,7 +263,7 @@ public class File {
/**
* Rename the specified file.
- * <br /><b>Warning :</b> If a file exists at the new location, then it
will be
+ * <br><b>Warning :</b> If a file exists at the new location, then it will
be
* overwritten. Moving files or directories across devices may not be
* possible.
* @param fromPath The full path to the original file (using / on all
systems)
@@ -276,7 +275,7 @@ public class File {
/**
* Copy the specified file to another file.
* The new file does not need to exist, it will be created if required.
- * <br /><b>Warning :</b> If the new file already exists, its contents
will be overwritten.
+ * <br><b>Warning :</b> If the new file already exists, its contents will
be overwritten.
* @param fromPath The full path to the original file (using / on all
systems)
* @param toPath The full path to the new file (using / on all systems)
* @param perms Access permissions for the new file if it is created.
@@ -419,7 +418,7 @@ public class File {
public static native int writeFullb(long thefile, ByteBuffer buf, int
offset, int nbytes);
/**
- * Write data from aray of byte arrays to the specified file.
+ * Write data from array of byte arrays to the specified file.
*
* It is possible for both bytes to be written and an error to
* be returned. APR_EINTR is never returned.
@@ -433,7 +432,7 @@ public class File {
public static native int writev(long thefile, byte[][] vec);
/**
- * Write data from aray of byte arrays to the specified file,
+ * Write data from array of byte arrays to the specified file,
* ensuring that all of the data is written before returning.
*
* writevFull is available even if the underlying
@@ -543,7 +542,7 @@ public class File {
/**
* Read a character from the specified file.
* @param thefile The file descriptor to read from
- * @return The readed character
+ * @return The read character
*/
public static native int getc(long thefile)
throws Error;
@@ -563,10 +562,10 @@ public class File {
/**
* Set the specified file's permission bits.
- * <br /><b>Warning :</b> Some platforms may not be able to apply all of
the
+ * <br><b>Warning :</b> Some platforms may not be able to apply all of the
* available permission bits; APR_INCOMPLETE will be returned if some
* permissions are specified which could not be set.
- * <br /><b>Warning :</b> Platforms which do not implement this feature
will return
+ * <br><b>Warning :</b> Platforms which do not implement this feature will
return
* APR_ENOTIMPL.
* @param fname The file (name) to apply the permissions to.
* @param perms The permission bits to apply to the file.
@@ -576,11 +575,11 @@ public class File {
/**
* Set attributes of the specified file.
- * This function should be used in preference to explict manipulation
+ * This function should be used in preference to explicit manipulation
* of the file permissions, because the operations to provide these
* attributes are platform specific and may involve more than simply
* setting permission bits.
- * <br /><b>Warning :</b> Platforms which do not implement this feature
will return
+ * <br><b>Warning :</b> Platforms which do not implement this feature will
return
* APR_ENOTIMPL.
* @param fname The full path to the file (using / on all systems)
* @param attributes Or'd combination of
@@ -596,7 +595,7 @@ public class File {
/**
* Set the mtime of the specified file.
- * <br /><b>Warning :</b> Platforms which do not implement this feature
will return
+ * <br><b>Warning :</b> Platforms which do not implement this feature will
return
* APR_ENOTIMPL.
* @param fname The full path to the file (using / on all systems)
* @param mtime The mtime to apply to the file in microseconds
@@ -624,7 +623,7 @@ public class File {
/**
* Retrieve the flags that were passed into apr_file_open()
* when the file was opened.
- * @param file The file to retrive flags.
+ * @param file The file to retrieve flags.
* @return the flags
*/
public static native int flagsGet(long file);
@@ -655,8 +654,8 @@ public class File {
/**
* Set the timeout value for a pipe or manipulate the blocking state.
* @param thepipe The pipe we are setting a timeout on.
- * @param timeout The timeout value in microseconds. Values < 0 mean wait
- * forever, 0 means do not wait at all.
+ * @param timeout The timeout value in microseconds. Values < 0 mean
+ * wait forever, 0 means do not wait at all.
*/
public static native int pipeTimeoutSet(long thepipe, long timeout);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/FileInfo.java Tue Apr 7
15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** Fileinfo
*
* @author Mladen Turk
- *
*/
-
public class FileInfo {
/** Allocates memory and closes lingering handles in the specified pool */
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Global.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Global
*
* @author Mladen Turk
- *
*/
public class Global {
@@ -31,7 +30,7 @@ public class Global {
* this API if only cross-process or cross-thread mutual exclusion is
* required. See apr_proc_mutex.h and apr_thread_mutex.h for more
* specialized lock routines.
- * <br /><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if
the platform supports
+ * <br><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if the
platform supports
* APR_LOCK_foo. Only APR_LOCK_DEFAULT is portable.
* @param fname A file name to use if the lock mechanism requires one.
This
* argument should always be provided. The lock code itself will
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Library.java Tue Apr 7
15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** Library
*
* @author Mladen Turk
- *
*/
-
public final class Library {
/* Default library names */
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Local socket
*
* @author Mladen Turk
- *
*/
public class Local {
@@ -48,7 +47,7 @@ public class Local {
* @param sock The socket to listen on
* @param backlog The number of outstanding connections allowed in the
sockets
* listen queue. If this value is less than zero, for NT
pipes
- * the number of instances is unlimite.
+ * the number of instances is unlimited.
*
*/
public static native int listen(long sock, int backlog);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Lock.java Tue Apr 7
15:05:41 2015
@@ -20,14 +20,13 @@ package org.apache.tomcat.jni;
/** Lock
*
* @author Mladen Turk
- *
*/
public class Lock {
/**
* Enumerated potential types for APR process locking methods
- * <br /><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if
the platform supports
+ * <br><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if the
platform supports
* APR_LOCK_foo. Only APR_LOCK_DEFAULT is portable.
*/
@@ -40,7 +39,7 @@ public class Lock {
/**
* Create and initialize a mutex that can be used to synchronize processes.
- * <br /><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if
the platform supports
+ * <br><b>Warning :</b> Check APR_HAS_foo_SERIALIZE defines to see if the
platform supports
* APR_LOCK_foo. Only APR_LOCK_DEFAULT is portable.
* @param fname A file name to use if the lock mechanism requires one.
This
* argument should always be provided. The lock code itself will
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Mmap.java Tue Apr 7
15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** Mmap
*
* @author Mladen Turk
- *
*/
-
public class Mmap {
/** MMap opened for reading */
public static final int APR_MMAP_READ = 1;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Multicast.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Multicast
*
* @author Mladen Turk
- *
*/
public class Multicast {
@@ -54,7 +53,7 @@ public class Multicast {
* Set the Multicast Time to Live (ttl) for a multicast transmission.
* @param sock The socket to set the multicast ttl
* @param ttl Time to live to Assign. 0-255, default=1
- * <br /><b>Remark :</b> If the TTL is 0, packets will only be seen
+ * <br><b>Remark :</b> If the TTL is 0, packets will only be seen
* by sockets on the local machine,
* and only when multicast loopback is enabled.
*/
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/OS.java Tue Apr 7 15:05:41
2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** OS
*
* @author Mladen Turk
- *
*/
-
public class OS {
/* OS Enums */
@@ -56,7 +54,7 @@ public class OS {
public static final boolean IS_BSD = is(BSD);
/**
- * Get the name of the system default characer set.
+ * Get the name of the system default character set.
* @param pool the pool to allocate the name from, if needed
*/
public static native String defaultEncoding(long pool);
@@ -64,7 +62,7 @@ public class OS {
/**
* Get the name of the current locale character set.
* Defers to apr_os_default_encoding if the current locale's
- * data can't be retreved on this system.
+ * data can't be retrieved on this system.
* @param pool the pool to allocate the name from, if needed
*/
public static native String localeEncoding(long pool);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PasswordCallback.java Tue
Apr 7 15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** PasswordCallback Interface
*
* @author Mladen Turk
- *
*/
-
public interface PasswordCallback {
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java Tue Apr 7
15:05:41 2015
@@ -20,20 +20,25 @@ package org.apache.tomcat.jni;
/** Poll
*
* @author Mladen Turk
- *
*/
public class Poll {
/**
- * Poll options
+ * Poll return values
*/
- public static final int APR_POLLIN = 0x001; /** Can read without
blocking */
- public static final int APR_POLLPRI = 0x002; /** Priority data available
*/
- public static final int APR_POLLOUT = 0x004; /** Can write without
blocking */
- public static final int APR_POLLERR = 0x010; /** Pending error */
- public static final int APR_POLLHUP = 0x020; /** Hangup occurred */
- public static final int APR_POLLNVAL = 0x040; /** Descriptior invalid */
+ /** Can read without blocking */
+ public static final int APR_POLLIN = 0x001;
+ /** Priority data available */
+ public static final int APR_POLLPRI = 0x002;
+ /** Can write without blocking */
+ public static final int APR_POLLOUT = 0x004;
+ /** Pending error */
+ public static final int APR_POLLERR = 0x010;
+ /** Hangup occurred */
+ public static final int APR_POLLHUP = 0x020;
+ /** Descriptor invalid */
+ public static final int APR_POLLNVAL = 0x040;
/**
* Pollset Flags
@@ -73,11 +78,8 @@ public class Poll {
public static native int destroy(long pollset);
/**
- * Add a socket or to a pollset
- * If you set client_data in the descriptor, that value
- * will be returned in the client_data field whenever this
- * descriptor is signalled in apr_pollset_poll().
- * @param pollset The pollset to which to add the descriptor
+ * Add a socket to a pollset with the default timeout.
+ * @param pollset The pollset to which to add the socket
* @param sock The sockets to add
* @param reqevents requested events
*/
@@ -95,15 +97,15 @@ public class Poll {
* Block for activity on the descriptor(s) in a pollset
* @param pollset The pollset to use
* @param timeout Timeout in microseconds
- * @param descriptors Array of signalled descriptors (output parameter)
- * The desctiptor array must be two times the size of pollset.
+ * @param descriptors Array of signaled descriptors (output parameter)
+ * The descriptor array must be two times the size of pollset.
* and are populated as follows:
* <PRE>
- * descriptors[n + 0] -> returned events
- * descriptors[n + 1] -> socket
+ * descriptors[2n + 0] -> returned events
+ * descriptors[2n + 1] -> socket
* </PRE>
* @param remove Remove signaled descriptors from pollset
- * @return Number of signalled descriptors (output parameter)
+ * @return Number of signaled descriptors (output parameter)
* or negative APR error code.
*/
public static native int poll(long pollset, long timeout,
@@ -112,14 +114,14 @@ public class Poll {
/**
* Maintain on the descriptor(s) in a pollset
* @param pollset The pollset to use
- * @param descriptors Array of signalled descriptors (output parameter)
- * The desctiptor array must be the size of pollset.
+ * @param descriptors Array of signaled descriptors (output parameter)
+ * The descriptor array must be the size of pollset.
* and are populated as follows:
* <PRE>
- * descriptors[n] -> socket
+ * descriptors[n] -> socket
* </PRE>
* @param remove Remove signaled descriptors from pollset
- * @return Number of signalled descriptors (output parameter)
+ * @return Number of signaled descriptors (output parameter)
* or negative APR error code.
*/
public static native int maintain(long pollset, long [] descriptors,
@@ -143,15 +145,14 @@ public class Poll {
* Return all descriptor(s) in a pollset
* @param pollset The pollset to use
* @param descriptors Array of descriptors (output parameter)
- * The desctiptor array must be two times the size of pollset.
+ * The descriptor array must be two times the size of pollset.
* and are populated as follows:
* <PRE>
- * descriptors[n + 0] -> returned events
- * descriptors[n + 1] -> socket
+ * descriptors[2n + 0] -> returned events
+ * descriptors[2n + 1] -> socket
* </PRE>
* @return Number of descriptors (output parameter) in the Poll
* or negative APR error code.
*/
public static native int pollset(long pollset, long [] descriptors);
-
}
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Pool.java Tue Apr 7
15:05:41 2015
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
/** Pool
*
* @author Mladen Turk
- *
*/
public class Pool {
@@ -139,11 +138,11 @@ public class Pool {
* @param data The user data associated with the pool.
* @param key The key to use for association
* @param pool The current pool
- * <br /><b>Warning :</b>
+ * <br><b>Warning :</b>
* The data to be attached to the pool should have a life span
* at least as long as the pool it is being attached to.
- * Object attached to the pool will be globaly referenced
- * untill the pool is cleared or dataSet is called with the null data.
+ * Object attached to the pool will be globally referenced
+ * until the pool is cleared or dataSet is called with the null data.
* @return APR Status code.
*/
public static native int dataSet(long pool, String key, Object data);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/PoolCallback.java Tue Apr
7 15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** PoolCallback Interface
*
* @author Mladen Turk
- *
*/
-
public interface PoolCallback {
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Proc.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Proc
*
* @author Mladen Turk
- *
*/
public class Proc {
@@ -65,7 +64,7 @@ public class Proc {
public static final int APR_OC_REASON_DEATH = 0;
/** write_fd is unwritable */
public static final int APR_OC_REASON_UNWRITABLE = 1;
- /** a restart is occuring, perform any necessary cleanup (including
+ /** a restart is occurring, perform any necessary cleanup (including
* sending a special signal to child)
*/
public static final int APR_OC_REASON_RESTART = 2;
@@ -75,7 +74,7 @@ public class Proc {
public static final int APR_OC_REASON_UNREGISTER = 3;
/** somehow the child exited without us knowing ... buggy os? */
public static final int APR_OC_REASON_LOST = 4;
- /** a health check is occuring, for most maintainence functions
+ /** a health check is occurring, for most maintenance functions
* this is a no-op.
*/
public static final int APR_OC_REASON_RUNNING = 5;
@@ -101,7 +100,7 @@ public class Proc {
public static final int MAX_ENV_SIZE = 1024;
/**
- * Allocate apr_proc_t stucture from pool
+ * Allocate apr_proc_t structure from pool
* This is not an apr function.
* @param cont The pool to use.
*/
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/ProcErrorCallback.java Tue
Apr 7 15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** ProcErrorCallback Interface
*
* @author Mladen Turk
- *
*/
-
public interface ProcErrorCallback {
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Procattr.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Procattr
*
* @author Mladen Turk
- *
*/
public class Procattr {
@@ -44,7 +43,7 @@ public class Procattr {
public static native int ioSet(long attr, int in, int out, int err);
/**
* Set the child_in and/or parent_in values to existing apr_file_t values.
- * <br />
+ * <br>
* This is NOT a required initializer function. This is
* useful if you have already opened a pipe (or multiple files)
* that you wish to use, perhaps persistently across multiple
@@ -59,7 +58,7 @@ public class Procattr {
/**
* Set the child_out and parent_out values to existing apr_file_t values.
- * <br />
+ * <br>
* This is NOT a required initializer function. This is
* useful if you have already opened a pipe (or multiple files)
* that you wish to use, perhaps persistently across multiple
@@ -72,7 +71,7 @@ public class Procattr {
/**
* Set the child_err and parent_err values to existing apr_file_t values.
- * <br />
+ * <br>
* This is NOT a required initializer function. This is
* useful if you have already opened a pipe (or multiple files)
* that you wish to use, perhaps persistently across multiple
@@ -119,7 +118,7 @@ public class Procattr {
* @param attr The procattr describing the child process to be created.
* @param chk Flag to indicate whether or not extra work should be done
* to try to report failures to the caller.
- * <br />
+ * <br>
* This flag only affects apr_proc_create() on platforms where
* fork() is used. This leads to extra overhead in the calling
* process, but that may help the application handle such
@@ -142,7 +141,7 @@ public class Procattr {
* @param attr The procattr describing the child process to be created.
* @param pool The the pool to use.
* @param o The Object to call in the child process.
- * <br />
+ * <br>
* At the present time, it will only be called from apr_proc_create()
* on platforms where fork() is used. It will never be called on other
* platforms, on those platforms apr_proc_create() will return the error
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java Tue Apr 7
15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** Windows Registy support
*
* @author Mladen Turk
- *
*/
-
public class Registry {
/* Registry Enums */
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSL.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** SSL
*
* @author Mladen Turk
- *
*/
public final class SSL {
@@ -115,7 +114,6 @@ public final class SSL {
/* SSL_OP_ALL: various bug workarounds that should be rather harmless.
* This used to be 0x000FFFFFL before 0.9.7. */
public static final int SSL_OP_ALL =
0x00000FFF;
-
/* As server, disallow session resumption on renegotiation */
public static final int SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION =
0x00010000;
/* Don't use compression even if supported */
@@ -225,7 +223,7 @@ public final class SSL {
* lifetime of JVM. Library.init() has to be called before.
* @param engine Support for external a Crypto Device ("engine"),
* usually
- * a hardware accellerator card for crypto operations.
+ * a hardware accelerator card for crypto operations.
* @return APR status code
*/
public static native int initialize(String engine);
@@ -247,18 +245,12 @@ public final class SSL {
*
* @return FIPS_mode_set return code
* @throws Exception If tcnative was not compiled with FIPS Mode available,
- * or if <code>FIPS_mode_set()</code> call returned an error value.
+ * or if {@code FIPS_mode_set()} call returned an error value.
* @see <a
href="http://wiki.openssl.org/index.php/FIPS_mode_set%28%29";>OpenSSL method
FIPS_mode_set()</a>
*/
public static native int fipsModeSet(int mode) throws Exception;
/**
- * 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.
@@ -287,6 +279,14 @@ public final class SSL {
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
@@ -296,7 +296,7 @@ public final class SSL {
throws Exception;
/**
- * Close BIO and derefrence callback object
+ * Close BIO and dereference callback object
* @param bio BIO to close and destroy.
* @return APR Status code
*/
@@ -316,7 +316,7 @@ public final class SSL {
/**
* Generate temporary RSA key.
- * <br />
+ * <br>
* Index can be one of:
* <PRE>
* SSL_TMP_KEY_RSA_512
@@ -332,7 +332,7 @@ public final class SSL {
/**
* Load temporary DSA key from file
- * <br />
+ * <br>
* Index can be one of:
* <PRE>
* SSL_TMP_KEY_DH_512
@@ -354,8 +354,8 @@ public final class SSL {
* Return true if all the requested SSL_OP_* are supported by OpenSSL.
*
* <i>Note that for versions of tcnative < 1.1.25, this method will
- * return <code>true</code> if and only if <code>op=0x00040000</code>
- * (SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) and tcnative
+ * return <code>true</code> if and only if <code>op</code>=
+ * {@link #SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION} and tcnative
* supports that flag.</i>
*
* @param op Bitwise-OR of all SSL_OP_* to test.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLContext.java Tue Apr 7
15:05:41 2015
@@ -22,7 +22,6 @@ package org.apache.tomcat.jni;
* @author Mladen Turk
*
*/
-
public final class SSLContext {
@@ -37,7 +36,7 @@ public final class SSLContext {
* {@link SSL#SSL_PROTOCOL_TLSV1}
* {@link SSL#SSL_PROTOCOL_TLSV1_1}
* {@link SSL#SSL_PROTOCOL_TLSV1_2}
- * {@link SSL#SSL_PROTOCOL_ALL} ( == SSL_PROTOCOL_TLSV1, no SSL)
+ * {@link SSL#SSL_PROTOCOL_ALL} ( == all TLS versions, no SSL)
* </PRE>
* @param mode SSL mode to use
* <PRE>
@@ -64,13 +63,13 @@ public final class SSLContext {
public static native void setContextId(long ctx, String id);
/**
- * Asssociate BIOCallback for input or output data capture.
- * <br />
+ * Associate BIOCallback for input or output data capture.
+ * <br>
* First word in the output string will contain error
* level in the form:
* <PRE>
* [ERROR] -- Critical error messages
- * [WARN] -- Varning messages
+ * [WARN] -- Warning messages
* [INFO] -- Informational messages
* [DEBUG] -- Debugging messaged
* </PRE>
@@ -95,11 +94,11 @@ public final class SSLContext {
* Sets the "quiet shutdown" flag for <b>ctx</b> to be
* <b>mode</b>. SSL objects created from <b>ctx</b> inherit the
* <b>mode</b> valid at the time and may be 0 or 1.
- * <br />
+ * <br>
* Normally when a SSL connection is finished, the parties must send out
- * "close notify" alert messages using L<SSL_shutdown(3)|SSL_shutdown(3)>
+ * "close notify" alert messages using
L<SSL_shutdown(3)|SSL_shutdown(3)>
* for a clean shutdown.
- * <br />
+ * <br>
* When setting the "quiet shutdown" flag to 1, <b>SSL.shutdown</b>
* will set the internal flags to SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN.
* (<b>SSL_shutdown</b> then behaves like called with
@@ -114,14 +113,14 @@ public final class SSLContext {
/**
* Cipher Suite available for negotiation in SSL handshake.
- * <br />
+ * <br>
* This complex directive uses a colon-separated cipher-spec string
consisting
* of OpenSSL cipher specifications to configure the Cipher Suite the
client
* is permitted to negotiate in the SSL handshake phase. Notice that this
* directive can be used both in per-server and per-directory context.
* In per-server context it applies to the standard SSL handshake when a
* connection is established. In per-directory context it forces a SSL
- * renegotation with the reconfigured Cipher Suite after the HTTP request
+ * renegotiation with the reconfigured Cipher Suite after the HTTP request
* was read but before the HTTP response is sent.
* @param ctx Server or Client context to use.
* @param ciphers An SSL cipher specification.
@@ -132,13 +131,13 @@ public final class SSLContext {
/**
* Set File of concatenated PEM-encoded CA CRLs or
* directory of PEM-encoded CA Certificates for Client Auth
- * <br />
+ * <br>
* This directive sets the all-in-one file where you can assemble the
* Certificate Revocation Lists (CRL) of Certification Authorities (CA)
* whose clients you deal with. These are used for Client Authentication.
* Such a file is simply the concatenation of the various PEM-encoded CRL
* files, in order of preference.
- * <br />
+ * <br>
* The files in this directory have to be PEM-encoded and are accessed
through
* hash filenames. So usually you can't just place the Certificate files
there:
* you also have to create symbolic links named hash-value.N. And you
should
@@ -154,14 +153,14 @@ public final class SSLContext {
/**
* Set File of PEM-encoded Server CA Certificates
- * <br />
+ * <br>
* This directive sets the optional all-in-one file where you can assemble
the
* certificates of Certification Authorities (CA) which form the
certificate
* chain of the server certificate. This starts with the issuing CA
certificate
* of of the server certificate and can range up to the root CA
certificate.
* Such a file is simply the concatenation of the various PEM-encoded CA
* Certificate files, usually in certificate chain order.
- * <br />
+ * <br>
* But be careful: Providing the certificate chain works only if you are
using
* a single (either RSA or DSA) based server certificate. If you are using
a
* coupled RSA+DSA certificate pair, this will work only if actually both
@@ -177,7 +176,7 @@ public final class SSLContext {
/**
* Set Certificate
- * <br />
+ * <br>
* Point setCertificateFile at a PEM encoded certificate. If
* the certificate is encrypted, then you will be prompted for a
* pass phrase. Note that a kill -HUP will prompt again. A test
@@ -185,7 +184,7 @@ public final class SSLContext {
* built time. Keep in mind that if you've both a RSA and a DSA
* certificate you can configure both in parallel (to also allow
* the use of DSA ciphers, etc.)
- * <br />
+ * <br>
* If the key is not combined with the certificate, use key param
* to point at the key file. Keep in mind that if
* you've both a RSA and a DSA private key you can configure
@@ -194,7 +193,7 @@ public final class SSLContext {
* @param cert Certificate file.
* @param key Private Key file to use if not in cert.
* @param password Certificate password. If null and certificate
- * is encrypted, password prompt will be dispayed.
+ * is encrypted, password prompt will be displayed.
* @param idx Certificate index SSL_AIDX_RSA or SSL_AIDX_DSA.
*/
public static native boolean setCertificate(long ctx, String cert,
@@ -205,14 +204,14 @@ public final class SSLContext {
/**
* Set File and Directory of concatenated PEM-encoded CA Certificates
* for Client Auth
- * <br />
+ * <br>
* This directive sets the all-in-one file where you can assemble the
* Certificates of Certification Authorities (CA) whose clients you deal
with.
* These are used for Client Authentication. Such a file is simply the
* concatenation of the various PEM-encoded Certificate files, in order of
* preference. This can be used alternatively and/or additionally to
* path.
- * <br />
+ * <br>
* The files in this directory have to be PEM-encoded and are accessed
through
* hash filenames. So usually you can't just place the Certificate files
there:
* you also have to create symbolic links named hash-value.N. And you
should
@@ -236,7 +235,7 @@ public final class SSLContext {
/**
* Set SSL connection shutdown type
- * <br />
+ * <br>
* The following levels are available for level:
* <PRE>
* SSL_SHUTDOWN_TYPE_STANDARD
@@ -251,15 +250,15 @@ public final class SSLContext {
/**
* Set Type of Client Certificate verification and Maximum depth of CA
Certificates
* in Client Certificate verification.
- * <br />
+ * <br>
* This directive sets the Certificate verification level for the Client
* Authentication. Notice that this directive can be used both in
per-server
* and per-directory context. In per-server context it applies to the
client
* authentication process used in the standard SSL handshake when a
connection
- * is established. In per-directory context it forces a SSL renegotation
with
+ * is established. In per-directory context it forces a SSL renegotiation
with
* the reconfigured client verification level after the HTTP request was
read
* but before the HTTP response is sent.
- * <br />
+ * <br>
* The following levels are available for level:
* <PRE>
* SSL_CVERIFY_NONE - No client Certificate is required at all
@@ -268,7 +267,7 @@ public final class SSLContext {
* SSL_CVERIFY_OPTIONAL_NO_CA - The client may present a valid Certificate
* but it need not to be (successfully)
verifiable
* </PRE>
- * <br />
+ * <br>
* The depth actually is the maximum number of intermediate certificate
issuers,
* i.e. the number of CA certificates which are max allowed to be followed
while
* verifying the client certificate. A depth of 0 means that self-signed
client
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** SSL Socket
*
* @author Mladen Turk
- *
*/
public class SSLSocket {
@@ -59,10 +58,10 @@ public class SSLSocket {
/**
* Set Type of Client Certificate verification and Maximum depth of CA
* Certificates in Client Certificate verification.
- * <br />
+ * <br>
* This is used to change the verification level for a connection prior to
* starting a re-negotiation.
- * <br />
+ * <br>
* The following levels are available for level:
* <PRE>
* SSL_CVERIFY_NONE - No client Certificate is required at all
@@ -73,7 +72,7 @@ public class SSLSocket {
* but it need not to be (successfully)
* verifiable
* </PRE>
- * <br />
+ * <br>
* @param sock The socket to change.
* @param level Type of Client Certificate verification.
*/
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Shm.java Tue Apr 7
15:05:41 2015
@@ -22,22 +22,21 @@ import java.nio.ByteBuffer;
/** Shm
*
* @author Mladen Turk
- *
*/
public class Shm {
/**
- * Create and make accessable a shared memory segment.
- * <br />
- * A note about Anonymous vs. Named shared memory segments:<br />
- * Not all plaforms support anonymous shared memory segments, but
in
- * some cases it is prefered over other types of shared memory
+ * Create and make accessible a shared memory segment.
+ * <br>
+ * A note about Anonymous vs. Named shared memory segments:<br>
+ * Not all platforms support anonymous shared memory segments, but
in
+ * some cases it is preferred over other types of shared memory
* implementations. Passing a NULL 'file' parameter to this
function
* will cause the subsystem to use anonymous shared memory
segments.
* If such a system is not available, APR_ENOTIMPL is returned.
- * <br />
- * A note about allocation sizes:<br />
+ * <br>
+ * A note about allocation sizes:<br>
* On some platforms it is necessary to store some metainformation
* about the segment within the actual segment. In order to supply
* the caller with the requested size it may be necessary for the
@@ -57,7 +56,7 @@ public class Shm {
/**
* Remove shared memory segment associated with a filename.
- * <br />
+ * <br>
* This function is only supported on platforms which support
* name-based shared memory segments, and will return APR_ENOTIMPL on
* platforms without such support.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Sockaddr.java Tue Apr 7
15:05:41 2015
@@ -20,9 +20,7 @@ package org.apache.tomcat.jni;
/** Sockaddr
*
* @author Mladen Turk
- *
*/
-
public class Sockaddr {
/** The pool to use... */
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java Tue Apr 7
15:05:41 2015
@@ -23,9 +23,7 @@ import java.nio.ByteBuffer;
/** Socket
*
* @author Mladen Turk
- *
*/
-
public class Socket {
/* Standard socket defines */
@@ -119,7 +117,7 @@ public class Socket {
/**
* Shutdown either reading, writing, or both sides of a socket.
- * <br />
+ * <br>
* This does not actually close the socket descriptor, it just
* controls which calls are still valid on the socket.
* @param thesocket The socket to close
@@ -451,10 +449,10 @@ public class Socket {
* @param sock The socket to set up.
* @param t Value for the timeout in microseconds.
* <PRE>
- * t > 0 -- read and write calls return APR_TIMEUP if specified time
- * elapsess with no data read or written
+ * t > 0 -- read and write calls return APR_TIMEUP if specified time
+ * elapses with no data read or written
* t == 0 -- read and write calls never block
- * t < 0 -- read and write calls block
+ * t < 0 -- read and write calls block
* </PRE>
*/
public static native int timeoutSet(long sock, long t);
@@ -470,7 +468,7 @@ public class Socket {
/**
* Send a file from an open file descriptor to a socket, along with
* optional headers and trailers.
- * <br />
+ * <br>
* 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.
@@ -506,8 +504,8 @@ public class Socket {
throws Exception;
/**
- * Private method for geting the socket struct members
- * @param socket The soocket to use
+ * Private method for getting the socket struct members
+ * @param socket The socket to use
* @param what Struct member to obtain
* <PRE>
* SOCKET_GET_POOL - The socket pool
@@ -515,7 +513,7 @@ public class Socket {
* SOCKET_GET_APRS - APR socket
* SOCKET_GET_TYPE - Socket type
* </PRE>
- * @return The stucture member address
+ * @return The structure member address
*/
private static native long get(long socket, int what);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Status.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Status
*
* @author Mladen Turk
- *
*/
public class Status {
@@ -185,7 +184,7 @@ public class Status {
private static native boolean is(int err, int idx);
/**
* APR_STATUS_IS Status Value Tests
- * <br /><b>Warning :</b> For any particular error condition, more than
one of these tests
+ * <br><b>Warning :</b> For any particular error condition, more than one
of these tests
* may match. This is because platform-specific error codes may not
* always match the semantics of the POSIX codes these tests (and the
* corresponding APR error codes) are named after. A notable example
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Stdlib.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** Stdlib
*
* @author Mladen Turk
- *
*/
public class Stdlib {
@@ -77,13 +76,13 @@ public class Stdlib {
/**
* Get current process pid.
- * @return current pid or < 1 in case of error.
+ * @return current pid or < 1 in case of error.
*/
public static native int getpid();
/**
* Get current process parent pid.
- * @return parent pid or < 1 in case of error.
+ * @return parent pid or < 1 in case of error.
*/
public static native int getppid();
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Time.java Tue Apr 7
15:05:41 2015
@@ -20,14 +20,13 @@ package org.apache.tomcat.jni;
/** Time
*
* @author Mladen Turk
- *
*/
public class Time {
/** number of microseconds per second */
public static final long APR_USEC_PER_SEC = 1000000L;
- /** number of miliseconds per microsecond */
+ /** number of milliseconds per microsecond */
public static final long APR_MSEC_PER_USEC = 1000L;
/** @return apr_time_t as a second */
@@ -66,7 +65,7 @@ public class Time {
/**
* Sleep for the specified number of micro-seconds.
- * <br /><b>Warning :</b> May sleep for longer than the specified time.
+ * <br><b>Warning :</b> May sleep for longer than the specified time.
* @param t desired amount of time to sleep.
*/
public static native void sleep(long t);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java?rev=1671866&r1=1671865&r2=1671866&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/User.java Tue Apr 7
15:05:41 2015
@@ -20,7 +20,6 @@ package org.apache.tomcat.jni;
/** User
*
* @author Mladen Turk
- *
*/
public class User {
@@ -99,7 +98,7 @@ public class User {
* This function is available only if APR_HAS_USER is defined.
* @param left One uid to test
* @param right Another uid to test
- * @return APR_SUCCESS if the apr_uid_t strutures identify the same user,
+ * @return APR_SUCCESS if the apr_uid_t structures identify the same user,
* APR_EMISMATCH if not, APR_BADARG if an apr_uid_t is invalid.
*/
public static native int uidcompare(long left, long right);
@@ -109,7 +108,7 @@ public class User {
* This function is available only if APR_HAS_USER is defined.
* @param left One gid to test
* @param right Another gid to test
- * @return APR_SUCCESS if the apr_gid_t strutures identify the same group,
+ * @return APR_SUCCESS if the apr_gid_t structures identify the same group,
* APR_EMISMATCH if not, APR_BADARG if an apr_gid_t is invalid.
*/
public static native int gidcompare(long left, long right);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
