From 4f9533c7722fa07511a94d005227961f4a4dec23 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 18 May 2006 17:29:21 +0000 Subject: Imported GNU Classpath 0.90 Imported GNU Classpath 0.90 * scripts/makemake.tcl: LocaleData.java moved to gnu/java/locale. * sources.am: Regenerated. * gcj/javaprims.h: Regenerated. * Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gnu/java/lang/VMInstrumentationImpl.java: New override. * gnu/java/net/local/LocalSocketImpl.java: Likewise. * gnu/classpath/jdwp/VMMethod.java: Likewise. * gnu/classpath/jdwp/VMVirtualMachine.java: Update to latest interface. * java/lang/Thread.java: Add UncaughtExceptionHandler. * java/lang/reflect/Method.java: Implements GenericDeclaration and isSynthetic(), * java/lang/reflect/Field.java: Likewise. * java/lang/reflect/Constructor.java * java/lang/Class.java: Implements Type, GenericDeclaration, getSimpleName() and getEnclosing*() methods. * java/lang/Class.h: Add new public methods. * java/lang/Math.java: Add signum(), ulp() and log10(). * java/lang/natMath.cc (log10): New function. * java/security/VMSecureRandom.java: New override. * java/util/logging/Logger.java: Updated to latest classpath version. * java/util/logging/LogManager.java: New override. From-SVN: r113887 --- .../compat/java.net/GetSocketOptionInfo.java | 39 --- libjava/classpath/compat/java.net/Makefile.am | 14 - .../classpath/compat/java.net/PlainSocketImpl.java | 284 --------------------- libjava/classpath/compat/java.net/README | 27 -- 4 files changed, 364 deletions(-) delete mode 100644 libjava/classpath/compat/java.net/GetSocketOptionInfo.java delete mode 100644 libjava/classpath/compat/java.net/Makefile.am delete mode 100644 libjava/classpath/compat/java.net/PlainSocketImpl.java delete mode 100644 libjava/classpath/compat/java.net/README (limited to 'libjava/classpath/compat/java.net') diff --git a/libjava/classpath/compat/java.net/GetSocketOptionInfo.java b/libjava/classpath/compat/java.net/GetSocketOptionInfo.java deleted file mode 100644 index 1a5f351..0000000 --- a/libjava/classpath/compat/java.net/GetSocketOptionInfo.java +++ /dev/null @@ -1,39 +0,0 @@ -// Class to identify socket option constants. - -import java.io.*; -import java.net.*; - -public class GetSocketOptionInfo extends Socket implements SocketImplFactory -{ - -public SocketImpl -createSocketImpl() -{ - return(new PlainSocketImpl()); -} - -public static void -main(String[] argv) throws IOException -{ - Socket.setSocketImplFactory(new GetSocketOptionInfo()); - - Socket s = new Socket(); - - System.err.println("Setting TCP_NODELAY on"); - s.setTcpNoDelay(true); - System.err.println("Setting TCP_NODELAY off"); - s.setTcpNoDelay(false); - - System.err.println("Setting SO_LINGER on"); - s.setSoLinger(true, 10); - System.err.println("Setting SO_LINGER off"); - s.setSoLinger(false, 1); - - System.err.println("Setting SO_TIMEOUT to 15"); - s.setSoTimeout(15); - System.err.println("Setting SO_TIMEOUT to 0"); - s.setSoTimeout(0); -} - -} - diff --git a/libjava/classpath/compat/java.net/Makefile.am b/libjava/classpath/compat/java.net/Makefile.am deleted file mode 100644 index 34da4f3..0000000 --- a/libjava/classpath/compat/java.net/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Input file for automake to generate the Makefile.in used by configure - -# Hmm.. This doesn't seem to work -#noinst_JAVA = GetSocketOptionInfo.java PlainSocketImpl.java - -JAVAROOT = . - -compatdir = $(datadir)/compat/java.net - -compat_JAVA = GetSocketOptionInfo.java PlainSocketImpl.java - - -EXTRA_DIST = README - diff --git a/libjava/classpath/compat/java.net/PlainSocketImpl.java b/libjava/classpath/compat/java.net/PlainSocketImpl.java deleted file mode 100644 index 4a80eab..0000000 --- a/libjava/classpath/compat/java.net/PlainSocketImpl.java +++ /dev/null @@ -1,284 +0,0 @@ -/* PlainSocketImpl.java -- Default socket implementation - Copyright (c) 1998 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -import java.net.*; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.IOException; - -/** - * Unless the application installs its own SocketImplFactory, this is the - * default socket implemetation that will be used. It simply uses a - * combination of Java and native routines to implement standard BSD - * style sockets of family AF_INET and types SOCK_STREAM and SOCK_DGRAM - * - * @version 0.1 - * - * @author Aaron M. Renn (arenn@urbanophile.com) - */ -class PlainSocketImpl extends SocketImpl -{ - -/*************************************************************************/ - -/* - * Static Variables - */ - -/* -// Static initializer to load native library -static -{ - System.loadLibrary("javanet"); -} -*/ - -/*************************************************************************/ - -/* - * Instance Variables - */ - -/** - * This is the native file descriptor for this socket - */ -protected int native_fd = -1; - -/*************************************************************************/ - -/** - * Default do nothing constructor - */ -public -PlainSocketImpl() -{ - ; -} - -/*************************************************************************/ - -/** - * Accepts a new connection on this socket and returns in in the - * passed in SocketImpl. - * - * @param impl The SocketImpl object to accept this connection. - */ -protected native void -accept(SocketImpl impl) throws IOException; - -/*************************************************************************/ - -/** - * Returns the number of bytes that the caller can read from this socket - * without blocking. //*****Figure out if we can do something here - * - * @return The number of readable bytes before blocking - * - * @exception IOException If an error occurs - */ -protected int -available() throws IOException -{ - return(0); -} - -/*************************************************************************/ - -/** - * Binds to the specified port on the specified addr. Note that this addr - * must represent a local IP address. **** How bind to INADDR_ANY? **** - * - * @param addr The address to bind to - * @param port The port number to bind to - * - * @exception IOException If an error occurs - */ -protected native void -bind(InetAddress addr, int port) throws IOException; - -/*************************************************************************/ - -/** - * Closes the socket. This will cause any InputStream or OutputStream - * objects for this Socket to be closed as well. - *

