Major merge with Classpath.

	Removed many duplicate files.
	* HACKING: Updated.x
	* classpath: Imported new directory.
	* standard.omit: New file.
	* Makefile.in, aclocal.m4, configure: Rebuilt.
	* sources.am: New file.
	* configure.ac: Run Classpath configure script.  Moved code around
	to support.  Disable xlib AWT peers (temporarily).
	* Makefile.am (SUBDIRS): Added 'classpath'
	(JAVAC): Removed.
	(AM_CPPFLAGS): Added more -I options.
	(BOOTCLASSPATH): Simplified.
	Completely redid how sources are built.
	Include sources.am.
	* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
	* include/jni.h: Removed (in Classpath).
	* scripts/classes.pl: Updated to look at built classes.
	* scripts/makemake.tcl: New file.
	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
	-I options.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.

From-SVN: r102082

5 files changed, 0 insertions, 771 deletions

diff --git a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java b/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java
deleted file mode 100644
index 25e8785..0000000
--- a/libjava/java/nio/channels/spi/AbstractInterruptibleChannel.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/* AbstractInterruptibleChannel.java -- 
-   Copyright (C) 2002, 2004 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. */
-
-package java.nio.channels.spi;
-
-import java.io.IOException;
-import java.nio.channels.AsynchronousCloseException;
-import java.nio.channels.Channel;
-import java.nio.channels.InterruptibleChannel;
-
-
-/**
- * @author Michael Koch
- * @since 1.4
- */
-public abstract class AbstractInterruptibleChannel
-  implements Channel, InterruptibleChannel
-{
-  private boolean closed;
-
-  /**
-   * Initializes the channel.
-   */
-  protected AbstractInterruptibleChannel()
-  {
-  }
-
-  /**
-   * Marks the beginning of an I/O operation that might block indefinitely.
-   */
-  protected final void begin()
-  {
-  }
-
-  /**
-   * Closes the channel.
-   *
-   * @exception IOException If an error occurs
-   */
-  public final void close() throws IOException
-  {
-    if (! closed)
-      {
-	closed = true;
-	implCloseChannel();
-      }
-  }
-
-  /**
-   * Marks the end of an I/O operation that might block indefinitely.
-   *
-   * @param completed true if the task completed successfully,
-   * false otherwise
-   *
-   * @exception IOException if an error occurs
-   * @exception AsynchronousCloseException If the channel was asynchronously
-   * closed.
-   * @exception ClosedByInterruptException If the thread blocked in the
-   * I/O operation was interrupted.
-   */
-  protected final void end(boolean completed)
-    throws AsynchronousCloseException
-  {
-    // FIXME: check more here.
-    
-    if (closed) throw new AsynchronousCloseException();
-  }
-
-  /**
-   * Closes the channel.
-   *
-   * @exception IOException If an error occurs
-   */
-  protected abstract void implCloseChannel() throws IOException;
-
-  /**
-   * Tells whether or not this channel is open.
-   * 
-   * @return true if the channel is open, false otherwise 
-   */
-  public final boolean isOpen()
-  {
-    return ! closed;
-  }
-}
diff --git a/libjava/java/nio/channels/spi/AbstractSelectableChannel.java b/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
deleted file mode 100644
index 42ceab7..0000000
--- a/libjava/java/nio/channels/spi/AbstractSelectableChannel.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/* AbstractSelectableChannel.java
-   Copyright (C) 2002, 2003, 2004 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. */
-
-
-package java.nio.channels.spi;
-
-import java.io.IOException;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.util.LinkedList;
-import java.util.ListIterator;
-
-public abstract class AbstractSelectableChannel extends SelectableChannel
-{
-  private boolean blocking = true;
-  private Object LOCK = new Object();
-  private SelectorProvider provider;
-  private LinkedList keys = new LinkedList();
-
-  /**
-   * Initializes the channel
-   *
-   * @param provider the provider that created this channel
-   */
-  protected AbstractSelectableChannel(SelectorProvider provider)
-  {
-    this.provider = provider;
-  }
-
-  /**
-   * Retrieves the object upon which the configureBlocking and register
-   * methods synchronize.
-   *
-   * @return the blocking lock
-   */
-  public final Object blockingLock()
-  {
-    return LOCK;
-  }
-
-  /**
-   * Adjusts this channel's blocking mode.
-   *
-   * @param blocking true if blocking should be enabled, false otherwise
-   *
-   * @return this channel
-   *
-   * @exception IOException If an error occurs
-   */
-  public final SelectableChannel configureBlocking(boolean blocking)
-    throws IOException
-  {
-    synchronized (blockingLock())
-      {
-	if (this.blocking != blocking)
-	  {
-	    implConfigureBlocking(blocking);
-	    this.blocking = blocking;
-	  }
-      }
-
-    return this;
-  }
-
-  /**
-   * Closes this channel.
-   *
-   * @exception IOException If an error occurs
-   */
-  protected final void implCloseChannel() throws IOException
-  {
-    implCloseSelectableChannel();
-  }
-
-  /**
-   * Closes this selectable channel.
-   *
-   * @exception IOException If an error occurs
-   */
-  protected abstract void implCloseSelectableChannel()
-    throws IOException;
-
-  /**
-   * Adjusts this channel's blocking mode.
-   *
-   * @param blocking true if blocking should be enabled, false otherwise
-   *
-   * @exception IOException If an error occurs
-   */
-  protected abstract void implConfigureBlocking(boolean blocking)
-    throws IOException;
-
-  /**
-   * Tells whether or not every I/O operation on this channel will block
-   * until it completes.
-   *
-   * @return true of this channel is blocking, false otherwise
-   */
-  public final boolean isBlocking()
-  {
-    return blocking;
-  }
-
-  /**
-   * Tells whether or not this channel is currently registered with
-   * any selectors.
-   *
-   * @return true if this channel is registered, false otherwise
-   */
-  public final boolean isRegistered()
-  {
-    return ! keys.isEmpty();
-  }
-
-  /**
-   * Retrieves the key representing the channel's registration with the
-   * given selector.
-   *
-   * @param selector the selector to get a selection key for
-   *
-   * @return the selection key this channel is registered with
-   */
-  public final SelectionKey keyFor(Selector selector)
-  {
-    if (! isOpen())
-      return null;
-
-    try
-      {
-	synchronized (blockingLock())
-	  {
-	    return locate(selector);
-	  }
-      }
-    catch (Exception e)
-      {
-	return null;
-      }
-  }
-
-  /**
-   * Returns the provider that created this channel.
-   *
-   * @return the selector provider that created this channel
-   */
-  public final SelectorProvider provider()
-  {
-    return provider;
-  }
-
-  private SelectionKey locate(Selector selector)
-  {
-    ListIterator it = keys.listIterator();
-
-    while (it.hasNext())
-      {
-	SelectionKey key = (SelectionKey) it.next();
-
-	if (key.selector() == selector)
-	  return key;
-      }
-
-    return null;
-  }
-
-  /**
-   * Registers this channel with the given selector, returning a selection key.
-   *
-   * @param selin the seletor to use
-   * @param ops the interested operations
-   * @param att an attachment for the returned selection key
-   *
-   * @return the registered selection key
-   * 
-   * @exception ClosedChannelException If the channel is already closed.
-   */
-  public final SelectionKey register(Selector selin, int ops, Object att)
-    throws ClosedChannelException
-  {
-    if (! isOpen())
-      throw new ClosedChannelException();
-
-    if ((ops & ~validOps()) != 0)
-      throw new IllegalArgumentException();
-    
-    SelectionKey key = null;
-    AbstractSelector selector = (AbstractSelector) selin;
-
-    synchronized (blockingLock())
-      {
-	key = locate(selector);
-
-	if (key != null && key.isValid())
-	  {
-	    if (att != null)
-	      key.attach(att);
-	  }
-	else
-	  {
-	    key = selector.register(this, ops, att);
-
-	    if (key != null)
-	      addSelectionKey(key);
-	  }
-      }
-
-    return key;
-  }
-
-  void addSelectionKey(SelectionKey key)
-  {
-    keys.add(key);
-  }
-
-  // This method gets called by AbstractSelector.deregister().
-  void removeSelectionKey(SelectionKey key)
-  {
-    keys.remove(key);
-  }
-}
diff --git a/libjava/java/nio/channels/spi/AbstractSelectionKey.java b/libjava/java/nio/channels/spi/AbstractSelectionKey.java
deleted file mode 100644
index 5ab8468..0000000
--- a/libjava/java/nio/channels/spi/AbstractSelectionKey.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* AbstractSelectionKey.java --
-   Copyright (C) 2002, 2003, 2004  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. */
-
-package java.nio.channels.spi;
-
-import java.nio.channels.SelectionKey;
-
-
-/**
- * @since 1.4
- */
-public abstract class AbstractSelectionKey extends SelectionKey
-{
-  private boolean cancelled;
-
-  /**
-   * Initializes the key.
-   */
-  protected AbstractSelectionKey()
-  {
-  }
-
-  /**
-   * Cancels this key.
-   */
-  public final void cancel()
-  {
-    if (isValid())
-      {
-	((AbstractSelector) selector()).cancelKey(this);
-	cancelled = true;
-      }
-  }
-
-  /**
-   * Tells whether this key is valid or not.
-   *
-   * @return true if this key is valid, false otherwise
-   */
-  public final boolean isValid()
-  {
-    return ! cancelled;
-  }
-}
diff --git a/libjava/java/nio/channels/spi/AbstractSelector.java b/libjava/java/nio/channels/spi/AbstractSelector.java
deleted file mode 100644
index 7838073..0000000
--- a/libjava/java/nio/channels/spi/AbstractSelector.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/* AbstractSelector.java --
-   Copyright (C) 2002, 2003, 2004  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. */
-
-package java.nio.channels.spi;
-
-import java.io.IOException;
-import java.nio.channels.ClosedSelectorException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.util.HashSet;
-import java.util.Set;
-
-
-public abstract class AbstractSelector extends Selector
-{
-  private boolean closed;
-  private SelectorProvider provider;
-  private HashSet cancelledKeys;
-
-  /**
-   * Initializes the slector.
-   *
-   * @param provider the provider that created this selector
-   */
-  protected AbstractSelector(SelectorProvider provider)
-  {
-    this.provider = provider;
-    this.cancelledKeys = new HashSet();
-  }
-
-  /**
-   * Closes the channel.
-   *
-   * @exception IOException If an error occurs
-   */
-  public final synchronized void close() throws IOException
-  {
-    if (closed)
-      return;
-
-    implCloseSelector();
-    closed = true;
-  }
-
-  /**
-   * Tells whether this channel is open or not.
-   *
-   * @return true if channel is open, false otherwise.
-   */
-  public final boolean isOpen()
-  {
-    return ! closed;
-  }
-
-  /**
-   * Marks the beginning of an I/O operation that might block indefinitely.
-   */
-  protected final void begin()
-  {
-  }
-
-  /**
-   * Marks the end of an I/O operation that might block indefinitely.
-   */
-  protected final void end()
-  {
-  }
-
-  /**
-   * Returns the provider for this selector object.
-   *
-   * @return the SelectorProvider object that created this seletor
-   */
-  public final SelectorProvider provider()
-  {
-    return provider;
-  }
-
-  /**
-   * Returns the cancelled keys set.
-   *
-   * @return the cancelled keys set
-   */
-  protected final Set cancelledKeys()
-  {
-    if (! isOpen())
-      throw new ClosedSelectorException();
-
-    return cancelledKeys;
-  }
-
-  /**
-   * Cancels a selection key.
-   */
-
-  // This method is only called by AbstractSelectionKey.cancel().
-  final void cancelKey(AbstractSelectionKey key)
-  {
-    synchronized (cancelledKeys)
-      {
-	cancelledKeys.add(key);
-      }
-  }
-
-  /**
-   * Closes the channel.
-   *
-   * @exception IOException if an error occurs
-   */
-  protected abstract void implCloseSelector() throws IOException;
-
-  /**
-   * Registers a channel for the selection process.
-   *
-   * @param ch the channel register
-   * @param ops the interested operations
-   * @param att an attachement to the selection key
-   *
-   * @return the registered selection key
-   */
-  protected abstract SelectionKey register(AbstractSelectableChannel ch,
-                                           int ops, Object att);
-
-  /**
-   * Deregisters the given selection key.
-   *
-   * @param key the key to deregister
-   */
-  protected final void deregister(AbstractSelectionKey key)
-  {
-    ((AbstractSelectableChannel) key.channel()).removeSelectionKey(key);
-  }
-}
diff --git a/libjava/java/nio/channels/spi/SelectorProvider.java b/libjava/java/nio/channels/spi/SelectorProvider.java
deleted file mode 100644
index db4e65f..0000000
--- a/libjava/java/nio/channels/spi/SelectorProvider.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/* SelectorProvider.java
-   Copyright (C) 2002, 2003, 2004  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. */
-
-package java.nio.channels.spi;
-
-import gnu.java.nio.SelectorProviderImpl;
-
-import java.io.IOException;
-import java.nio.channels.DatagramChannel;
-import java.nio.channels.Pipe;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-
-
-/**
- * @author Michael Koch
- * @since 1.4
- */
-public abstract class SelectorProvider
-{
-  private static SelectorProvider systemDefaultProvider;
-
-  /**
-   * Initializes the selector provider.
-   *
-   * @exception SecurityException If a security manager has been installed and
-   * it denies @see RuntimePermission ("selectorProvider").
-   */
-  protected SelectorProvider()
-  {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
-      sm.checkPermission(new RuntimePermission("selectorProvider"));
-  }
-
-  /**
-   * Opens a datagram channel.
-   *
-   * @return a new datagram channel object
-   * 
-   * @exception IOException if an error occurs
-   */
-  public abstract DatagramChannel openDatagramChannel()
-    throws IOException;
-
-  /**
-   * Opens a pipe.
-   *
-   * @return a new pipe object
-   * 
-   * @exception IOException if an error occurs
-   */
-  public abstract Pipe openPipe() throws IOException;
-
-  /**
-   * Opens a selector.
-   *
-   * @return a new selector object
-   * 
-   * @exception IOException if an error occurs
-   */
-  public abstract AbstractSelector openSelector() throws IOException;
-
-  /**
-   * Opens a server socket channel.
-   *
-   * @return a new server socket channel object
-   * 
-   * @exception IOException if an error occurs
-   */
-  public abstract ServerSocketChannel openServerSocketChannel()
-    throws IOException;
-
-  /**
-   * Opens a socket channel.
-   *
-   * @return a new socket channel object
-   * 
-   * @exception IOException if an error occurs
-   */
-  public abstract SocketChannel openSocketChannel() throws IOException;
-
-  /**
-   * Returns the system-wide default selector provider for this invocation
-   * of the Java virtual machine.
-   *
-   * @return the default seletor provider
-   */
-  public static synchronized SelectorProvider provider()
-  {
-    if (systemDefaultProvider == null)
-      {
-	String propertyValue =
-	  System.getProperty("java.nio.channels.spi.SelectorProvider");
-
-	if (propertyValue == null || propertyValue.equals(""))
-	  systemDefaultProvider = new SelectorProviderImpl();
-	else
-	  {
-	    try
-	      {
-		systemDefaultProvider =
-		  (SelectorProvider) Class.forName(propertyValue)
-		                          .newInstance();
-	      }
-	    catch (Exception e)
-	      {
-		System.err.println("Could not instantiate class: "
-		                   + propertyValue);
-		systemDefaultProvider = new SelectorProviderImpl();
-	      }
-	  }
-      }
-
-    return systemDefaultProvider;
-  }
-}