5 files changed, 43 insertions, 53 deletions
diff --git a/libjava/gnu/classpath/Configuration.java b/libjava/gnu/classpath/Configuration.java
index 6899b77c44e..73e3c2f0408 100644
--- a/libjava/gnu/classpath/Configuration.java
+++ b/libjava/gnu/classpath/Configuration.java
@@ -1,5 +1,6 @@
 /* Configuration.java --
-   Copyright (C) 1998, 2001, 2003, 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2003, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -65,7 +66,7 @@ public final class Configuration
    * It is set according to the value of 'version' in the configure[.in] file
    * and used to set the System property gnu.classpath.version.
    */
-  public static final String CLASSPATH_VERSION = "0.93";
+  public static final String CLASSPATH_VERSION = "0.95";
 
   /**
    * The value of DEBUG is substituted according to whether the
diff --git a/libjava/gnu/classpath/Pair.h b/libjava/gnu/classpath/Pair.h
new file mode 100644
index 00000000000..98b3e23e25b
--- /dev/null
+++ b/libjava/gnu/classpath/Pair.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_classpath_Pair__
+#define __gnu_classpath_Pair__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace classpath
+    {
+        class Pair;
+    }
+  }
+}
+
+class gnu::classpath::Pair : public ::java::lang::Object
+{
+
+public:
+  Pair(::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::lang::Object * getLeft();
+  virtual ::java::lang::Object * getRight();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+private:
+  ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
+  ::java::lang::Object * right;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_classpath_Pair__
diff --git a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h b/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h
index a64ca4ff668..2d532add995 100644
--- a/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h
+++ b/libjava/gnu/classpath/ServiceFactory$ServiceIterator.h
@@ -33,7 +33,7 @@ class gnu::classpath::ServiceFactory$ServiceIterator : public ::java::lang::Obje
 {
 
 public: // actually package-private
-  ServiceFactory$ServiceIterator(::java::lang::Class *, ::java::util::Enumeration *, ::java::lang::ClassLoader *, ::java::security::AccessControlContext *);
+  ServiceFactory$ServiceIterator(::java::lang::Class *, ::java::util::Enumeration *, ::java::lang::ClassLoader *, jboolean, ::java::security::AccessControlContext *);
 public:
   ::java::lang::Object * next();
   jboolean hasNext();
@@ -48,6 +48,7 @@ private:
   ::java::io::BufferedReader * reader;
   ::java::net::URL * currentURL;
   ::java::lang::Object * nextProvider;
+  jboolean error;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/classpath/ServiceFactory.h b/libjava/gnu/classpath/ServiceFactory.h
index fddad85b14f..d335427fc3f 100644
--- a/libjava/gnu/classpath/ServiceFactory.h
+++ b/libjava/gnu/classpath/ServiceFactory.h
@@ -24,6 +24,7 @@ class gnu::classpath::ServiceFactory : public ::java::lang::Object
   ServiceFactory();
 public:
   static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *);
+  static ::java::util::Iterator * lookupProviders(::java::lang::Class *, ::java::lang::ClassLoader *, jboolean);
   static ::java::util::Iterator * lookupProviders(::java::lang::Class *);
 public: // actually package-private
   static void log(::java::util::logging::Level *, ::java::lang::String *, ::java::lang::Object *, ::java::lang::Throwable *);
diff --git a/libjava/gnu/classpath/jdwp/util/Value.h b/libjava/gnu/classpath/jdwp/util/Value.h
deleted file mode 100644
index 01dda3fa878..00000000000
--- a/libjava/gnu/classpath/jdwp/util/Value.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __gnu_classpath_jdwp_util_Value__
-#define __gnu_classpath_jdwp_util_Value__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace gnu
-  {
-    namespace classpath
-    {
-      namespace jdwp
-      {
-        namespace util
-        {
-            class Value;
-        }
-      }
-    }
-  }
-  namespace java
-  {
-    namespace nio
-    {
-        class ByteBuffer;
-    }
-  }
-}
-
-class gnu::classpath::jdwp::util::Value : public ::java::lang::Object
-{
-
-public:
-  Value();
-  static void writeUntaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *);
-  static void writeTaggedValue(::java::io::DataOutputStream *, ::java::lang::Object *);
-private:
-  static void writeValue(::java::io::DataOutputStream *, ::java::lang::Object *, jboolean);
-public:
-  static ::java::lang::Object * getObj(::java::nio::ByteBuffer *);
-  static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, ::java::lang::Class *);
-  static ::java::lang::Object * getUntaggedObj(::java::nio::ByteBuffer *, jbyte);
-  static ::java::lang::Class class$;
-};
-
-#endif // __gnu_classpath_jdwp_util_Value__