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

1 files changed, 0 insertions, 150 deletions

diff --git a/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java b/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java
deleted file mode 100644
index 63897f1d6db..00000000000
--- a/libjava/gnu/java/net/protocol/ftp/BlockInputStream.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* BlockInputStream.java --
-   Copyright (C) 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 gnu.java.net.protocol.ftp;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * A DTP input stream that implements the FTP block transfer mode.
- *
- * @author Chris Burdess (dog@gnu.org)
- */
-class BlockInputStream
-  extends DTPInputStream
-{
-
-  static final int EOF = 64;
-
-  int descriptor;
-  int max = -1;
-  int count = -1;
-
-  BlockInputStream(DTP dtp, InputStream in)
-  {
-    super(dtp, in);
-  }
-
-  public int read()
-    throws IOException
-  {
-    if (transferComplete)
-      {
-        return -1;
-      }
-    if (count == -1)
-      {
-        readHeader();
-      }
-    if (max < 1)
-      {
-        close();
-        return -1;
-      }
-    int c = in.read();
-    if (c == -1)
-      {
-        dtp.transferComplete();
-      }
-    count++;
-    if (count >= max)
-      {
-        count = -1;
-        if (descriptor == EOF)
-          {
-            close();
-          }
-      }
-    return c;
-  }
-
-  public int read(byte[] buf)
-    throws IOException
-  {
-    return read(buf, 0, buf.length);
-  }
-
-  public int read(byte[] buf, int off, int len)
-    throws IOException
-  {
-    if (transferComplete)
-      {
-        return -1;
-      }
-    if (count == -1)
-      {
-        readHeader();
-      }
-    if (max < 1)
-      {
-        close();
-        return -1;
-      }
-    int l = in.read(buf, off, len);
-    if (l == -1)
-      {
-        dtp.transferComplete();
-      }
-    count += l;
-    if (count >= max)
-      {
-        count = -1;
-        if (descriptor == EOF)
-          {
-            close();
-          }
-      }
-    return l;
-  }
-
-  /**
-   * Reads the block header.
-   */
-  void readHeader()
-    throws IOException
-  {
-    descriptor = in.read();
-    int max_hi = in.read();
-    int max_lo = in.read();
-    max = (max_hi << 8) | max_lo;
-    count = 0;
-  }
-
-}
-