- * Note that if the SO_LINGER option is set on this socket, then the - * operation could block. - * - * @exception IOException If an error occurs - */ -protected native void -close() throws IOException; - -/*************************************************************************/ - -/** - * Connects to the remote address and port specified as arguments. - * - * @param addr The remote address to connect to - * @param port The remote port to connect to - * - * @exception IOException If an error occurs - */ -protected void -connect(InetAddress addr, int port) throws IOException -{ - return; -} - -/*************************************************************************/ - -/** - * Connects to the remote hostname and port specified as arguments. - * - * @param hostname The remote hostname to connect to - * @param port The remote port to connect to - * - * @exception IOException If an error occurs - */ -protected void -connect(String hostname, int port) throws IOException -{ - InetAddress addr = InetAddress.getByName(hostname); - connect(addr, port); -} - -/*************************************************************************/ - -/** - * Creates a new socket that is not bound to any local address/port and - * is not connected to any remote address/port. This will be created as - * a stream socket if the stream parameter is true, or a datagram socket - * if the stream parameter is false. - * - * @param stream true for a stream socket, false for a datagram socket - */ -protected native void -create(boolean stream) throws IOException; - -/*************************************************************************/ - -/** - * Starts listening for connections on a socket. The queuelen parameter - * is how many pending connections will queue up waiting to be serviced - * before being accept'ed. If the queue of pending requests exceeds this - * number, additional connections will be refused. - * - * @param queuelen The length of the pending connection queue - * - * @exception IOException If an error occurs - */ -protected native void -listen(int queuelen) throws IOException; - -/*************************************************************************/ - -/** - * Sets the specified option on a socket to the passed in object. For - * options that take an integer argument, the passed in object is an - * Integer. The option_id parameter is one of the defined constants in - * this interface. - * - * @param option_id The identifier of the option - * @param val The value to set the option to - * - * @exception SocketException If an error occurs - */ -public void -setOption(int option_id, Object val) throws SocketException -{ -//*** Do non-native for now - System.err.println("Option Id=" + option_id); - System.err.println("Object is: " + val.getClass().getName()); - System.err.println("Object value is: " + val); -} - -/*************************************************************************/ - -/** - * Returns the current setting of the specified option. The Object returned - * will be an Integer for options that have integer values. The option_id - * is one of the defined constants in this interface. - * - * @param option_id The option identifier - * - * @return The current value of the option - * - * @exception SocketException If an error occurs - */ -public Object -getOption(int option_id) throws SocketException -{ -//**** Do non-native for now - System.err.println("Option Id=" + option_id); - return(null); -} - -/*************************************************************************/ - -/** - * Returns an InputStream object for reading from this socket. This will - * be an instance of SocketInputStream. - * - * @return An InputStream - * - * @exception IOException If an error occurs - */ -protected InputStream -getInputStream() throws IOException -{ - return(null); -} - -/*************************************************************************/ - -/** - * Returns an OutputStream object for writing to this socket. This will - * be an instance of SocketOutputStream. - * - * @return An OutputStream - * - * @exception IOException If an error occurs - */ -protected OutputStream -getOutputStream() throws IOException -{ - return(null); -} - -} // class PlainSocketImpl - diff --git a/libjava/classpath/compat/java.net/README b/libjava/classpath/compat/java.net/README deleted file mode 100644 index f249b75..0000000 --- a/libjava/classpath/compat/java.net/README +++ /dev/null @@ -1,27 +0,0 @@ -This directory contains various "experiment" programs used to determine -the behavior of the java.net class where such behavior is not sufficiently -documented by Sun in order to write an implementation from docs alone. - -Some key findings: - -The setOption/getOption methods are discussed in the "Networking Enhancements" -document for Java 1.1 but are not in the javadocs. However, the SocketImpl -class is shown implementing a SocketOptions interface that is not documented. -We assume this is a non-public interface which contains abstract declarations -of the get/setOption methods as well as contants for the option_id's. - -TCP_NODELAY: - The option id of this option is 1. The Object passed to setOption is - a Boolean indicating whether this option should be on (true) or off (false). - -SO_LINGER: - The option id of this option is 128. When SO_LINGER is to be disabled, - the Object passed to setOption is Boolean with a value of false. When - SO_LINGER is to be enabled, the Object passed to setOption is an Integer - set to the linger value. - -SO_TIMEOUT: - The option id of this option is 4102. The Object passed to setOption is - an Integer that is the new timeout value (0 to disable). - - -- cgit v1.1