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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 213 insertions, 9 deletions

diff --git a/libjava/gnu/java/security/x509/X509Certificate.h b/libjava/gnu/java/security/x509/X509Certificate.h
index 024e4031255..68e944360b6 100644
--- a/libjava/gnu/java/security/x509/X509Certificate.h
+++ b/libjava/gnu/java/security/x509/X509Certificate.h
@@ -107,6 +107,7 @@ public:
 private:
   void doVerify(::java::security::Signature *, ::java::security::PublicKey *);
   void parse(::java::io::InputStream *);
+  static const jlong serialVersionUID = -2491127588187038216LL;
   static ::java::util::logging::Logger * logger;
 public: // actually protected
   static ::gnu::java::security::OID * ID_DSA;
diff --git a/libjava/gnu/java/security/x509/ext/CertificatePolicies.h b/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
index 3e6724e6c46..5de618446c3 100644
--- a/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
+++ b/libjava/gnu/java/security/x509/ext/CertificatePolicies.h
@@ -37,6 +37,7 @@ public:
   CertificatePolicies(JArray< jbyte > *);
   CertificatePolicies(::java::util::List *, ::java::util::Map *);
   virtual ::java::util::List * getPolicies();
+  virtual ::java::util::List * getPolicyStrings();
   virtual ::java::util::List * getPolicyQualifierInfos(::gnu::java::security::OID *);
   virtual JArray< jbyte > * getEncoded();
   virtual ::java::lang::String * toString();
diff --git a/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h b/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h
new file mode 100644
index 00000000000..db98200eb3f
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/GeneralName$Kind.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_GeneralName$Kind__
+#define __gnu_java_security_x509_ext_GeneralName$Kind__
+
+#pragma interface
+
+#include <java/lang/Enum.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace x509
+        {
+          namespace ext
+          {
+              class GeneralName$Kind;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::GeneralName$Kind : public ::java::lang::Enum
+{
+
+  GeneralName$Kind(::java::lang::String *, jint, jint);
+public:
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * forTag(jint);
+  jint tag();
+  static JArray< ::gnu::java::security::x509::ext::GeneralName$Kind * > * values();
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * valueOf(::java::lang::String *);
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * otherName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * rfc822Name;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * dNSName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * x400Address;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * directoryName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * ediPartyName;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * uniformResourceIdentifier;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * iPAddress;
+  static ::gnu::java::security::x509::ext::GeneralName$Kind * registeredId;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Enum)))) tag__;
+  static JArray< ::gnu::java::security::x509::ext::GeneralName$Kind * > * ENUM$VALUES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_GeneralName$Kind__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralName.h b/libjava/gnu/java/security/x509/ext/GeneralName.h
new file mode 100644
index 00000000000..018bd3637cb
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/GeneralName.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_GeneralName__
+#define __gnu_java_security_x509_ext_GeneralName__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace x509
+        {
+          namespace ext
+          {
+              class GeneralName;
+              class GeneralName$Kind;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::GeneralName : public ::java::lang::Object
+{
+
+public:
+  GeneralName(JArray< jbyte > *);
+  GeneralName(::gnu::java::security::x509::ext::GeneralName$Kind *, JArray< jbyte > *);
+  virtual ::gnu::java::security::x509::ext::GeneralName$Kind * kind();
+  virtual JArray< jbyte > * name();
+  virtual JArray< jbyte > * encoded();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+public: // actually package-private
+  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind();
+private:
+  ::gnu::java::security::x509::ext::GeneralName$Kind * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kind__;
+  JArray< jbyte > * name__;
+  JArray< jbyte > * encoded__;
+  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_GeneralName__
diff --git a/libjava/gnu/java/security/x509/ext/GeneralNames.h b/libjava/gnu/java/security/x509/ext/GeneralNames.h
index 8765d18e71a..e55113b1400 100644
--- a/libjava/gnu/java/security/x509/ext/GeneralNames.h
+++ b/libjava/gnu/java/security/x509/ext/GeneralNames.h
@@ -36,15 +36,6 @@ public:
   GeneralNames(JArray< jbyte > *);
   virtual ::java::util::List * getNames();
   virtual ::java::lang::String * toString();
-  static const jint OTHER_NAME = 0;
-  static const jint RFC822_NAME = 1;
-  static const jint DNS_NAME = 2;
-  static const jint X400_ADDRESS = 3;
-  static const jint DIRECTORY_NAME = 4;
-  static const jint EDI_PARTY_NAME = 5;
-  static const jint URI = 6;
-  static const jint IP_ADDRESS = 7;
-  static const jint REGISTERED_ID = 8;
 private:
   ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) names;
 public:
diff --git a/libjava/gnu/java/security/x509/ext/GeneralSubtree.h b/libjava/gnu/java/security/x509/ext/GeneralSubtree.h
new file mode 100644
index 00000000000..dae50e21215
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/GeneralSubtree.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_GeneralSubtree__
+#define __gnu_java_security_x509_ext_GeneralSubtree__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace x509
+        {
+          namespace ext
+          {
+              class GeneralName;
+              class GeneralSubtree;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::GeneralSubtree : public ::java::lang::Object
+{
+
+public:
+  GeneralSubtree(JArray< jbyte > *);
+  virtual ::gnu::java::security::x509::ext::GeneralName * base();
+  virtual jint minimum();
+  virtual jint maximum();
+  virtual ::java::lang::String * toString();
+private:
+  ::gnu::java::security::x509::ext::GeneralName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) base__;
+  jint minimum__;
+  jint maximum__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_GeneralSubtree__
diff --git a/libjava/gnu/java/security/x509/ext/NameConstraints.h b/libjava/gnu/java/security/x509/ext/NameConstraints.h
new file mode 100644
index 00000000000..f7bc7788034
--- /dev/null
+++ b/libjava/gnu/java/security/x509/ext/NameConstraints.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_security_x509_ext_NameConstraints__
+#define __gnu_java_security_x509_ext_NameConstraints__
+
+#pragma interface
+
+#include <gnu/java/security/x509/ext/Extension$Value.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+          class OID;
+        namespace x509
+        {
+          namespace ext
+          {
+              class NameConstraints;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::java::security::x509::ext::NameConstraints : public ::gnu::java::security::x509::ext::Extension$Value
+{
+
+public:
+  NameConstraints(JArray< jbyte > *);
+  virtual ::java::util::List * permittedSubtrees();
+  virtual ::java::util::List * excludedSubtrees();
+  virtual ::java::lang::String * toString();
+  static ::gnu::java::security::OID * ID;
+private:
+  ::java::util::List * __attribute__((aligned(__alignof__( ::gnu::java::security::x509::ext::Extension$Value)))) permittedSubtrees__;
+  ::java::util::List * excludedSubtrees__;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_security_x509_ext_NameConstraints__