From 24d8ce15e2daacbc37d9d727f7a6ded79aad5e92 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@redhat.com>
Date: Fri, 16 Feb 2007 13:51:04 +0000
Subject: [PATCH] [multiple changes]

2007-02-15  Andrew Haley  <aph@redhat.com>

        * Makefile.am (nat_source_files): Remove
        java/lang/management/natVMManagementFactory.cc.
        * java/lang/Thread.java (getStackTrace): Use reflection to call
        the ManagementFactory.
        * java/lang/management/VMManagementFactory.java: Remove native
        methods.
        * java/lang/management/natVMManagementFactory.cc: Deleted.
        * sources.am: Regnerate.
        * scripts/makemake.tcl: Add new "bcheaders" type.
        Move java/lang/management and gnu/classpath/management to "bc".
        Move gnu/java/lang/management to "bcheaders".

2007-02-16  Andrew Haley  <aph@redhat.com>

        * gnu/java/lang/management/MemoryMXBeanImpl.java,
        javax/management/MBeanServerDelegate.java: Use
        gnu.javax.management.ListenerData rather than
        gnu.classpath.ListenerData.
        * gnu/javax/management/ListenerData.java: Move here from
        gnu/classpath/ListenerData.java.

From-SVN: r122041
---
 libjava/ChangeLog                             |  14 ++
 libjava/Makefile.am                           |   1 -
 libjava/Makefile.in                           | 161 ++++++++----------
 libjava/classpath/ChangeLog                   |   9 +
 .../lang/management/MemoryMXBeanImpl.java     |   2 +-
 .../management}/ListenerData.java             |   2 +-
 .../javax/management/MBeanServerDelegate.java |   2 +-
 .../lib/gnu/classpath/ListenerData.class      | Bin 1197 -> 0 bytes
 .../lang/management/MemoryMXBeanImpl.class    | Bin 7173 -> 7187 bytes
 .../gnu/javax/management/ListenerData.class   | Bin 0 -> 1211 bytes
 .../lib/java/lang/Thread$State.class          | Bin 1242 -> 1242 bytes
 libjava/classpath/lib/java/lang/Thread.class  | Bin 9343 -> 10110 bytes
 .../lang/management/VMManagementFactory.class | Bin 444 -> 707 bytes
 .../management/MBeanServerDelegate.class      | Bin 4928 -> 4942 bytes
 .../management}/ListenerData.h                |  15 +-
 libjava/java/lang/Thread.java                 |  45 ++++-
 .../lang/management/VMManagementFactory.java  |  20 ++-
 .../lang/management/natVMManagementFactory.cc |  44 -----
 libjava/scripts/makemake.tcl                  |  14 +-
 libjava/sources.am                            |  44 ++---
 20 files changed, 188 insertions(+), 185 deletions(-)
 rename libjava/classpath/gnu/{classpath => javax/management}/ListenerData.java (99%)
 delete mode 100644 libjava/classpath/lib/gnu/classpath/ListenerData.class
 create mode 100644 libjava/classpath/lib/gnu/javax/management/ListenerData.class
 rename libjava/gnu/{classpath => javax/management}/ListenerData.h (75%)
 delete mode 100644 libjava/java/lang/management/natVMManagementFactory.cc

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bd312d0322f..948f2dfab21 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,17 @@
+2007-02-15  Andrew Haley  <aph@redhat.com>
+
+	* Makefile.am (nat_source_files): Remove
+	java/lang/management/natVMManagementFactory.cc.
+	* java/lang/Thread.java (getStackTrace): Use reflection to call
+	the ManagementFactory.
+	* java/lang/management/VMManagementFactory.java: Remove native
+	methods.
+	* java/lang/management/natVMManagementFactory.cc: Deleted.
+	* sources.am: Regnerate.
+	* scripts/makemake.tcl: Add new "bcheaders" type.
+	Move java/lang/management and gnu/classpath/management to "bc".
+	Move gnu/java/lang/management to "bcheaders".
+	
 2007-02-15  Kyle Galloway  <kgallowa@redhat.com>
 	
 	* interpret.cc (_Jv_InterpMethod::check_handler): New method.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 93b03e41a4e..2532ed6d4f2 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -867,7 +867,6 @@ gnu/java/nio/channels/natFileChannelImpl.cc \
 java/io/natFile.cc \
 java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
-java/lang/management/natVMManagementFactory.cc \
 java/lang/natCharacter.cc \
 java/lang/natClass.cc \
 java/lang/natClassLoader.cc \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 3be95319233..16abe2df57a 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -166,9 +166,9 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
 	gnu/java/awt/font/opentype/truetype.lo gnu/java/awt/image.lo \
 	gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \
 	gnu/java/awt/peer/headless.lo gnu/java/awt/print.lo \
-	gnu/java/io.lo gnu/java/lang.lo gnu/java/lang/management.lo \
-	gnu/java/lang/reflect.lo gnu/java/locale.lo gnu/java/math.lo \
-	gnu/java/net.lo gnu/java/net/loader.lo gnu/java/net/local.lo \
+	gnu/java/io.lo gnu/java/lang.lo gnu/java/lang/reflect.lo \
+	gnu/java/locale.lo gnu/java/math.lo gnu/java/net.lo \
+	gnu/java/net/loader.lo gnu/java/net/local.lo \
 	gnu/java/net/protocol/core.lo gnu/java/net/protocol/file.lo \
 	gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/gcjlib.lo \
 	gnu/java/net/protocol/http.lo gnu/java/net/protocol/https.lo \
@@ -204,8 +204,8 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
 	gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \
 	gnu/javax/imageio.lo gnu/javax/imageio/bmp.lo \
 	gnu/javax/imageio/gif.lo gnu/javax/imageio/jpeg.lo \
-	gnu/javax/imageio/png.lo gnu/javax/management.lo \
-	gnu/javax/naming/giop.lo gnu/javax/naming/ictxImpl/trans.lo \
+	gnu/javax/imageio/png.lo gnu/javax/naming/giop.lo \
+	gnu/javax/naming/ictxImpl/trans.lo \
 	gnu/javax/naming/jndi/url/corbaname.lo \
 	gnu/javax/naming/jndi/url/rmi.lo gnu/javax/net/ssl.lo \
 	gnu/javax/net/ssl/provider.lo gnu/javax/print.lo \
@@ -236,26 +236,25 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
 	java/awt/peer.lo java/awt/print.lo java/beans.lo \
 	java/beans/beancontext.lo java/io.lo java/lang.lo \
 	java/lang/annotation.lo java/lang/instrument.lo \
