libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.

From-SVN: r125302

1 files changed, 0 insertions, 190 deletions

diff --git a/libjava/classpath/gnu/java/net/BASE64.java b/libjava/classpath/gnu/java/net/BASE64.java
deleted file mode 100644
index 901aa0c35fc..00000000000
--- a/libjava/classpath/gnu/java/net/BASE64.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/* BASE.java --
-   Copyright (C) 2003, 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 gnu.java.net;
-
-/**
- * Encodes and decodes text according to the BASE64 encoding.
- *
- * @author Chris Burdess (dog@gnu.org)
- */
-public final class BASE64
-{
-  private static final byte[] src = {
-    0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a,
-    0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54,
-    0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63, 0x64,
-    0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e,
-    0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
-    0x79, 0x7a, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-    0x38, 0x39, 0x2b, 0x2f
-  };
-
-  private static final byte[] dst;
-  static
-  {
-    dst = new byte[0x100];
-    for (int i = 0x0; i < 0xff; i++)
-      {
-        dst[i] = -1;
-      }
-    for (int i = 0; i < src.length; i++)
-      {
-        dst[src[i]] = (byte) i;
-      }
-  }
-
-  private BASE64()
-  {
-  }
-
-  /**
-   * Encode the specified byte array using the BASE64 algorithm.
-   *
-   * @param bs the source byte array
-   */
-  public static byte[] encode(byte[] bs)
-  {
-    int si = 0, ti = 0;         // source/target array indices
-    byte[] bt = new byte[((bs.length + 2) * 4) / 3];     // target byte array
-    for (; si < bs.length; si += 3)
-      {
-        int buflen = bs.length - si;
-        if (buflen == 1)
-          {
-            byte b = bs[si];
-            int i = 0;
-            bt[ti++] = src[b >>> 2 & 0x3f];
-            bt[ti++] = src[(b << 4 & 0x30) + (i >>> 4 & 0xf)];
-          }
-        else if (buflen == 2)
-          {
-            byte b1 = bs[si], b2 = bs[si + 1];
-            int i = 0;
-            bt[ti++] = src[b1 >>> 2 & 0x3f];
-            bt[ti++] = src[(b1 << 4 & 0x30) + (b2 >>> 4 & 0xf)];
-            bt[ti++] = src[(b2 << 2 & 0x3c) + (i >>> 6 & 0x3)];
-          }
-        else
-          {
-            byte b1 = bs[si], b2 = bs[si + 1], b3 = bs[si + 2];
-            bt[ti++] = src[b1 >>> 2 & 0x3f];
-            bt[ti++] = src[(b1 << 4 & 0x30) + (b2 >>> 4 & 0xf)];
-            bt[ti++] = src[(b2 << 2 & 0x3c) + (b3 >>> 6 & 0x3)];
-            bt[ti++] = src[b3 & 0x3f];
-          }
-      }
-     if (ti < bt.length)
-      {
-	byte[] tmp = new byte[ti];
-	System.arraycopy(bt, 0, tmp, 0, ti);
-	bt = tmp;
-      }
-    /*while (ti < bt.length)
-      {
-        bt[ti++] = 0x3d;
-      }*/
-    return bt;
-  }
-
-  /**
-   * Decode the specified byte array using the BASE64 algorithm.
-   *
-   * @param bs the source byte array
-   */
-  public static byte[] decode(byte[] bs)
-  {
-    int srclen = bs.length;
-    while (srclen > 0 && bs[srclen - 1] == 0x3d)
-      {
-        srclen--; /* strip padding character */
-      }
-    byte[] buffer = new byte[srclen];
-    int buflen = 0;
-    int si = 0;
-    int len = srclen - si;
-    while (len > 0)
-      {
-        byte b0 = dst[bs[si++] & 0xff];
-        byte b2 = dst[bs[si++] & 0xff];
-        buffer[buflen++] = (byte) (b0 << 2 & 0xfc | b2 >>> 4 & 0x3);
-        if (len > 2)
-          {
-            b0 = b2;
-            b2 = dst[bs[si++] & 0xff];
-            buffer[buflen++] = (byte) (b0 << 4 & 0xf0 | b2 >>> 2 & 0xf);
-            if (len > 3)
-              {
-                b0 = b2;
-                b2 = dst[bs[si++] & 0xff];
-                buffer[buflen++] = (byte) (b0 << 6 & 0xc0 | b2 & 0x3f);
-              }
-          }
-        len = srclen - si;
-      }
-    byte[] bt = new byte[buflen];
-    System.arraycopy(buffer, 0, bt, 0, buflen);
-    return bt;
-  }
-  
-  public static void main(String[] args)
-  {
-    boolean decode = false;
-    for (int i = 0; i < args.length; i++)
-      {
-        if (args[i].equals("-d"))
-          {
-            decode = true;
-          }
-        else
-          {
-            try
-              {
-                byte[] in = args[i].getBytes("US-ASCII");
-                byte[] out = decode ? decode(in) : encode(in);
-                System.out.println(args[i] + " = " +
-                                   new String(out, "US-ASCII"));
-              }
-            catch (java.io.UnsupportedEncodingException e)
-              {
-                e.printStackTrace(System.err);
-              }
-          }
-      }
-  }
-}