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, 105 deletions

diff --git a/libjava/javax/naming/CannotProceedException.java b/libjava/javax/naming/CannotProceedException.java
deleted file mode 100644
index 3a69cd3..0000000
--- a/libjava/javax/naming/CannotProceedException.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* CannotProceedException.java --
-   Copyright (C) 2001, 2004, 2005  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 javax.naming;
-
-import java.util.Hashtable;
- 
-/**
- * @author Warren Levy (warrenl@redhat.com)
- * @date June 14, 2001
- */
-
-public class CannotProceedException extends NamingException
-{
-  // Serialized fields.
-  protected Name remainingNewName;
-  protected Hashtable environment;
-  protected Name altName;
-  protected Context altNameCtx;
-
-  public CannotProceedException ()
-  {
-    super ();
-  }
-
-  public CannotProceedException (String msg)
-  {
-    super (msg);
-  }
-
-  public Hashtable getEnvironment()
-  {
-    return environment;
-  }
-
-  public void setEnvironment(Hashtable environment)
-  {
-    this.environment = environment;
-  }
-
-  public Name getRemainingNewName()
-  {
-    return remainingNewName;
-  }
-
-  public void setRemainingNewName(Name newName)
-  {
-    remainingNewName = (Name) newName.clone();
-  }
-
-  public Name getAltName()
-  {
-    return altName;
-  }
-
-  public void setAltName(Name altName)
-  {
-    this.altName = altName;
-  }
-
-  public Context getAltNameCtx()
-  {
-    return altNameCtx;
-  }
-
-  public void setAltNameCtx(Context altNameCtx)
-  {
-    this.altNameCtx = altNameCtx;
-  }
-}