-	java/lang/management.lo java/lang/ref.lo java/lang/reflect.lo \
-	java/math.lo java/net.lo java/nio.lo java/nio/channels.lo \
-	java/nio/channels/spi.lo java/nio/charset.lo \
-	java/nio/charset/spi.lo java/rmi.lo java/rmi/activation.lo \
-	java/rmi/dgc.lo java/rmi/registry.lo java/rmi/server.lo \
-	java/security.lo java/security/acl.lo java/security/cert.lo \
-	java/security/interfaces.lo java/security/spec.lo java/sql.lo \
-	java/text.lo java/util.lo java/util/concurrent.lo \
-	java/util/concurrent/atomic.lo java/util/concurrent/locks.lo \
-	java/util/jar.lo java/util/logging.lo java/util/prefs.lo \
-	java/util/regex.lo java/util/zip.lo javax/accessibility.lo \
-	javax/crypto.lo javax/crypto/interfaces.lo \
-	javax/crypto/spec.lo javax/management.lo \
-	javax/management/loading.lo javax/management/openmbean.lo \
-	javax/naming.lo javax/naming/directory.lo \
-	javax/naming/event.lo javax/naming/ldap.lo javax/naming/spi.lo \
-	javax/net.lo javax/net/ssl.lo javax/print.lo \
-	javax/print/attribute.lo javax/print/attribute/standard.lo \
-	javax/print/event.lo javax/security/auth.lo \
-	javax/security/auth/callback.lo \
+	java/lang/ref.lo java/lang/reflect.lo java/math.lo java/net.lo \
+	java/nio.lo java/nio/channels.lo java/nio/channels/spi.lo \
+	java/nio/charset.lo java/nio/charset/spi.lo java/rmi.lo \
+	java/rmi/activation.lo java/rmi/dgc.lo java/rmi/registry.lo \
+	java/rmi/server.lo java/security.lo java/security/acl.lo \
+	java/security/cert.lo java/security/interfaces.lo \
+	java/security/spec.lo java/sql.lo java/text.lo java/util.lo \
+	java/util/concurrent.lo java/util/concurrent/atomic.lo \
+	java/util/concurrent/locks.lo java/util/jar.lo \
+	java/util/logging.lo java/util/prefs.lo java/util/regex.lo \
+	java/util/zip.lo javax/accessibility.lo javax/crypto.lo \
+	javax/crypto/interfaces.lo javax/crypto/spec.lo \
+	javax/management.lo javax/management/loading.lo \
+	javax/management/openmbean.lo javax/naming.lo \
+	javax/naming/directory.lo javax/naming/event.lo \
+	javax/naming/ldap.lo javax/naming/spi.lo javax/net.lo \
+	javax/net/ssl.lo javax/print.lo javax/print/attribute.lo \
+	javax/print/attribute/standard.lo javax/print/event.lo \
+	javax/security/auth.lo javax/security/auth/callback.lo \
 	javax/security/auth/kerberos.lo javax/security/auth/login.lo \
 	javax/security/auth/spi.lo javax/security/auth/x500.lo \
 	javax/security/cert.lo javax/security/sasl.lo \
@@ -274,13 +273,14 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
 	sun/reflect.lo sun/reflect/annotation.lo sun/reflect/misc.lo
 am__DEPENDENCIES_2 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
 	gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-swing.lo \
-	gnu-java-beans.lo gnu-java-util-prefs-gconf.lo \
+	gnu-java-beans.lo gnu-java-lang-management.lo \
+	gnu-java-util-prefs-gconf.lo gnu-javax-management.lo \
 	gnu-javax-rmi.lo gnu-javax-sound-midi.lo gnu-xml-aelfred2.lo \
 	gnu-xml-dom.lo gnu-xml-libxmlj.lo gnu-xml-pipeline.lo \
 	gnu-xml-stream.lo gnu-xml-transform.lo gnu-xml-util.lo \
-	gnu-xml-validation.lo gnu-xml-xpath.lo javax-imageio.lo \
-	javax-rmi.lo javax-xml.lo org-omg.lo org-relaxng.lo org-w3c.lo \
-	org-xml.lo
+	gnu-xml-validation.lo gnu-xml-xpath.lo java-lang-management.lo \
+	javax-imageio.lo javax-rmi.lo javax-xml.lo org-omg.lo \
+	org-relaxng.lo org-w3c.lo org-xml.lo
 am__DEPENDENCIES_3 = $(patsubst classpath/resource/%,%,$(addsuffix \
 	.lo,$(property_files)))
 am__DEPENDENCIES_4 =
@@ -323,18 +323,16 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
 	gnu/java/nio/natVMChannel.cc \
 	gnu/java/nio/channels/natFileChannelImpl.cc java/io/natFile.cc \
 	java/io/natVMObjectInputStream.cc \
-	java/io/natVMObjectStreamClass.cc \
-	java/lang/management/natVMManagementFactory.cc \
-	java/lang/natCharacter.cc java/lang/natClass.cc \
-	java/lang/natClassLoader.cc java/lang/natConcreteProcess.cc \
-	java/lang/natVMDouble.cc java/lang/natVMFloat.cc \
-	java/lang/natMath.cc java/lang/natObject.cc \
-	java/lang/natRuntime.cc java/lang/natString.cc \
-	java/lang/natStringBuffer.cc java/lang/natStringBuilder.cc \
-	java/lang/natSystem.cc java/lang/natThread.cc \
-	java/lang/natThreadLocal.cc java/lang/natVMClassLoader.cc \
-	java/lang/natVMThrowable.cc java/lang/ref/natReference.cc \
-	java/lang/reflect/natArray.cc \
+	java/io/natVMObjectStreamClass.cc java/lang/natCharacter.cc \
+	java/lang/natClass.cc java/lang/natClassLoader.cc \
+	java/lang/natConcreteProcess.cc java/lang/natVMDouble.cc \
+	java/lang/natVMFloat.cc java/lang/natMath.cc \
+	java/lang/natObject.cc java/lang/natRuntime.cc \
+	java/lang/natString.cc java/lang/natStringBuffer.cc \
+	java/lang/natStringBuilder.cc java/lang/natSystem.cc \
+	java/lang/natThread.cc java/lang/natThreadLocal.cc \
+	java/lang/natVMClassLoader.cc java/lang/natVMThrowable.cc \
+	java/lang/ref/natReference.cc java/lang/reflect/natArray.cc \
 	java/lang/reflect/natConstructor.cc \
 	java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
 	java/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \
@@ -387,18 +385,16 @@ am__objects_2 = gnu/classpath/jdwp/natVMFrame.lo \
 	gnu/java/nio/natVMChannel.lo \
 	gnu/java/nio/channels/natFileChannelImpl.lo java/io/natFile.lo \
 	java/io/natVMObjectInputStream.lo \
-	java/io/natVMObjectStreamClass.lo \
-	java/lang/management/natVMManagementFactory.lo \
-	java/lang/natCharacter.lo java/lang/natClass.lo \
-	java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
-	java/lang/natVMDouble.lo java/lang/natVMFloat.lo \
-	java/lang/natMath.lo java/lang/natObject.lo \
-	java/lang/natRuntime.lo java/lang/natString.lo \
-	java/lang/natStringBuffer.lo java/lang/natStringBuilder.lo \
-	java/lang/natSystem.lo java/lang/natThread.lo \
-	java/lang/natThreadLocal.lo java/lang/natVMClassLoader.lo \
-	java/lang/natVMThrowable.lo java/lang/ref/natReference.lo \
-	java/lang/reflect/natArray.lo \
+	java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
+	java/lang/natClass.lo java/lang/natClassLoader.lo \
+	java/lang/natConcreteProcess.lo java/lang/natVMDouble.lo \
+	java/lang/natVMFloat.lo java/lang/natMath.lo \
+	java/lang/natObject.lo java/lang/natRuntime.lo \
+	java/lang/natString.lo java/lang/natStringBuffer.lo \
+	java/lang/natStringBuilder.lo java/lang/natSystem.lo \
+	java/lang/natThread.lo java/lang/natThreadLocal.lo \
+	java/lang/natVMClassLoader.lo java/lang/natVMThrowable.lo \
+	java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
 	java/lang/reflect/natConstructor.lo \
 	java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
 	java/lang/reflect/natVMProxy.lo java/net/natVMInetAddress.lo \
