classpath-0.95 merge

[Matthias Klose <doko at ubuntu dot com>]

Some progress on the merge.

- tagged trunk as classpath-095-merge-branchpoint to be used as branchpoint
  for the merge of classpath-0.95 to the classpath-095-merge-branch.

- new branch gcj/classpath-095-import-branch based on
  branches/classpath-generics to import classpath-0.95
  imported classpath-0.95 on this branch.

  My previous import of cp-0.95 on the CLASSPATH branch was of no use; for
  the future, this branch should be updated every time a new snapshot is
  merged, without the generated files.

- I now have a merged classpath-0.95 in my working copy, which sucessfully
  builds ands runs the testsuite on i686-linux-gnu. the ChangeLog is
  attached. Should this be committed to the classpath-095-merge-branch
  so that others can test this merge?

Some questions / outstanding issues:

- classpath/tools/Makefile.am, classpath/lib/Makefile.am had some file
  conflicts. Please review my changes here.

- classpath/javax/management/NotificationBroadcasterSupport.java:221: error:
  Type mismatch: cannot convert from Object to MBeanNotificationInfo[]
        return info.clone();
               ^^^^^^^^^^^^
  Just added a cast to make it build. Please review.

- I didn't update classes found in libjava, which were updated in
  classpath/libjava except the necessary bits to make the merge build again.
  Is there a way to determine out-of-date files, files which need updates?

- How to determine .class and generated .h files for .java files which are
  removed in the merge. Currently only removed the files mentioned below.

- Some files directories are not in classpath anymore: should these be
  removed from in the import?

  classpath/.externalToolBuilders
  classpath/.settings
  classpath/.cdtproject
  classpath/ChangeLog.usermap
  classpath/.classpath
  classpath/.project


Thanks for any comments.

  Matthias

	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.

Attachment: svn-status.log.gz
Description: GNU Zip compressed data