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, 51 insertions, 32 deletions

diff --git a/libjava/java/security/cert/X509CertSelector.h b/libjava/java/security/cert/X509CertSelector.h
index 69dd81e..f1d5b3a 100644
--- a/libjava/java/security/cert/X509CertSelector.h
+++ b/libjava/java/security/cert/X509CertSelector.h
@@ -18,6 +18,13 @@ extern "Java"
       namespace security
       {
           class OID;
+        namespace x509
+        {
+          namespace ext
+          {
+              class GeneralName;
+          }
+        }
       }
     }
   }
@@ -60,51 +67,61 @@ extern "Java"
 class java::security::cert::X509CertSelector : public ::java::lang::Object
 {
 
+  static jboolean checkOid(JArray< jint > *);
+  static ::gnu::java::security::x509::ext::GeneralName * makeName(jint, ::java::lang::String *);
 public:
   X509CertSelector();
+  virtual void addPathToName(jint, JArray< jbyte > *);
+  virtual void addPathToName(jint, ::java::lang::String *);
+  virtual void addSubjectAlternativeName(jint, JArray< jbyte > *);
+  virtual void addSubjectAlternativeName(jint, ::java::lang::String *);
+  virtual ::java::lang::Object * clone();
+  virtual JArray< jbyte > * getAuthorityKeyIdentifier();
+  virtual jint getBasicConstraints();
   virtual ::java::security::cert::X509Certificate * getCertificate();
-  virtual void setCertificate(::java::security::cert::X509Certificate *);
-  virtual ::java::math::BigInteger * getSerialNumber();
-  virtual void setSerialNumber(::java::math::BigInteger *);
-  virtual ::java::lang::String * getIssuerAsString();
+  virtual ::java::util::Date * getCertificateValid();
+  virtual ::java::util::Set * getExtendedKeyUsage();
   virtual JArray< jbyte > * getIssuerAsBytes();
-  virtual void setIssuer(::java::lang::String *);
-  virtual void setIssuer(JArray< jbyte > *);
-  virtual ::java::lang::String * getSubjectAsString();
+  virtual ::java::lang::String * getIssuerAsString();
+  virtual JArray< jboolean > * getKeyUsage();
+  virtual jboolean getMatchAllSubjectAltNames();
+  virtual JArray< jbyte > * getNameConstraints();
+  virtual ::java::util::Collection * getPathToNames();
+  virtual ::java::util::Set * getPolicy();
+  virtual ::java::util::Date * getPrivateKeyValid();
+  virtual ::java::math::BigInteger * getSerialNumber();
+  virtual ::java::util::Collection * getSubjectAlternativeNames();
   virtual JArray< jbyte > * getSubjectAsBytes();
-  virtual void setSubject(::java::lang::String *);
-  virtual void setSubject(JArray< jbyte > *);
+  virtual ::java::lang::String * getSubjectAsString();
   virtual JArray< jbyte > * getSubjectKeyIdentifier();
-  virtual void setSubjectKeyIdentifier(JArray< jbyte > *);
-  virtual JArray< jbyte > * getAuthorityKeyIdentifier();
+  virtual ::java::security::PublicKey * getSubjectPublicKey();
+  virtual ::java::lang::String * getSubjectPublicKeyAlgID();
+  virtual jboolean match(::java::security::cert::Certificate *);
   virtual void setAuthorityKeyIdentifier(JArray< jbyte > *);
-  virtual ::java::util::Date * getCertificateValid();
+  virtual void setBasicConstraints(jint);
+  virtual void setCertificate(::java::security::cert::X509Certificate *);
   virtual void setCertificateValid(::java::util::Date *);
-  virtual ::java::util::Date * getPrivateKeyValid();
-  virtual void setPrivateKeyValid(::java::util::Date *);
-  virtual ::java::lang::String * getSubjectPublicKeyAlgID();
-  virtual void setSubjectPublicKeyAlgID(::java::lang::String *);
-  virtual ::java::security::PublicKey * getSubjectPublicKey();
-  virtual void setSubjectPublicKey(::java::security::PublicKey *);
-  virtual void setSubjectPublicKey(JArray< jbyte > *);
-  virtual JArray< jboolean > * getKeyUsage();
-  virtual void setKeyUsage(JArray< jboolean > *);
-  virtual ::java::util::Set * getExtendedKeyUsage();
   virtual void setExtendedKeyUsage(::java::util::Set *);
-  virtual jboolean getMatchAllSubjectAltNames();
+  virtual void setIssuer(JArray< jbyte > *);
+  virtual void setIssuer(::java::lang::String *);
+  virtual void setKeyUsage(JArray< jboolean > *);
   virtual void setMatchAllSubjectAltNames(jboolean);
-  virtual void setSubjectAlternativeNames(::java::util::Collection *);
-  virtual void addSubjectAlternativeName(jint, ::java::lang::String *);
-  virtual void addSubjectAlternativeName(jint, JArray< jbyte > *);
-  virtual JArray< jbyte > * getNameConstraints();
   virtual void setNameConstraints(JArray< jbyte > *);
-  virtual jint getBasicConstraints();
-  virtual void setBasicConstraints(jint);
-  virtual jboolean match(::java::security::cert::Certificate *);
+  virtual void setPathToNames(::java::util::Collection *);
+  virtual void setPolicy(::java::util::Set *);
+  virtual void setPrivateKeyValid(::java::util::Date *);
+  virtual void setSerialNumber(::java::math::BigInteger *);
+  virtual void setSubject(JArray< jbyte > *);
+  virtual void setSubject(::java::lang::String *);
+  virtual void setSubjectAlternativeNames(::java::util::Collection *);
+  virtual void setSubjectKeyIdentifier(JArray< jbyte > *);
+  virtual void setSubjectPublicKey(JArray< jbyte > *);
+  virtual void setSubjectPublicKey(::java::security::PublicKey *);
+  virtual void setSubjectPublicKeyAlgID(::java::lang::String *);
   virtual ::java::lang::String * toString();
-  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind();
 private:
-  static jboolean checkOid(JArray< jint > *);
   static ::java::lang::String * AUTH_KEY_ID;
   static ::java::lang::String * SUBJECT_KEY_ID;
   static ::java::lang::String * NAME_CONSTRAINTS_ID;
@@ -125,6 +142,8 @@ private:
   jboolean matchAllNames;
   JArray< jbyte > * nameConstraints;
   ::java::util::Set * policy;
+  ::java::util::List * pathToNames;
+  static JArray< jint > * $SWITCH_TABLE$gnu$java$security$x509$ext$GeneralName$Kind__;
 public:
   static ::java::lang::Class class$;
 };