@@ -1147,7 +1143,6 @@ gnu/awt/xlib/XToolkit.java
 gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files))
 gnu_classpath_source_files = \
 gnu/classpath/Configuration.java \
-classpath/gnu/classpath/ListenerData.java \
 classpath/gnu/classpath/NotImplementedException.java \
 classpath/gnu/classpath/Pointer.java \
 classpath/gnu/classpath/Pointer32.java \
@@ -2888,9 +2883,9 @@ classpath/gnu/javax/imageio/png/PNGTime.java
 
 gnu_javax_imageio_png_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_imageio_png_source_files)))
 gnu_javax_management_source_files = \
+classpath/gnu/javax/management/ListenerData.java \
 classpath/gnu/javax/management/Server.java
 
-gnu_javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_management_source_files)))
 gnu_javax_naming_giop_source_files = \
 classpath/gnu/javax/naming/giop/ContextContinuation.java \
 classpath/gnu/javax/naming/giop/CorbalocParser.java \
@@ -4355,7 +4350,6 @@ classpath/java/lang/management/ThreadInfo.java \
 classpath/java/lang/management/ThreadMXBean.java \
 java/lang/management/VMManagementFactory.java
 
-java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_management_source_files)))
 java_lang_ref_source_files = \
 classpath/java/lang/ref/PhantomReference.java \
 java/lang/ref/Reference.java \
@@ -7246,7 +7240,6 @@ all_packages_source_files = \
   gnu/java/awt/print.list \
   gnu/java/io.list \
   gnu/java/lang.list \
-  gnu/java/lang/management.list \
   gnu/java/lang/reflect.list \
   gnu/java/locale.list \
   gnu/java/math.list \
@@ -7324,7 +7317,6 @@ all_packages_source_files = \
   gnu/javax/imageio/gif.list \
   gnu/javax/imageio/jpeg.list \
   gnu/javax/imageio/png.list \
-  gnu/javax/management.list \
   gnu/javax/naming/giop.list \
   gnu/javax/naming/ictxImpl/trans.list \
   gnu/javax/naming/jndi/url/corbaname.list \
@@ -7378,7 +7370,6 @@ all_packages_source_files = \
   java/lang.list \
   java/lang/annotation.list \
   java/lang/instrument.list \
-  java/lang/management.list \
   java/lang/ref.list \
   java/lang/reflect.list \
   java/math.list \
@@ -7577,7 +7568,6 @@ ordinary_header_files = \
   $(gnu_javax_imageio_gif_header_files) \
   $(gnu_javax_imageio_jpeg_header_files) \
   $(gnu_javax_imageio_png_header_files) \
-  $(gnu_javax_management_header_files) \
   $(gnu_javax_naming_giop_header_files) \
   $(gnu_javax_naming_ictxImpl_trans_header_files) \
   $(gnu_javax_naming_jndi_url_corbaname_header_files) \
@@ -7626,7 +7616,6 @@ ordinary_header_files = \
   $(java_lang_header_files) \
   $(java_lang_annotation_header_files) \
   $(java_lang_instrument_header_files) \
-  $(java_lang_management_header_files) \
   $(java_lang_ref_header_files) \
   $(java_lang_reflect_header_files) \
   $(java_math_header_files) \
@@ -7719,7 +7708,9 @@ bc_objects = \
   gnu-java-awt-peer-gtk.lo \
   gnu-java-awt-peer-swing.lo \
   gnu-java-beans.lo \
+  gnu-java-lang-management.lo \
   gnu-java-util-prefs-gconf.lo \
+  gnu-javax-management.lo \
   gnu-javax-rmi.lo \
   gnu-javax-sound-midi.lo \
   gnu-xml-aelfred2.lo \
@@ -7731,6 +7722,7 @@ bc_objects = \
   gnu-xml-util.lo \
   gnu-xml-validation.lo \
   gnu-xml-xpath.lo \
+  java-lang-management.lo \
   javax-imageio.lo \
   javax-rmi.lo \
   javax-xml.lo \
@@ -7986,7 +7978,6 @@ gnu/java/nio/channels/natFileChannelImpl.cc \
 java/io/natFile.cc \
 java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
-java/lang/management/natVMManagementFactory.cc \
 java/lang/natCharacter.cc \
 java/lang/natClass.cc \
 java/lang/natClassLoader.cc \
@@ -8476,15 +8467,6 @@ java/io/natVMObjectInputStream.lo: java/io/$(am__dirstamp) \
 	java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectStreamClass.lo: java/io/$(am__dirstamp) \
 	java/io/$(DEPDIR)/$(am__dirstamp)
-java/lang/management/$(am__dirstamp):
-	@$(mkdir_p) java/lang/management
-	@: > java/lang/management/$(am__dirstamp)
-java/lang/management/$(DEPDIR)/$(am__dirstamp):
-	@$(mkdir_p) java/lang/management/$(DEPDIR)
-	@: > java/lang/management/$(DEPDIR)/$(am__dirstamp)
-java/lang/management/natVMManagementFactory.lo:  \
-	java/lang/management/$(am__dirstamp) \
-	java/lang/management/$(DEPDIR)/$(am__dirstamp)
 java/lang/$(am__dirstamp):
 	@$(mkdir_p) java/lang
 	@: > java/lang/$(am__dirstamp)
@@ -8938,8 +8920,6 @@ mostlyclean-compile:
 	-rm -f java/io/natVMObjectStreamClass.lo
 	-rm -f java/lang/Object.$(OBJEXT)
 	-rm -f java/lang/Object.lo
-	-rm -f java/lang/management/natVMManagementFactory.$(OBJEXT)
-	-rm -f java/lang/management/natVMManagementFactory.lo
 	-rm -f java/lang/natCharacter.$(OBJEXT)
 	-rm -f java/lang/natCharacter.lo
 	-rm -f java/lang/natClass.$(OBJEXT)
@@ -9125,7 +9105,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMDouble.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMFloat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMThrowable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/management/$(DEPDIR)/natVMManagementFactory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/ref/$(DEPDIR)/natReference.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natArray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/reflect/$(DEPDIR)/natConstructor.Plo@am__quote@
@@ -9413,7 +9392,6 @@ clean-libtool:
 	-rm -rf gnu/java/nio/channels/.libs gnu/java/nio/channels/_libs
 	-rm -rf java/io/.libs java/io/_libs
 	-rm -rf java/lang/.libs java/lang/_libs
-	-rm -rf java/lang/management/.libs java/lang/management/_libs
 	-rm -rf java/lang/ref/.libs java/lang/ref/_libs
 	-rm -rf java/lang/reflect/.libs java/lang/reflect/_libs
 	-rm -rf java/net/.libs java/net/_libs
@@ -9824,8 +9802,6 @@ distclean-generic:
 	-rm -f java/io/$(am__dirstamp)
 	-rm -f java/lang/$(DEPDIR)/$(am__dirstamp)
 	-rm -f java/lang/$(am__dirstamp)
-	-rm -f java/lang/management/$(DEPDIR)/$(am__dirstamp)
-	-rm -f java/lang/management/$(am__dirstamp)
 	-rm -f java/lang/ref/$(DEPDIR)/$(am__dirstamp)
 	-rm -f java/lang/ref/$(am__dirstamp)
 	-rm -f java/lang/reflect/$(DEPDIR)/$(am__dirstamp)
@@ -9863,7 +9839,7 @@ clean-am: clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \
 
 distclean: distclean-multi distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/management/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-local distclean-tags
@@ -9896,7 +9872,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-multi maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/management/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -10249,11 +10225,10 @@ gnu/java/lang.list: $(gnu_java_lang_source_files)
 
 -include gnu/java/lang.deps
 
-gnu/java/lang/management.list: $(gnu_java_lang_management_source_files)
-	@$(mkinstalldirs) $(dir $@)
-	echo $(srcdir)/classpath/lib/gnu/java/lang/management/*.class > gnu/java/lang/management.list
-
--include gnu/java/lang/management.deps
+gnu-java-lang-management.lo: $(gnu_java_lang_management_source_files)
+	@find $(srcdir)/classpath/lib/gnu/java/lang/management -name '*.class' > gnu-java-lang-management.list
+	$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -findirect-dispatch -fno-indirect-classes -c -o gnu-java-lang-management.lo @gnu-java-lang-management.list
+	@rm -f gnu-java-lang-management.list
 
 gnu/java/lang/reflect.list: $(gnu_java_lang_reflect_source_files)
 	@$(mkinstalldirs) $(dir $@)
@@ -10722,11 +10697,10 @@ gnu/javax/imageio/png.list: $(gnu_javax_imageio_png_source_files)
 
 -include gnu/javax/imageio/png.deps
 
-gnu/javax/management.list: $(gnu_javax_management_source_files)
-	@$(mkinstalldirs) $(dir $@)
-	echo $(srcdir)/classpath/lib/gnu/javax/management/*.class > gnu/javax/management.list
-
--include gnu/javax/management.deps
+gnu-javax-management.lo: $(gnu_javax_management_source_files)
+	@find $(srcdir)/classpath/lib/gnu/javax/management -name '*.class' > gnu-javax-management.list
+	$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-management.lo @gnu-javax-management.list
+	@rm -f gnu-javax-management.list
 
 gnu/javax/naming/giop.list: $(gnu_javax_naming_giop_source_files)
 	@$(mkinstalldirs) $(dir $@)
@@ -11101,11 +11075,10 @@ java/lang/instrument.list: $(java_lang_instrument_source_files)
 
 -include java/lang/instrument.deps
 
-java/lang/management.list: $(java_lang_management_source_files)
-	@$(mkinstalldirs) $(dir $@)
-	echo $(srcdir)/classpath/lib/java/lang/management/*.class > java/lang/management.list
-
--include java/lang/management.deps
+java-lang-management.lo: $(java_lang_management_source_files)
+	@find $(srcdir)/classpath/lib/java/lang/management -name '*.class' > java-lang-management.list
+	$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o java-lang-management.lo @java-lang-management.list
+	@rm -f java-lang-management.list
 
 java/lang/ref.list: $(java_lang_ref_source_files)
 	@$(mkinstalldirs) $(dir $@)
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 85fa74c0b8c..577fa677225 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-16  Andrew Haley  <aph@redhat.com>
+
+	* gnu/java/lang/management/MemoryMXBeanImpl.java,
+	javax/management/MBeanServerDelegate.java: Use
+	gnu.javax.management.ListenerData rather than
+	gnu.classpath.ListenerData.
+	* gnu/javax/management/ListenerData.java: Move here from
+	gnu/classpath/ListenerData.java.
+
 2007-02-14  Jakub Jelinek  <jakub@redhat.com>
 	Andrew Haley  <aph@redhat.com>
 
diff --git a/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java
index 8cb10420213..1e6c63afccf 100644
--- a/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java
+++ b/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 package gnu.java.lang.management;
 
-import gnu.classpath.ListenerData;
+import gnu.javax.management.ListenerData;
 
 import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryNotificationInfo;
diff --git a/libjava/classpath/gnu/classpath/ListenerData.java b/libjava/classpath/gnu/javax/management/ListenerData.java
similarity index 99%
rename from libjava/classpath/gnu/classpath/ListenerData.java
rename to libjava/classpath/gnu/javax/management/ListenerData.java
index 284fa02f192..719daa086c5 100644
--- a/libjava/classpath/gnu/classpath/ListenerData.java
+++ b/libjava/classpath/gnu/javax/management/ListenerData.java
@@ -35,7 +35,7 @@ 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.classpath;
+package gnu.javax.management;
 
 import javax.management.NotificationFilter;
 import javax.management.NotificationListener;
diff --git a/libjava/classpath/javax/management/MBeanServerDelegate.java b/libjava/classpath/javax/management/MBeanServerDelegate.java
index 347e51fc97c..9e9d19111a8 100644
--- a/libjava/classpath/javax/management/MBeanServerDelegate.java
+++ b/libjava/classpath/javax/management/MBeanServerDelegate.java
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 package javax.management;
 
-import gnu.classpath.ListenerData;
+import gnu.javax.management.ListenerData;
 import gnu.classpath.SystemProperties;
 
 import java.net.InetAddress;
diff --git a/libjava/classpath/lib/gnu/classpath/ListenerData.class b/libjava/classpath/lib/gnu/classpath/ListenerData.class
deleted file mode 100644
index 2ab92adf60d3f371637116de1ed2233ebc354a8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1197
zcmah{%Wl&^6g?9sZ62l%(iBKbX@SthNibEHAT}UYAv{`jfy82xPE!ZhZW9NwLOjHR
zPv8f-VgV8Xi3Nf!AB8yMI8iAj$kNQ2@jdsRd+z-F_4ONoHB=`N6Ueu`p51h1x4SQc
zUAyLV1LdjCZ5hZ(#06&B@~O04>9y>8jkanA0!cRt5?HP2-_Ptl>B*MbQ(j=#{lM9A
znlf;FZ<y`6z{HN@2C5@a7*DwqhLMomr>2H%J`p$_QjUty32!)_6WkP##qk+OBF2YB
zh5s&9+7gK0^0!qQ2BuA9Fe6|TOIs;Wnu!D^G@3IpiKIsJCQ?WXOxGMw)q8sl)!CE{
zSLsIlrgXPt$I<8LG9K(YU4g~gzbC<VGc6SiI}s=qOXIs4hLV{gbI=^;^*`RoeqHbW
zXaaK)@AwSVK~K6ApBv2JkKd(7X_|4_!~zyIx?<uymNY7wxPWDv=r`K*cAIZaAid%D
zI!#3ZG-`IJU%$hv`i)_QM1v34KulXs6w`)>JMHG4U_=Hc*Hb*X{2%8&XMMqxRqkWf
zs`Qbys(s`>hO9GO=g9)<jC{bMJ;W3?ki{m>^41#gaSnN&m?^9)LZmClLZoXOtjR8;
z$~Jc$m9Rcx_5(o-y3|B?`8Z6iMQXu=)IuA>8!h`NIeVPkI+08-Pax-xlMhZLui#=t
zeoLL&;Pvtkh<B)#zeC)ue8wf+#vv963xwH2%n+^;<_?jFzc=`iHfVB*GXb7+eZfh*
mWaF<`;5Duhui;H7VR=wy<m)<0^iVLqK+p5cBv1}BR(=B%%lB3Q

diff --git a/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class b/libjava/classpath/lib/gnu/java/lang/management/MemoryMXBeanImpl.class
index 714075ef1809c9512bf12dabbb2b0d4c788b9df1..9347297b37aa4a005d4a1ce26e48105878f75dfc 100644
GIT binary patch
delta 62
zcmZp*m~64(H;1TVdS0o1R$^IVg??^gUSfJ`Zfai1W=_t%EMm$&Smmzr8t?%C-0>F<

delta 48
rcmbPi(Q2{bHwT|odS0o1a!z7#aY159#%2M|y)67PKB$6^c@6jgxP%eG

diff --git a/libjava/classpath/lib/gnu/javax/management/ListenerData.class b/libjava/classpath/lib/gnu/javax/management/ListenerData.class
new file mode 100644
index 0000000000000000000000000000000000000000..aaebddd058da87dd8ebd1b9c9c4c991e68fdd420
GIT binary patch
literal 1211
zcmah{OK(y^7(K)Lacx1MYOA$au{_15ON|?iD@1J@7A7tRI>n2Zi-n7EWqibiKfyo1
z%7rGPi3_7!f0Xge<&jDW%}r*`%>B-HzVCeV=kJf70Jc#I!XuDw+Wm4%zK}1=ZE4G<
zYAf3*SInNHY}LIh9T|jAAf`jgmb9DY2lbX}I07MS93-$+Igz2-am+)rAsw@0PqN(<
z2ppQ0qq+i_#guz)7zv^0ve&E2#xsGlF6DR;I^iwTHl5o7GP^kAw1~xFW8srhxtf6Q
zPUk>H;Kj0mC}INMY_1jtOEcg{K%=CAAVM0g7ziUGuv{^1RqeOys=F`imeP%M8q%uC
zuBp%COP}-9><MgEP8|rljy9DuX-FWK%`I+f5=v&6%u$aV+iAS%6tv#M=^&D0-s~vU
zQD0i@AvGGsf4_5&BlP5|fi+yz=$e5`Sl1|P;4(JoWvAYv#Rq(H0+GE=zuQnOfPTd%
z_3P(&T|YIXN%Zm=d*RW}6M3}n?oQXa`xz01!SxJJ7XSOWC-dL2lrIbs&liVC<V!=O
zzPPM&Tvx~fs*HTZ+3jKpdq`j(=XskS@o@pGJTa52D_o?NJucGPUTU(-v2vNaj`HWf
zBL11c11%MBFQ2%nb&<N@QEH)$;f*f)I5{y(Zq6ms%Q@uKEcs|IIgKl0@(0$b4c;mI
zhWLn5;TOdH;x}ySHU?ND%n&99h!JiPrUvl)K6&|(HfnO6GXY+4ea%U{VdHNp@D4YK
exAERBVPhmS^>qh1dMFs5q35g2Bv5cO7XJY?RQ##{

literal 0
HcmV?d00001

diff --git a/libjava/classpath/lib/java/lang/Thread$State.class b/libjava/classpath/lib/java/lang/Thread$State.class
index 3ce018edd9c8b3d245b8578bcaff6d63be38e2de..e5ddca2eab821f912c4502fc617c9b0d33b73ab4 100644
GIT binary patch
delta 23
fcmcb`d5d$y2WHk441O%jCVyo%VO%y@i)8}<aX|>?

delta 23
fcmcb`d5d$y2WHl#41O$&Cx2x&VO%^}i)8}<aO4Qx

diff --git a/libjava/classpath/lib/java/lang/Thread.class b/libjava/classpath/lib/java/lang/Thread.class
index 8329bc1552397dbf899da826e2a5e7aacc7593b0..09315799f1e09e2cad34ab5932bb8a6a963be5d0 100644
GIT binary patch
delta 1913
zcmah}YfzMB6n>ul-j`jr<+ccNk*kWDT+}X#;G_kNjG(4aZkhE7AE3c5E}M4W6ipLL
z^TnW2yNr{SKQc*hV#=DDrm1Gi{L?*cy8Y>%Q$L#QES6w1O@F>~d(U&8bKduSXBYmt
z*!$L>FTM<5Cigz?J(;}1!)uA6wf1_uwA~K2mUh@dyVdD%f|1ht^J<OV6bXfI^D@Be
z-Mo%SiY1iA63VV>x4XK0T*(^<cS|U|*zRzM$!0-9Ugb!v!owRSqt%Htw1pkJxqii!
zjvb6)**>mj6OkgZDyOO44m-{DPNXf=Ow1R6)adnf|0+~5ZHy=Ew6r@-k+O3+6<#`Q
zb+d)Y7|puyjE`+xL&U8Kt`FTTG|Q)sfm^bAt)NwmscCj4XGguTc(ae~>>xbCbfhUF
zb?R6u|8yE663%y88*B;1a~-?f3=@f?r0PP!Rv#n0g-{KFrPVTmF+9#;#dAX}@z!|~
z9L=l^Mx0hB>;-wdkL8@}75qDWD91@FdiLyDuVh8Vq}R=jM6M}I&W(E6%`I+jCZ>-f
z{WF+a8AX#FSrZC2*kPeweQT4`88dynms<&ctep!Z#P|!EmwOFuuvfP`6>i=~Oc^cG
z80@;GGujynN1Wy*olbb9&iM*nZevf3tXt-=S{{XnH8L|oN5XcK+>hKSO2&-le@Rym
zW3OeT{*3>sFNf2{fS>1OYWyXtPms*3iPOyE{v19s@UnkD^>2vB@5UatK)Vr7k2yH5
zR*!?5Y39thMY>3QQ%rT*a(%h@W}AJYRf$$D+IZtjze2ab%T}{A{U&{nXd4HPrdKlB
z4TWQpdM^^V9e(y8i}xd!52BE}QOsV<W*;i~Fc$C;)bLR(;yzr>$FNFd8=piw51@-r
z;SL_eW<HJWd<J{@EDrDx4)Hl0=3yM=0EYPjUgJ@`$sxSMW2ln<z(UiRv4O9fZ!;<q
z-h<)^c=*0BIca8OI{d>tlvyRs`dl9KdFC8unT)JTPBM-1Ej7F4TW;RXTEaGympzLS
zvn;!cTTNf~LcJStE@QqFZNF%bnVA#rN_ZRE^$rqTC*XITG{X~C#(xgC>lBh*r%is&
z(v+XX`WZ>CUy$nh6&bEGW@AowjvH>vgGB2h_$?oDtRxgz$(UiKV4js~3UXUgCP7(~
z;jxO4W=%nsHP!Uz+9{WcceZ%vAlWLH$Xw&i3+M)DtI@RO-JttLd)T~{_jvp%OtMa6
zfpyAs<u|2#Cwbo^-ueLv)=z@=i}@yhxnH@Ulm(AcNKhJn6=&)SRx!sMDp;0MF0r{1
zt3bM{M3$Oo5(}$YYZ?k?vC(WTJW~4s-0DMk)kjDYnXW!Yw)zD5>QfY{&oE7$LWw$!
zS?UYS5qqBc5;f{8)TytrOnrlZ$Q#9OQ{S3R6PHGLpFBh@xA(*mmefsu11Zyo@nayB
zjYIf#5NA?(%`vV><tpnX1_pT(t(Ra8vbnx^kZV&J)Zz|UN7%VMppJ0;aye40<w(F9
z=DNVegS>5scSvlQ8wB*OA>J)VnirRhWH(yTbEqYMqs~>C>J{E|IEKFI6$~7&FFsyB
z%x!_<A#Oh|JkzlqJ?tKlz1)T#^dcr>{yq$h*fHtCRnpTnNCR{tlum+2CnH_wV}dR~
zkuF53&O@1wPQ)d85^D8iwCjoJkj-1Cr=VNp7CjX``eN+R#pu;#*rR8nPhWz5ec8x!
zUj|QXY^X+!NQHfP7KcETVI_B<SSWPJ>fJAzg)NBV1EMMHkfqqkT@u{`7kAE(-E^T}
ic6O(1s7qW%z+CL*9+7_09+Llae_XumEcxjC%)bDM!uGrX

delta 1269
zcma)6ZA_JA7{0FeeI5?ya1MuazylsQz=4B-NGKYh;1-4_2rz*%DMgNO_%JvmVy!hh
zHg%OhGWVqR!A32!Cbi)QRJygfwx+Gjt!1Ck%s#eiMh$=TM|wDH%pcAA^WN9}ab5R)
zKfCwdST|E+`}oG04*)FV&J(uJlcF|0z!nQP5{tHl9t{=uh9X_XeW6IGE8G{33>G)c
z!(ga=uz%ojJ0IjjgtIF=cwhHGIMmUwaZNZBA@cGI>i<>Z=CTSK$jx@H<SH{dGcyxS
zU>mnu7$W@tNw%|{9fV`Pb#0`xf41>GwYO|NTUKFXC-1hfi^#gEQFMO2;<+*BB*oU)
zO1b}IAwu-T#_->&I5q-dYwq7U&>jx<^oEH9-BGoqEEJCr1?pU4ff`Qni5-MTg`A#K
zms9ppPQ!}ps?Ad+1+0|nn5R~{V4+)0d+KDajs;Y8YO`FfV=L5<MpYWEQPZg#WIJr^
zQ1_;_$z2*fdFpgpC8N6`Fs5mH;Na76^BH)#ADMg(IXr+RJcu&BfJz=l6^|gu7g5KT
z(a0gRYTM0W^zt?A;OlsTN3oZ0U_Xyxh;QO3-@*vr#wg#x7)NoIC-5Op;yh2|6ON%;
zUtNvr_ddpR>KAW?<5LJ;L_9y!lU!28>0$n@4y9M?MeT-Elj-G5RjC=3^s9pz3sg_W
zZ7kHNlBKHAm#nU66jqtO5^mRiHTTA<MtsZV0mK>4tE;{m`HDtEYH8*!$9YKO0vyIg
zxQ$EdOy(x*cd!@}NHQi>R@QpgHSPTYr!j?O<4>d+f2rMBdwc>GQzFrfhugHmXWHR6
z9aw56Vzrs1va>r~eh4!M@n$X-m;rdrJar^H<XWbqD|GY@B$=f;Q>Lu`7TE}CHmNTE
zW_d`X!|H<nRqF%-<|L}j2{n+@?)p{peuLHg9S-xFR+~~k=QO*`83+Ny3w`;*fLoZV
zF1M9lbv(DpRjPAkI#&*lSP8FKr5u5^465cp37cXM^-^HC_6u0VW!S`*aBAxjUm;z5
zjcoA^7Kv|BASO^GCQ%~3N4fS_iz^6<A5br@qDlOS7Hzj^zgzsIp2}Mv#k2Z`^h78+
z$)ftgkKigii>a1m-v2J9$8r5VZfIDtc$}M(+4?@W2&^j_XLwW-4BVx^Uc>=10Ycgl
zFCFm6M0lkW`7$YXB#Y<7u@*sHEl_~t7y&genceKUUCZP{avL9p34^_}!t7&2Ten92
Q`VX@`&dLF82k%_?4;cSK;{X5v

diff --git a/libjava/classpath/lib/java/lang/management/VMManagementFactory.class b/libjava/classpath/lib/java/lang/management/VMManagementFactory.class
index 98185d22de3d711605bfe9a2b0c8c6af6ceaaa9a..7602cf7bacdb98f6416f1c68eec5822fd8bc4216 100644
GIT binary patch
delta 307
zcmdnPe3+H%)W2Q(7#J7~8Du7Mz0qN35M*Q!$Vx0r)Xz!GOV<xBDay=C=U@<KWMJ_~
zO)Ow!U@J;3F3l-nWDuVC*o~KiL6VVy-6=mcBiG$|vL<6;Jp%^=9|J!FP!wpY6$1;9
z#lXPBvX?<1l37S7*jsA@kk7=x1thtEGy{V*khWpq2B`w71&N6;hyr;W3}SF|Oo1{W
xbJ&@I=3pA(!NAJk2{9rLsE!rM3~{&_=x&j~;+7Dg{h?Ug!pI;6w4I4T8UQL)Bmn>b

delta 61
zcmX@ix`&zT)W2Q(7#J7~8AK*>y_syvXgs-;u~3PTgMp8MpMe2L3qWZ>5Y52IAOs|t
G7=!`Q`U%wl

diff --git a/libjava/classpath/lib/javax/management/MBeanServerDelegate.class b/libjava/classpath/lib/javax/management/MBeanServerDelegate.class
index 90130982041fc59a0ff18fa2e93ca0f8b4ba1a5b..c0c761938cb15f4ca7219cdc1f0b2ee11136cd6c 100644
GIT binary patch
delta 38
ncmX@0c1~?WH4Cd^dS0pi<k=jOn<ufHVr5hIf%8ka&Ts$#3&9Oi

delta 48
scmX@7c0g@IH4C3qdS0o1a!z7#aY159#^wnums$B`d{6}|xvp{m0KYjBQvd(}

diff --git a/libjava/gnu/classpath/ListenerData.h b/libjava/gnu/javax/management/ListenerData.h
similarity index 75%
rename from libjava/gnu/classpath/ListenerData.h
rename to libjava/gnu/javax/management/ListenerData.h
index 03be1ce5d87..ff1b8f0d4dd 100644
--- a/libjava/gnu/classpath/ListenerData.h
+++ b/libjava/gnu/javax/management/ListenerData.h
@@ -1,8 +1,8 @@
 
 // DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
 
-#ifndef __gnu_classpath_ListenerData__
-#define __gnu_classpath_ListenerData__
+#ifndef __gnu_javax_management_ListenerData__
+#define __gnu_javax_management_ListenerData__
 
 #pragma interface
 
@@ -11,9 +11,12 @@ extern "Java"
 {
   namespace gnu
   {
-    namespace classpath
+    namespace javax
     {
-        class ListenerData;
+      namespace management
+      {
+          class ListenerData;
+      }
     }
   }
   namespace javax
@@ -26,7 +29,7 @@ extern "Java"
   }
 }
 
-class gnu::classpath::ListenerData : public ::java::lang::Object
+class gnu::javax::management::ListenerData : public ::java::lang::Object
 {
 
 public:
@@ -43,4 +46,4 @@ public:
   static ::java::lang::Class class$;
 };
 
-#endif // __gnu_classpath_ListenerData__
+#endif // __gnu_javax_management_ListenerData__
diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java
index 7216512530d..84682f3fb83 100644
--- a/libjava/java/lang/Thread.java
+++ b/libjava/java/lang/Thread.java
@@ -50,6 +50,9 @@ import java.lang.management.ThreadMXBean;
 import java.util.HashMap;
 import java.util.Map;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
@@ -1291,9 +1294,43 @@ public class Thread implements Runnable
     SecurityManager sm = SecurityManager.current; // Be thread-safe.
     if (sm != null)
       sm.checkPermission(new RuntimePermission("getStackTrace"));
-    ThreadMXBean bean = ManagementFactory.getThreadMXBean();
-    ThreadInfo info = bean.getThreadInfo(getId(), Integer.MAX_VALUE);
-    return info.getStackTrace();
-  }
 
+    // Calling java.lang.management via reflection means that
+    // javax.management be overridden in the endorsed directory.
+
+    // This is the equivalent code:
+    //
+    //     ThreadMXBean bean = ManagementFactory.getThreadMXBean();
+    //     ThreadInfo info = bean.getThreadInfo(getId(), Integer.MAX_VALUE);
+    //     return info.getStackTrace();
+
+    try
+      {
+	try
+	  {
+	    Object bean 
+	      = (Class.forName("java.lang.management.ManagementFactory")
+		 .getDeclaredMethod("getThreadMXBean")
+		 .invoke(null));
+	    Object info = bean.getClass()
+	      .getDeclaredMethod("getThreadInfo", long.class, int.class)
+	      .invoke(bean, new Long(getId()), new Integer(Integer.MAX_VALUE));
+	    Object trace = info.getClass()
+	      .getDeclaredMethod("getStackTrace").invoke(info);
+	    return (StackTraceElement[])trace;
+	  }
+	catch (InvocationTargetException e)
+	  {
+	    throw (Exception)e.getTargetException();
+	  }
+      }
+    catch (UnsupportedOperationException e)
+      {
+	throw e;
+      }
+    catch (Exception e)
+      {
+	throw new UnsupportedOperationException(e);
+      }
+  }
 }
diff --git a/libjava/java/lang/management/VMManagementFactory.java b/libjava/java/lang/management/VMManagementFactory.java
index f10497014b4..35b15e360f1 100644
--- a/libjava/java/lang/management/VMManagementFactory.java
+++ b/libjava/java/lang/management/VMManagementFactory.java
@@ -1,5 +1,5 @@
 /* VMManagementFactory.java - VM interface for obtaining system beans.
-   Copyright (C) 2006 Free Software Foundation
+   Copyright (C) 2006, 2007 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -54,7 +54,11 @@ final class VMManagementFactory
    *
    * @return a list of memory pool names.
    */
-  static native String[] getMemoryPoolNames();
+  static String[] getMemoryPoolNames()
+  {
+    String[] result = {"Heap"};
+    return result;
+  }
 
   /**
    * Return a list of the names of the currently available
@@ -63,7 +67,11 @@ final class VMManagementFactory
    *
    * @return a list of memory manager names.
    */
-  static native String[] getMemoryManagerNames();
+  static String[] getMemoryManagerNames()
+  {
+    String[] result = {};
+    return result;
+  }
 
   /**
    * Return a list of the names of the currently available
@@ -71,5 +79,9 @@ final class VMManagementFactory
    *
    * @return a list of garbage collector names.
    */
-  static native String[] getGarbageCollectorNames();
+  static String[] getGarbageCollectorNames()
+  {
+    String[] result = {"BoehmGC"};
+    return result;
+  }
 }
diff --git a/libjava/java/lang/management/natVMManagementFactory.cc b/libjava/java/lang/management/natVMManagementFactory.cc
deleted file mode 100644
index 35a418bb338..00000000000
--- a/libjava/java/lang/management/natVMManagementFactory.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 2006  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
- 
-/**
- * @author Andrew John Hughes <gnu_andrew@member.fsf.org>
- * @date Tue 08 Aug 2006 */
-/* Implemented for our sole pool, the heap, and our sole memory
- * manager/garbage collector, Boehm GC.
- * Status:  Believed complete and correct.
- */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <java/lang/String.h>
-#include <java/lang/management/VMManagementFactory.h>
-
-JArray< ::java::lang::String *> *
-java::lang::management::VMManagementFactory::getMemoryPoolNames ()
-{
-  return (JArray<jstring>*)
-    JvNewObjectArray(1, &java::lang::String::class$, JvNewStringLatin1("Heap"));
-}
-
-
-JArray< ::java::lang::String *> *
-java::lang::management::VMManagementFactory::getMemoryManagerNames ()
-{
-  return (JArray<jstring>*)
-    JvNewObjectArray(0, &java::lang::String::class$, NULL);
-}
-
-
-JArray< ::java::lang::String *> *
-java::lang::management::VMManagementFactory::getGarbageCollectorNames ()
-{
-  return (JArray<jstring>*) 
-    JvNewObjectArray(1, &java::lang::String::class$, JvNewStringLatin1("BoehmGC"));
-}
diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl
index 5a60097d698..59a5915a5fe 100755
--- a/libjava/scripts/makemake.tcl
+++ b/libjava/scripts/makemake.tcl
@@ -22,6 +22,8 @@ proc verbose {text} {
 # * bc    objects in this package and all its sub-packages
 #         are to be compiled with the BC ABI.  It is an error
 #         for sub-packages to also appear in the map.
+# * bcheaders 
+#         as bc, but generate header files and compile with CNI.
 # * package
 #         objects in this package (and possibly sub-packages,
 #         if they do not appear in the map) will be compiled en masse
@@ -73,6 +75,10 @@ set package_map(javax/rmi) bc
 set package_map(org/omg) bc
 set package_map(gnu/CORBA) bc
 set package_map(gnu/javax/rmi) bc
+set package_map(gnu/java/lang/management) bcheaders
+set package_map(java/lang/management) bc
+set package_map(gnu/classpath/management) bc
+set package_map(gnu/javax/management) bc
 
 # parser/HTML_401F.class is really big, and there have been complaints
 # about this package requiring too much memory to build.  So, we
@@ -265,7 +271,11 @@ proc emit_bc_rule {package} {
     set omit "| grep -v $exclusion_map($package)"
   }
   puts  "\t@find \$(srcdir)/classpath/lib/$package -name '*.class'${omit} > $tname"
-  puts "\t\$(LTGCJCOMPILE) -fsource-filename=\$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o $loname @$tname"
+  puts -nonewline "\t\$(LTGCJCOMPILE) -fsource-filename=\$(here)/classpath/lib/classes "
+  if {$package_map($package) == "bc"} {
+    puts -nonewline "-fjni "
+  }
+  puts "-findirect-dispatch -fno-indirect-classes -c -o $loname @$tname"
   puts "\t@rm -f $tname"
   puts ""
 
@@ -461,6 +471,8 @@ foreach package [lsort [array names package_map]] {
 
   if {$package_map($package) == "bc"} {
     emit_bc_rule $package
+  } elseif {$package_map($package) == "bcheaders"} {
+    emit_bc_rule $package
   } elseif {$package_map($package) == "ordinary"} {
     emit_ordinary_rule $package
   } elseif {$package_map($package) == "package"} {
diff --git a/libjava/sources.am b/libjava/sources.am
index cce44e11198..ce077f4c700 100644
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -223,7 +223,6 @@ gnu/awt/xlib.list: $(gnu_awt_xlib_source_files)
 
 gnu_classpath_source_files = \
 gnu/classpath/Configuration.java \
-classpath/gnu/classpath/ListenerData.java \
 classpath/gnu/classpath/NotImplementedException.java \
 classpath/gnu/classpath/Pointer.java \
 classpath/gnu/classpath/Pointer32.java \
@@ -1125,12 +1124,10 @@ gnu/java/lang/management/VMThreadMXBeanImpl.java
 
 gnu_java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_management_source_files)))
 
-gnu/java/lang/management.list: $(gnu_java_lang_management_source_files)
-	@$(mkinstalldirs) $(dir $@)
-	echo $(srcdir)/classpath/lib/gnu/java/lang/management/*.class > gnu/java/lang/management.list
-
--include gnu/java/lang/management.deps
-
+gnu-java-lang-management.lo: $(gnu_java_lang_management_source_files)
+	@find $(srcdir)/classpath/lib/gnu/java/lang/management -name '*.class' > gnu-java-lang-management.list
+	$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -findirect-dispatch -fno-indirect-classes -c -o gnu-java-lang-management.lo @gnu-java-lang-management.list
+	@rm -f gnu-java-lang-management.list
 
 gnu_java_lang_reflect_source_files = \
 classpath/gnu/java/lang/reflect/ClassSignatureParser.java \
@@ -2879,16 +2876,13 @@ gnu/javax/imageio/png.list: $(gnu_javax_imageio_png_source_files)
 
 
 gnu_javax_management_source_files = \
+classpath/gnu/javax/management/ListenerData.java \
 classpath/gnu/javax/management/Server.java
 
-gnu_javax_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_management_source_files)))
-
-gnu/javax/management.list: $(gnu_javax_management_source_files)
-	@$(mkinstalldirs) $(dir $@)
-	echo $(srcdir)/classpath/lib/gnu/javax/management/*.class > gnu/javax/management.list
-
--include gnu/javax/management.deps
-
+gnu-javax-management.lo: $(gnu_javax_management_source_files)
+	@find $(srcdir)/classpath/lib/gnu/javax/management -name '*.class' > gnu-javax-management.list
+	$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-management.lo @gnu-javax-management.list
+	@rm -f gnu-javax-management.list
 
 gnu_javax_naming_giop_source_files = \
 classpath/gnu/javax/naming/giop/ContextContinuation.java \
@@ -4828,14 +4822,10 @@ classpath/java/lang/management/ThreadInfo.java \
 classpath/java/lang/management/ThreadMXBean.java \
 java/lang/management/VMManagementFactory.java
 
-java_lang_management_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_lang_management_source_files)))
-
-java/lang/management.list: $(java_lang_management_source_files)
-	@$(mkinstalldirs) $(dir $@)
-	echo $(srcdir)/classpath/lib/java/lang/management/*.class > java/lang/management.list
-
--include java/lang/management.deps
-
+java-lang-management.lo: $(java_lang_management_source_files)
+	@find $(srcdir)/classpath/lib/java/lang/management -name '*.class' > java-lang-management.list
+	$(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o java-lang-management.lo @java-lang-management.list
+	@rm -f java-lang-management.list
 
 java_lang_ref_source_files = \
 classpath/java/lang/ref/PhantomReference.java \
@@ -8464,7 +8454,6 @@ all_packages_source_files = \
   gnu/java/awt/print.list \
   gnu/java/io.list \
   gnu/java/lang.list \
-  gnu/java/lang/management.list \
   gnu/java/lang/reflect.list \
   gnu/java/locale.list \
   gnu/java/math.list \
@@ -8542,7 +8531,6 @@ all_packages_source_files = \
   gnu/javax/imageio/gif.list \
   gnu/javax/imageio/jpeg.list \
   gnu/javax/imageio/png.list \
-  gnu/javax/management.list \
   gnu/javax/naming/giop.list \
   gnu/javax/naming/ictxImpl/trans.list \
   gnu/javax/naming/jndi/url/corbaname.list \
@@ -8596,7 +8584,6 @@ all_packages_source_files = \
   java/lang.list \
   java/lang/annotation.list \
   java/lang/instrument.list \
-  java/lang/management.list \
   java/lang/ref.list \
   java/lang/reflect.list \
   java/math.list \
@@ -8795,7 +8782,6 @@ ordinary_header_files = \
   $(gnu_javax_imageio_gif_header_files) \
   $(gnu_javax_imageio_jpeg_header_files) \
   $(gnu_javax_imageio_png_header_files) \
-  $(gnu_javax_management_header_files) \
   $(gnu_javax_naming_giop_header_files) \
   $(gnu_javax_naming_ictxImpl_trans_header_files) \
   $(gnu_javax_naming_jndi_url_corbaname_header_files) \
@@ -8844,7 +8830,6 @@ ordinary_header_files = \
   $(java_lang_header_files) \
   $(java_lang_annotation_header_files) \
   $(java_lang_instrument_header_files) \
-  $(java_lang_management_header_files) \
   $(java_lang_ref_header_files) \
   $(java_lang_reflect_header_files) \
   $(java_math_header_files) \
@@ -8937,7 +8922,9 @@ bc_objects = \
   gnu-java-awt-peer-gtk.lo \
   gnu-java-awt-peer-swing.lo \
   gnu-java-beans.lo \
+  gnu-java-lang-management.lo \
   gnu-java-util-prefs-gconf.lo \
+  gnu-javax-management.lo \
   gnu-javax-rmi.lo \
   gnu-javax-sound-midi.lo \
   gnu-xml-aelfred2.lo \
@@ -8949,6 +8936,7 @@ bc_objects = \
   gnu-xml-util.lo \
   gnu-xml-validation.lo \
   gnu-xml-xpath.lo \
+  java-lang-management.lo \
   javax-imageio.lo \
   javax-rmi.lo \
   javax-xml.lo \