gcc/libjava/classpath/javax/management/StandardMBean.java
Matthias Klose cd6d4007aa re PR libgcj/37636 (java tools are unable to find resource files)
libjava/ChangeLog:

2008-10-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * sources.am, Makfile.in: Regenerate.

2008-10-17  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Fix bashisms.
	* configure: Regenerate.

2008-10-15  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Disable build of gjdoc, if configured without
	--with-antlr-jar or if no antlr.jar found.
	* configure: Regenerate.

2008-10-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/configure.ac,
	* classpath/m4/ac_prog_antlr.m4,
	* classpath/m4/ac_prog_java.m4,
	* classpath/tools/Makefile.am:
	Ported --regen-gjdoc-parser patch and
	cantlr support from GNU Classpath.

2008-10-06  Andrew Haley  <aph@redhat.com>

	* java/lang/Thread.java (Thread): Always create the ThreadLocalMap
	when creating a thread.
	(getThreadLocals) Don't lazily create the ThreadLocalMap.

2008-09-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/java/lang/ThreadLocalMap.java,
	* java/lang/ThreadLocalMap$Entry.h,
	* java/lang/ThreadLocalMap.h,
	* lib/java/lang/ThreadLocalMap.class,
	* lib/java/lang/ThreadLocalMap$Entry.class:
	Add the new files for the ThreadLocal patch.

2008-09-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/ChangeLog,
	* classpath/java/lang/InheritableThreadLocal.java,
	* classpath/java/lang/Thread.java,
	* classpath/java/lang/ThreadLocal.java:
	Merge Daniel Frampton's ThreadLocal patch.
	* gcj/javaprims.h: Updated.
	* java/lang/Thread.h: Regenerated.
	* java/lang/Thread.java:
	Replace WeakIdentityHashMap with ThreadLocalMap.
	(getThreadLocals()): Likewise.
	* java/lang/ThreadLocal.h: Regenerated.
	* java/lang/ThreadLocal.java:
	(computeNextHash()): New method.
	(ThreadLocal()): Initialise fastHash.
	(internalGet()): Updated to match Classpath's get().
	(internalSet(Object)): Likewise for set(Object).
	(internalRemove()): Likewise for remove().
	
2008-09-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* classpath/configure,
	* classpath/configure.ac:
	Resynchronise with Classpath's configure.
	* classpath/examples/Makefile.in:
	Add equivalent support for building as in
	tools/Makefile.in.
	* classpath/java/nio/Buffer.java,
	* classpath/java/nio/ByteBuffer.java,
	* classpath/java/nio/ByteBufferImpl.java,
	* classpath/java/nio/CharBuffer.java,
	* classpath/java/nio/CharBufferImpl.java,
	* classpath/java/nio/CharSequenceBuffer.java,
	* classpath/java/nio/CharViewBufferImpl.java,
	* classpath/java/nio/DirectByteBufferImpl.java,
	* classpath/java/nio/DoubleBuffer.java,
	* classpath/java/nio/DoubleBufferImpl.java,
	* classpath/java/nio/DoubleViewBufferImpl.java,
	* classpath/java/nio/FloatBuffer.java,
	* classpath/java/nio/FloatBufferImpl.java,
	* classpath/java/nio/FloatViewBufferImpl.java,
	* classpath/java/nio/IntBuffer.java,
	* classpath/java/nio/IntBufferImpl.java,
	* classpath/java/nio/IntViewBufferImpl.java,
	* classpath/java/nio/LongBuffer.java,
	* classpath/java/nio/LongBufferImpl.java,
	* classpath/java/nio/LongViewBufferImpl.java,
	* classpath/java/nio/MappedByteBuffer.java,
	* classpath/java/nio/MappedByteBufferImpl.java,
	* classpath/java/nio/ShortBuffer.java,
	* classpath/java/nio/ShortBufferImpl.java,
	* classpath/java/nio/ShortViewBufferImpl.java:
	Replace use of gnu.classpath.Pointer with gnu.gcj.RawData,
	and fix some formatting issues.
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
	* classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt:
	Regenerated (later version of antlr).
	* java/nio/Buffer.h: Regenerated.
	* java/nio/Buffer.java: Ported changes from Classpath.
	* java/nio/ByteBuffer.h,
	* java/nio/CharBuffer.h: Regenerated.
	* java/nio/DirectByteBufferImpl.java: Ported changes from
	Classpath.
	* java/nio/DoubleBuffer.h,
	* java/nio/FloatBuffer.h,
	* java/nio/IntBuffer.h,
	* java/nio/LongBuffer.h,
	* java/nio/MappedByteBuffer.h,
	* java/nio/MappedByteBufferImpl.h: Regenerated.
	* java/nio/MappedByteBufferImpl.java: Ported changes from
	Classpath.
	* java/nio/ShortBuffer.h: Regenerated.

2008-09-24  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Search for antlr.jar, if not configured.
	* configure: Regenerate.

2008-09-24  Matthias Klose  <doko@ubuntu.com>

	* Makefile.am: Build a gjdoc binary, if enabled.
	* configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file.
	* Makefile.in, */Makefile.in, configure: Regenerate.

2008-09-22  Andrew Haley  <aph@redhat.com>

	* java/lang/String.java (toString(char[], int, int)): New method.

2008-09-14  Matthias Klose  <doko@ubuntu.com>

	Import GNU Classpath (libgcj-import-20080914).

	* Regenerate class and header files.
	* Regenerate auto* files.
	* configure.ac: Don't pass --disable-gjdoc to classpath.
	* sources.am: Regenerated.
	* HACKING: Mention to build gjdoc in maintainer builds.
	* gnu/classpath/Configuration.java: Update classpath version.
	* gcj/javaprims.h: Update.

2008-09-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Makefile.am: Replace natStringBuffer.cc
	and natStringBuilder.cc with natAbstractStringBuffer.cc.
	* Makefile.in: Regenerated.
	* java/lang/AbstractStringBuffer.java:
	(append(int)): Made native.
	(regionMatches(int,String)): Likewise.
	* java/lang/StringBuffer.h: Regenerated.
	* java/lang/StringBuffer.java: Remerged with GNU Classpath.
	* java/lang/StringBuilder.h: Regenerated.
	* java/lang/StringBuilder.java: Remerged with GNU Classpath.
	* java/lang/natAbstractStringBuffer.cc: Provide common
	native methods for StringBuffer and StringBuilder.
	* java/lang/natStringBuffer.cc,
	* java/lang/natStringBuilder.cc: Removed.

2008-09-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* Makefile.in,
	* classpath/configure: Regenerated.
	* gnu/gcj/util/natDebug.cc,
	* gnu/gcj/xlib/natColormap.cc,
	* gnu/gcj/xlib/natDisplay.cc,
	* gnu/gcj/xlib/natDrawable.cc,
	* gnu/gcj/xlib/natFont.cc,
	* gnu/gcj/xlib/natWMSizeHints.cc,
	* gnu/gcj/xlib/natWindow.cc,
	* gnu/gcj/xlib/natXImage.cc:
	Add :: prefix to namespaces.
	* java/io/CharArrayWriter.h,
	* java/lang/StringBuffer.h:
	Regenerated using patched gjavah.
	* java/lang/natStringBuffer.cc:
	Fix naming of append(jint).
	* java/sql/Timestamp.h: Regenerated
	using patched gjavah.
	* jni.cc: Rename p to functions
	to match change in GNU Classpath.
	* scripts/makemake.tcl: Switch
	gnu.java.math to BC compilation.
	* sources.am: Regenerated.

2008-08-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
	* Makefile.in: Updated location of Configuration.java.
	* classpath/lib/gnu/java/locale/LocaleData.class: Regenerated.

2008-08-18  Andrew John Hughes  <gnu_andrew@member.fsf.org>
	
	* Makefile.in: Updated with new Java files.
	* classpath/configure: Regenerated.
	* classpath/tools/Makefile.am: Add missing
	use of GJDOC_EX so --disable-gjdoc works.
	* classpath/tools/Makefile.in: Regenerated.

2008-08-15  Matthias Klose  <doko@ubuntu.com>

	Import GNU Classpath (libgcj-import-20080811).

	* Regenerate class and header files.
	* Regenerate auto* files.
	* configure.ac: Don't pass --with-fastjar to classpath, substitute new
	dummy value in classpath/gnu/classpath/Configuration.java.in, pass
	--disable-gjdoc to classpath.
	* scripts/makemake.tcl:
	* sources.am: Regenerated.
	* java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java:
	New, copied from classpath, use System instead of VMSystem.
	* java/lang/StringBuffer.java: Merge from classpath.
	* java/lang/ClassLoader.java: Merge from classpath.
	* gcj/javaprims.h: Update class definitions,
	remove _Jv_jobjectRefType, jobjectRefType definitions.

libjava/classpath/ChangeLog.gcj:

2008-10-21  Matthias Klose  <doko@ubuntu.com>

        * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
        * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
        * Update .class files.
        
2008-10-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * tools/Makefile.am:
        Always generate parser in the srcdir.

2008-10-21  Matthias Klose  <doko@ubuntu.com>

        * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1.
        * doc/Makefile.in: Regenerate.

2008-10-20  Matthias Klose  <doko@ubuntu.com>

	* configure.ac: Don't check for working java, if not configured
        with --enable-java-maintainer-mode.
	* configure: Regenerate.

2008-10-19  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_java.m4: Revert previous change.
	* m4/ac_prog_javac.m4: Apply it here.
	* configure: Regenerate.

2008-10-19  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_javac.m4: Don't check for working javac, if not configured
	with --enable-java-maintainer-mode.
	* configure: Regenerate.
	* Makefile.in, */Makefile.in: Regenerate.

2008-09-30  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_antlr.m4: Check for cantlr binary as well.

2008-09-29  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_antlr.m4: Check for antlr binary as well.

2008-09-28  Matthias Klose  <doko@ubuntu.com>

	* PR libgcj/37636. Revert:
	2008-02-20  Matthias Klose  <doko@ubuntu.com>

	* tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change,
	Do copy resource files in JAVA_MAINTAINER_MODE only.
	* tools/Makefile.in: Regenerate.

2008-09-14  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4:
	Revert local changes.
	* m4/ac_prog_antlr.m4: Check for an runantlr binary.
	* tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER).
	* tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in
	GLIBJ_CLASSPATH.

2008-09-14  Matthias Klose  <doko@ubuntu.com>

	Revert:
	Daniel Frampton  <zyridium at zyridium.net>

	* AUTHORS: Added.
	* java/lang/InheritableThreadLocal.java,
	* java/lang/Thread.java,
	* java/lang/ThreadLocal.java:
	Modified to use java.lang.ThreadLocalMap.
	* java/lang/ThreadLocalMap.java:
	New cheaper ThreadLocal-specific WeakHashMap.

2008-08-15  Matthias Klose  <doko@ubuntu.com>

	* m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown
	args for javac.

libjava/classpath/ChangeLog:

2008-10-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * m4/ac_prog_antlr.m4:
        Remove redundant checks.
        * tools/Makefile.am:
        Use gjdoc_gendir when calling antlr.

2008-10-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>

        * configure.ac:
        Remove superfluous AC_PROG_JAVA call.

2008-10-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* m4/ac_prog_antlr:
	Check for cantlr as well.
	* tools/Makefile.am:
	Only build GJDoc parser when both
	CREATE_GJDOC and CREATE_GJDOC_PARSER
	are on.
	
2008-10-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* configure.ac:
	Add regen-gjdoc-parser option,
	and separate antlr tests.
	* m4/ac_prog_antlr.m4:
	Turn single test into AC_LIB_ANTLR
	and AC_PROG_ANTLR.
	* m4/ac_prog_java.m4:
	Quote tests.
	* tools/Makefile.am:
	Support CREATE_GJDOC_PARSER option.

2008-09-14  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* examples/Makefile.am:
        Check lib directly as well as glibj.zip
        for boot classes.
	* m4/acinclude.m4:
        Only require the class files to be built
        to allow the tools and examples to be built,
        not the installation of glibj.zip.
	* tools/Makefile.am:
	Check lib directly as well as glibj.zip
	for boot classes.

2008-09-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* examples/Makefile.am,
	* lib/Makefile.am:
	Add GCJ rules.
	* m4/ac_prog_javac.m4:
	Check whether JAVAC is gcj.
	* m4/ac_prog_javac_works.m4:
	Add GCJ rules.
	* m4/acinclude.m4:
	Don't bother checking for -J
	if using GCJ.
	* tools/Makefile.am:
	Add GCJ rules.

2007-08-23  Daniel Frampton  <zyridium@zyridium.net>

	* AUTHORS: Added.
	* java/lang/InheritableThreadLocal.java,
	* java/lang/Thread.java,
	* java/lang/ThreadLocal.java:
	Modified to use java.lang.ThreadLocalMap.
	* java/lang/ThreadLocalMap.java:
	New cheaper ThreadLocal-specific WeakHashMap.

2008-02-07  Ian Rogers  <ian.rogers@manchester.ac.uk>

	* java/util/zip/ZipEntry.java:
	Use byte fields instead of integer fields,
	store the time as well as the DOS time and
	don't retain a global Calendar instance.
	(setDOSTime(int)): Set KNOWN_DOSTIME instead
	of KNOWN_TIME, and unset KNOWN_TIME.
	(getDOSTime()): Compute DOS time from UNIX time
	only when needed.
	(clone()): Provide cloning via the ZipEntry constructor
	where possible.
	(setTime(long)): Don't compute DOS time at this point.
	(getCalendar()): Removed.
	
2008-09-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* tools/gnu/classpath/tools/getopt/Parser.java:
	(setHeader(String)): Make synchronized.
	(setFooter(String)): Likewise.
	* tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java,
	(reset()): Make synchronized.
	(name(Class)): Likewise.
	
2008-09-04  Robert Schuster  <robertschuster@fsfe.org>

	* gnu/java/nio/charset/ByteDecodeLoopHelper:
	(arrayDecodeLoop): Added new break label, escape to that label.
	* gnu/java/nio/charset/ByteEncodeLoopHelper:
	(arrayDecodeLoop): Added new break label, escape to that label.

2008-09-04  Robert Schuster  <robertschuster@fsfe.org>

	* java/text/DecimalFormat.java:
	(scanFix): Use 'i + 1' when looking at following character.
	(scanNegativePattern): Dito.

2008-09-02  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* tools/gnu/classpath/tools/javah/ClassWrapper.java:
	(makeVtable()): Populate methodNameMap.
	(printMethods(CniPrintStream)): Always use pre-populated
	methodNameMap for bridge targets.

2008-09-01  Mario Torre  <neugens@aicas.com>

	* gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override
	annotation to allow compilation on javac < 1.6 and ecj < 3.4.

2008-09-01  Mario Torre  <neugens@aicas.com>

	* gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support
	new Escher API.
	* gnu/java/awt/peer/x/XImage.java (getSource): method implemented.
	* gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer
	for getSource.
	 
2008-09-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/java/util/regex/BacktrackStack.java,
	* gnu/java/util/regex/CharIndexed.java,
	* gnu/java/util/regex/CharIndexedCharArray.java,
	* gnu/java/util/regex/CharIndexedCharSequence.java,
	* gnu/java/util/regex/CharIndexedInputStream.java,
	* gnu/java/util/regex/CharIndexedString.java,
	* gnu/java/util/regex/CharIndexedStringBuffer.java,
	* gnu/java/util/regex/RE.java,
	* gnu/java/util/regex/REException.java,
	* gnu/java/util/regex/REFilterInputStream.java,
	* gnu/java/util/regex/REMatch.java,
	* gnu/java/util/regex/REMatchEnumeration.java,
	* gnu/java/util/regex/RESyntax.java,
	* gnu/java/util/regex/REToken.java,
	* gnu/java/util/regex/RETokenAny.java,
	* gnu/java/util/regex/RETokenBackRef.java,
	* gnu/java/util/regex/RETokenChar.java,
	* gnu/java/util/regex/RETokenEnd.java,
	* gnu/java/util/regex/RETokenEndOfPreviousMatch.java,
	* gnu/java/util/regex/RETokenEndSub.java,
	* gnu/java/util/regex/RETokenIndependent.java,
	* gnu/java/util/regex/RETokenLookAhead.java,
	* gnu/java/util/regex/RETokenLookBehind.java,
	* gnu/java/util/regex/RETokenNamedProperty.java,
	* gnu/java/util/regex/RETokenOneOf.java,
	* gnu/java/util/regex/RETokenPOSIX.java,
	* gnu/java/util/regex/RETokenRange.java,
	* gnu/java/util/regex/RETokenRepeated.java,
	* gnu/java/util/regex/RETokenStart.java,
	* gnu/java/util/regex/RETokenWordBoundary.java,
	* gnu/java/util/regex/UncheckedRE.java:
	Fix indentation.

2008-09-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/java/util/regex/RETokenStart.java:
	(getMaximumLength()): Add Override annotation.
	(matchThis(CharIndexed, REMatch)): Likewise.
	(returnsFixedLengthMatches()): Renamed from
	returnsFixedLengthmatches and added Override
	annotation.
	(findFixedLengthMatches(CharIndexed,REMatch,int)):
	Add Override annotation.
	(dump(CPStringBuilder)): Likewise.
	* gnu/javax/print/ipp/IppRequest.java:
	(RequestWriter.writeOperationAttributes(AttributeSet)):
	Throw exception, don't just create and drop it.
	* javax/management/MBeanServerPermission.java:
	(MBeanServerPermissionCollection.add(Permission)): Compare
	against individual Strings not the entire array, and
	store the result of replace.
	* javax/swing/text/html/StyleSheet.java:
	(setBaseFontSize(size)): Store result of trim().

2008-09-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/tools/FileObject.java:
	(openReader(boolean)): Document new parameter.
	
2008-03-27  Michael Franz  <mvfranz@gmail.com>

	PR classpath/35690:
	* javax/tools/FileObject.java:
	(toUri()): Fix case from toURI.
	(openReader(boolean)): Add missing boolean argument.
	
2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/35487:
	* gnu/javax/management/Server.java:
	(beans): Change to ConcurrentHashMap.
	(defaultDomain): Make final.
	(outer): Likewise.
	(LazyListenersHolder): Added to wrap
	listeners, also now a ConcurrentHashMap,
	providing lazy initialisation safely.
	(sequenceNumber): Documented.
	(getBean(ObjectName)): Remove redundant cast.
	(addNotificationListener(ObjectName,NotificationListener,
	NotificationFilter,Object)): Remove map initialisation
	and use holder.
	(getObjectInstance(ObjectName)): Remove redundant cast.
	(registerMBean(Object,ObjectName)): Add bean atomically.
	(removeNotificationListener(ObjectName,NotificationListener)):
	Simplified.
	(removeNotificationListener(ObjectName,NotificationListener,
	NotificationFilter,Object)): Likewise.
	(notify(ObjectName,String)): Documented.
	
2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/javax/management/Server.java:
	Genericised.

2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/javax/management/Translator.java:
	Genericised.

2008-08-26  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/management/DefaultLoaderRepository.java,
	* javax/management/JMX.java,
	* javax/management/MBeanAttributeInfo.java,
	* javax/management/MBeanConstructorInfo.java,
	* javax/management/MBeanOperationInfo.java,
	* javax/management/MBeanServerDelegate.java:
	Fix warnings due to generics.

2008-08-25  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/management/MBeanPermission.java,
	* javax/management/MBeanServerDelegate.java,
	* javax/management/MBeanServerFactory.java,
	* javax/management/MBeanServerInvocationHandler.java,
	* javax/management/MBeanServerPermission.java:
	Fix warnings due to use of non-generic collections.

2008-08-25  Mario Torre  <neugens@aicas.com>

	* gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is
	null to avoid NPE.
	
2008-08-22  Mario Torre  <neugens@aicas.com>
 
	* gnu/CORBA/OrbFunctional.java (set_parameters): Fix
	NullPointerException checking when param is null. 

2008-08-23  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* java/util/regex/Matcher.java:
	(reset()): Reset append position so
	we don't try and append to the end of
	the old input.
	
2008-08-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/32028:
	* m4/acinclude.m4:
	Also allow versions of GJDoc from 0.8* on, as
	CVS is 0.8.0-pre.
	
2008-08-21  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/32028:
	* m4/acinclude.m4:
	(CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is
	being used.
	
2008-08-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* tools/Makefile.am:
	Add taglets subdirectory to list of excluded
	paths when GJDoc is not compiled.
	
2008-08-19  David P Grove  <groved@us.ibm.com>

	* scripts/check_jni_methods.sh.in:
	Fix build issue on AIX by splitting generation
	of method list.
	
2008-08-18  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* native/jni/gstreamer-peer/gst_native_pipeline.c:
	(get_free_space(int)): Use #else not #elif when
	there is no condition.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/31895:
	* java/text/DecimalFormat.java:
	(setCurrency(Currency)): Update prefixes and
	suffixes when currency changes.
	* java/text/DecimalFormatSymbols.java:
	(DecimalFormatSymbols(Locale)): Set locale earlier
	so it can be used by setCurrency(Currency).
	(setCurrency(Currency)): Set the symbol correctly using
	the locale of the instance.
	* java/util/Currency.java:
	Throw error instead of just printing a message.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* javax/activation/ActivationDataFlavor.java:
	Suppress warnings from public API.
	(mimeType): Made final.
	(representationClass): Added generic type and
	made final.
	(normalizeMimeTypeParameter(String,String)):
	Use CPStringBuilder.
	* javax/activation/CommandInfo.java:
	(verb): Made final.
	(className): Made final.
	* javax/activation/DataHandler.java:
	(dataSource): Made final.
	* javax/activation/FileDataSource.java:
	(file): Made final.
	* javax/activation/MailcapCommandMap.java:
	Use generics on collections and CPStringBuilder
	instead of StringBuffer.
	* javax/activation/MimeType.java:
	(toString()): Use CPStringBuilder.
	(getBaseType()): Likewise.
	* javax/activation/MimeTypeParameterList.java:
	Use generics on collections and CPStringBuilder
	instead of StringBuffer.
	* javax/activation/MimeTypeParseException.java:
	(MimeTypeParseException(String,String)): Use
	CPStringBuilder.
	* javax/activation/MimetypesFileTypeMap.java:
	Use generics on collections and CPStringBuilder
	instead of StringBuffer.	
	* javax/activation/URLDataSource.java:
	(url): Made final.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/javax/activation/viewers/ImageViewer.java,
	* gnu/javax/activation/viewers/TextEditor.java,
	* gnu/javax/activation/viewers/TextViewer.java,
	* javax/activation/ActivationDataFlavor.java,
	* javax/activation/CommandInfo.java,
	* javax/activation/CommandMap.java,
	* javax/activation/CommandObject.java,
	* javax/activation/DataContentHandler.java,
	* javax/activation/DataContentHandlerFactory.java,
	* javax/activation/DataHandler.java,
	* javax/activation/DataHandlerDataSource.java,
	* javax/activation/DataSource.java,
	* javax/activation/DataSourceDataContentHandler.java,
	* javax/activation/FileDataSource.java,
	* javax/activation/FileTypeMap.java,
	* javax/activation/MailcapCommandMap.java,
	* javax/activation/MimeType.java,
	* javax/activation/MimeTypeParameterList.java,
	* javax/activation/MimeTypeParseException.java,
	* javax/activation/MimetypesFileTypeMap.java,
	* javax/activation/ObjectDataContentHandler.java,
	* javax/activation/URLDataSource.java,
	* javax/activation/UnsupportedDataTypeException.java,
	* javax/activation/package.html,
	* resource/META-INF/mailcap.default,
	* resource/META-INF/mimetypes.default:
	Import GNU JAF CVS as of 17/08/2008.

2006-04-25  Archit Shah  <ashah@redhat.com>

	* javax/activation/MimeTypeParameterList.java:
	Insert ';' separator before parameter list.

2005-06-29  Xavier Poinsard  <xpoinsard@openpricer.com>

	* javax/activation/ObjectDataContentHandler.java:
	Fixed typo.

2005-05-28  Chris Burdess  <dog@bluezoo.org>

	* javax/activation/CommandMap.java, 
	* javax/activation/MailcapCommandMap.java:
	Updated to JAF 1.1.

2004-06-09  Chris Burdess  <dog@bluezoo.org>

	* javax/activation/MailcapCommandMap.java:
	Fixed bug whereby x-java prefix was not
	attempted.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* AUTHORS: Added Laszlo.

2008-04-20  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	PR classpath/30436:
	* java/util/Scanner.java:
	Fix package to be java.util and correct
	indentation.

2007-07-25  Laszlo Andras Hernadi  <e0327023@student.tuwien.ac.at>

	PR classpath/30436:
	* java/util/Scanner.java:
	Initial implementation.

2008-08-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* java/util/regex/Matcher.java:
	(toMatchResult()): Implemented.
	
2008-08-13  Joshua Sumali  <jsumali@redhat.com>

	* doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo
	instead of invoke.texi. Remove invoke.texi from EXTRA_DIST.
	* doc/invoke.texi: Removed and merged into ...
	* doc/cp-tools.texinfo: Here

2008-08-12  Robert Schuster  <robertschuster@fsfe.org>

	* native/jni/java-net/local.c
	(local_bind): Removed fprintf call, fixed access outside
	of array bounds.

From-SVN: r141271
2008-10-21 17:55:01 +00:00

1084 lines
36 KiB
Java

/* StandardMBean.java -- A standard reflection-based management bean.
Copyright (C) 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
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 javax.management;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
/**
* Provides a dynamic management bean by using reflection on an
* interface and an implementing class. By default, a bean instance
* is paired up with its interface based on specific naming
* conventions (if the implementation is called X, the interface must
* be XMBean). Using this class removes the need to use a specific
* naming system to match up the two. Instead, an instance of this
* bean is created either via explicit construction or subclassing,
* and this provides access to the attributes, constructors and
* operations of the implementation via reflection. Various hooks are
* provided in order to allow customization of this process.
*
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
* @since 1.5
*/
public class StandardMBean
implements DynamicMBean
{
/**
* The interface for this bean.
*/
private Class<?> iface;
/**
* The implementation of the interface.
*/
private Object impl;
/**
* Cached bean information.
*/
private MBeanInfo info;
/**
* Constructs a new {@link StandardMBean} using the specified
* interface and <code>this</code> as the instance. This should
* be used to create an instance via subclassing.
*
* @param iface the interface this bean implements, or <code>null</code>
* if the interface should be determined using the naming
* convention (class X has interface XMBean).
* @throws NotCompliantMBeanException if this class doesn't implement
* the interface or a method appears
* in the interface that doesn't comply
* with the naming conventions.
*/
protected StandardMBean(Class<?> iface)
throws NotCompliantMBeanException
{
if (iface == null)
{
String className = getClass().getName();
try
{
iface = Class.forName(className + "MBean");
}
catch (ClassNotFoundException e)
{
for (Class<?> nextIface : getClass().getInterfaces())
{
if (JMX.isMXBeanInterface(nextIface))
{
iface = nextIface;
break;
}
}
if (iface == null)
throw (NotCompliantMBeanException)
(new NotCompliantMBeanException("An interface for the class "
+ className +
" was not found.").initCause(e));
}
}
if (!(iface.isInstance(this)))
throw new NotCompliantMBeanException("The instance, " + impl +
", is not an instance of " + iface);
impl = this;
this.iface = iface;
}
/**
* Constructs a new {@link StandardMBean} using the specified
* interface and the supplied instance as the implementation.
*
* @param impl the implementation.
* @param iface the interface the bean implements, or <code>null</code>
* if the interface should be determined using the naming
* convention (class X has interface XMBean).
* @throws IllegalArgumentException if <code>impl</code> is <code>null</code>.
* @throws NotCompliantMBeanException if <code>impl</code> doesn't implement
* the interface or a method appears
* in the interface that doesn't comply
* with the naming conventions.
*/
public <T> StandardMBean(T impl, Class<T> iface)
throws NotCompliantMBeanException
{
if (impl == null)
throw new IllegalArgumentException("The specified implementation is null.");
if (iface == null)
{
Class<?> implClass = impl.getClass();
String className = implClass.getName();
try
{
this.iface = Class.forName(className + "MBean", true,
implClass.getClassLoader());
}
catch (ClassNotFoundException e)
{
for (Class<?> nextIface : implClass.getInterfaces())
{
if (JMX.isMXBeanInterface(nextIface))
{
this.iface = nextIface;
break;
}
}
if (this.iface == null)
throw (NotCompliantMBeanException)
(new NotCompliantMBeanException("An interface for the class " +
className +
" was not found.").initCause(e));
}
}
else
this.iface = iface;
if (!(this.iface.isInstance(impl)))
throw new NotCompliantMBeanException("The instance, " + impl +
", is not an instance of " + iface);
this.impl = impl;
}
/**
* Caches the {@link MBeanInfo} instance for this object. This is a
* customization hook, so that subclasses can choose the caching policy
* used. The default implementation caches the value in the instance
* itself. Subclasses may override this so as to not cache the data
* at all, or so as to use a cache shared between multiple beans.
*
* @param info the {@link MBeanInfo} instance to cache, or <code>null</code>
* if there is no new value to cache. When the value is not
* <code>null</code>, the cache should replace the current value
* with the value supplied here.
* @see #getCachedMBeanInfo()
*/
protected void cacheMBeanInfo(MBeanInfo info)
{
if (info != null)
this.info = info;
}
/**
* Obtains the value of the specified attribute of the
* management bean. The management bean should perform
* a lookup for the named attribute, and return its value
* by calling the appropriate getter method, if possible.
*
* @param name the name of the attribute to retrieve.
* @return the value of the specified attribute.
* @throws AttributeNotFoundException if the name does not
* correspond to an attribute
* of the bean.
* @throws MBeanException if retrieving the attribute causes
* the bean to throw an exception (which
* becomes the cause of this exception).
* @throws ReflectionException if an exception occurred in trying
* to use the reflection interface
* to lookup the attribute. The
* thrown exception is the cause of
* this exception.
* @see #setAttribute(String)
*/
public Object getAttribute(String name)
throws AttributeNotFoundException, MBeanException,
ReflectionException
{
Method getter;
try
{
getter = iface.getMethod("get" + name);
}
catch (NoSuchMethodException e)
{
try
{
getter = iface.getMethod("is" + name);
}
catch (NoSuchMethodException ex)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(ex));
}
}
Object result;
try
{
result = getter.invoke(impl);
}
catch (IllegalAccessException e)
{
throw new ReflectionException(e, "Failed to retrieve " + name);
}
catch (IllegalArgumentException e)
{
throw new ReflectionException(e, "Failed to retrieve " + name);
}
catch (InvocationTargetException e)
{
throw new MBeanException((Exception) e.getCause(),
"The getter of " + name +
" threw an exception");
}
return result;
}
/**
* Obtains the values of each of the specified attributes
* of the management bean. The returned list includes
* those attributes that were retrieved and their
* corresponding values.
*
* @param names the names of the attributes to retrieve.
* @return a list of the retrieved attributes.
* @see #setAttributes(AttributeList)
*/
public AttributeList getAttributes(String[] names)
{
AttributeList list = new AttributeList(names.length);
for (int a = 0; a < names.length; ++a)
{
try
{
Object value = getAttribute(names[a]);
list.add(new Attribute(names[a], value));
}
catch (AttributeNotFoundException e)
{
/* Ignored */
}
catch (ReflectionException e)
{
/* Ignored */
}
catch (MBeanException e)
{
/* Ignored */
}
}
return list;
}
/**
* Returns the cached {@link MBeanInfo} instance for this object. This is a
* customization hook, so that subclasses can choose the caching policy
* used. The default implementation caches the value in the instance
* itself, and returns this value on calls to this method.
*
* @return the cached {@link MBeanInfo} instance, or <code>null</code>
* if no value is cached.
* @see #cacheMBeanInfo(javax.management.MBeanInfo)
*/
protected MBeanInfo getCachedMBeanInfo()
{
return info;
}
/**
* Returns the class name that will be used in the {@link MBeanInfo}
* instance. This is a customization hook, so that subclasses can
* provide a custom class name. By default, this returns the class
* name from the supplied {@link MBeanInfo} instance.
*
* @param info the {@link MBeanInfo} instance constructed via
* reflection.
* @return the class name to use in the instance.
*/
protected String getClassName(MBeanInfo info)
{
return info.getClassName();
}
/**
* Returns information on the constructors that will be used in
* the {@link MBeanInfo} instance. This is a customization hook,
* so that subclasses can provide their own information on the
* bean's constructors, if necessary. By default, this method
* returns <code>null</code> unless the implementation supplied
* is either <code>null</code> or <code>this</code>. This default
* implementation prevents the use of
* {@link MBeanServer#createMBean} in cases where the bean is
* not created as a subclass of {@link StandardMBean}.
*
* @param constructors the constructor information created via
* reflection.
* @param impl the implementation, or <code>null</code> if this
* should be ignored.
* @return the constructor information to use.
*/
protected MBeanConstructorInfo[] getConstructors(MBeanConstructorInfo[]
constructors, Object impl)
{
if (impl == null || impl == this)
return constructors;
return null;
}
/**
* Returns the description of the attribute that will be used in
* the supplied {@link MBeanAttributeInfo} instance. This is a
* customization hook, so that subclasses can provide a custom
* description. By default, this calls
* {@link #getDescription(MBeanFeatureInfo)} with the supplied
* {@link MBeanAttributeInfo} instance.
*
* @param info the {@link MBeanAttributeInfo} instance constructed
* via reflection.
* @return the description to use in the instance.
*/
protected String getDescription(MBeanAttributeInfo info)
{
return getDescription((MBeanFeatureInfo) info);
}
/**
* Returns the description of the constructor that will be used in
* the supplied {@link MBeanConstructorInfo} instance. This is a
* customization hook, so that subclasses can provide a custom
* description. By default, this calls
* {@link #getDescription(MBeanFeatureInfo)} with the supplied
* {@link MBeanConstructorInfo} instance.
*
* @param info the {@link MBeanConstructorInfo} instance constructed
* via reflection.
* @return the description to use in the instance.
*/
protected String getDescription(MBeanConstructorInfo info)
{
return getDescription((MBeanFeatureInfo) info);
}
/**
* Returns the description of the nth parameter of the constructor
* that will be used in the supplied {@link MBeanParameterInfo}
* instance. This is a customization hook, so that subclasses
* can provide a custom description. By default, this calls
* <code>param.getDescription()</code>.
*
* @param info the {@link MBeanConstructorInfo} instance constructed
* via reflection.
* @param param the {@link MBeanParameterInfo} instance constructed
* via reflection.
* @param n the number of the parameter, in order to link it to the
* information on the constructor.
* @return the description to use in the instance.
*/
protected String getDescription(MBeanConstructorInfo info,
MBeanParameterInfo param, int n)
{
return param.getDescription();
}
/**
* Returns the description of the supplied feature that
* will be used in the supplied {@link MBeanFeatureInfo}
* instance. This is a customization hook, so that subclasses
* can provide a custom description. By default, this calls
* <code>info.getDescription()</code>. This method is also called
* by default for the more specific description methods for attributes,
* constructors and operations.
*
* @param info the {@link MBeanFeatureInfo} instance constructed
* via reflection.
* @return the description to use in the instance.
*/
protected String getDescription(MBeanFeatureInfo info)
{
return info.getDescription();
}
/**
* Returns the description of the bean that will be used in the
* supplied {@link MBeanInfo} instance. This is a customization
* hook, so that subclasses can provide a custom description. By
* default, this calls <code>info.getDescription()</code>.
*
* @param info the {@link MBeanInfo} instance constructed
* via reflection.
* @return the description to use in the instance.
*/
protected String getDescription(MBeanInfo info)
{
return info.getDescription();
}
/**
* Returns the description of the operation that will be used in
* the supplied {@link MBeanOperationInfo} instance. This is a
* customization hook, so that subclasses can provide a custom
* description. By default, this calls
* {@link #getDescription(MBeanFeatureInfo)} with the supplied
* {@link MBeanOperationInfo} instance.
*
* @param info the {@link MBeanOperationInfo} instance constructed
* via reflection.
* @return the description to use in the instance.
*/
protected String getDescription(MBeanOperationInfo info)
{
return getDescription((MBeanFeatureInfo) info);
}
/**
* Returns the description of the nth parameter of the operation
* that will be used in the supplied {@link MBeanParameterInfo}
* instance. This is a customization hook, so that subclasses
* can provide a custom description. By default, this calls
* <code>param.getDescription()</code>.
*
* @param info the {@link MBeanOperationInfo} instance constructed
* via reflection.
* @param param the {@link MBeanParameterInfo} instance constructed
* via reflection.
* @param n the number of the parameter, in order to link it to the
* information on the operation.
* @return the description to use in the instance.
*/
protected String getDescription(MBeanOperationInfo info,
MBeanParameterInfo param, int n)
{
return param.getDescription();
}
/**
* Returns the impact of the operation that will be used in the
* supplied {@link MBeanOperationInfo} instance. This is a
* customization hook, so that subclasses can provide a custom
* impact flag. By default, this returns
* <code>info.getImpact()</code>.
*
* @param info the {@link MBeanOperationInfo} instance constructed
* via reflection.
* @return the impact flag to use in the instance.
*/
protected int getImpact(MBeanOperationInfo info)
{
return info.getImpact();
}
/**
* Returns the instance that implements this bean.
*
* @return the implementation.
*/
public Object getImplementation()
{
return impl;
}
/**
* Returns the class of the instance that implements this bean.
*
* @return the implementation class.
*/
public Class<?> getImplementationClass()
{
return impl.getClass();
}
/**
* <p>
* Returns an information object which lists the attributes
* and actions associated with the management bean. This
* implementation proceeds as follows:
* </p>
* <ol>
* <li>{@link #getCachedMBeanInfo()} is called to obtain
* the cached instance. If this returns a non-null value,
* this value is returned.</li>
* <li>If there is no cached value, then the method proceeds
* to create one. During this process, the customization hooks
* detailed in this class are called to allow the values used
* to be overrided:
* <ul>
* <li>For each attribute,
* {@link #getDescription(MBeanAttributeInfo)} is called.</li>
* <li>For each constructor,
* {@link #getDescription(MBeanConstructorInfo)} is called,
* along with {@link #getDescription(MBeanConstructorInfo,
* MBeanParameterInfo, int)} and
* {@link #getParameterName(MBeanConstructorInfo,
* MBeanParameterInfo, int)} for each parameter.</li>
* <li>The constructors may be replaced as a whole by
* a call to
* {@link #getConstructors(MBeanConstructorInfo[], Object)}.</li>
* <li>For each operation,
* {@link #getDescription(MBeanOperationInfo)} and
* {@link #getImpact(MBeanOperationInfo)} are called,
* along with {@link #getDescription(MBeanOperationInfo,
* MBeanParameterInfo, int)} and
* {@link #getParameterName(MBeanOperationInfo,
* MBeanParameterInfo, int)} for each parameter.</li>
* <li>{@link #getClassName(MBeanInfo)} and
* {@link #getDescription(MBeanInfo)} are called to customise
* the basic information about the class.</li>
* </ul>
* </li>
* <li>Finally, {@link #cacheMBeanInfo(MBeanInfo)} is called
* with the created instance before it is returned.</li>
* </ol>
*
* @return a description of the management bean, including
* all exposed attributes and actions.
*/
public MBeanInfo getMBeanInfo()
{
MBeanInfo info = getCachedMBeanInfo();
if (info != null)
return info;
Method[] methods = iface.getMethods();
Map<String,Method[]> attributes = new HashMap<String,Method[]>();
List<MBeanOperationInfo> operations = new ArrayList<MBeanOperationInfo>();
for (int a = 0; a < methods.length; ++a)
{
String name = methods[a].getName();
if (((name.startsWith("get") &&
methods[a].getReturnType() != Void.TYPE) ||
(name.startsWith("is") &&
methods[a].getReturnType() == Boolean.TYPE)) &&
methods[a].getParameterTypes().length == 0)
{
Method[] amethods;
String attrib;
if (name.startsWith("is"))
attrib = name.substring(2);
else
attrib = name.substring(3);
if (attributes.containsKey(attrib))
amethods = (Method[]) attributes.get(attrib);
else
{
amethods = new Method[2];
attributes.put(attrib, amethods);
}
amethods[0] = methods[a];
}
else if (name.startsWith("set") &&
methods[a].getReturnType() == Void.TYPE &&
methods[a].getParameterTypes().length == 1)
{
Method[] amethods;
String attrib = name.substring(3);
if (attributes.containsKey(attrib))
amethods = (Method[]) attributes.get(attrib);
else
{
amethods = new Method[2];
attributes.put(attrib, amethods);
}
amethods[1] = methods[a];
}
else
operations.add(new MBeanOperationInfo(methods[a].getName(),
methods[a]));
}
List<MBeanAttributeInfo> attribs = new ArrayList<MBeanAttributeInfo>(attributes.size());
for (Map.Entry<String,Method[]> entry : attributes.entrySet())
{
Method[] amethods = entry.getValue();
try
{
attribs.add(new MBeanAttributeInfo(entry.getKey(),
entry.getKey(),
amethods[0], amethods[1]));
}
catch (IntrospectionException e)
{
/* Shouldn't happen; both shouldn't be null */
throw new IllegalStateException("The two methods passed to " +
"the MBeanAttributeInfo " +
"constructor for " + entry +
"were null.", e);
}
}
MBeanAttributeInfo[] ainfo = new MBeanAttributeInfo[attribs.size()];
for (int a = 0; a < ainfo.length; ++a)
{
MBeanAttributeInfo oldInfo = (MBeanAttributeInfo) attribs.get(a);
String desc = getDescription(oldInfo);
ainfo[a] = new MBeanAttributeInfo(oldInfo.getName(),
oldInfo.getType(), desc,
oldInfo.isReadable(),
oldInfo.isWritable(),
oldInfo.isIs());
}
Constructor<?>[] cons = impl.getClass().getConstructors();
MBeanConstructorInfo[] cinfo = new MBeanConstructorInfo[cons.length];
for (int a = 0; a < cinfo.length; ++a)
{
MBeanConstructorInfo oldInfo = new MBeanConstructorInfo(cons[a].getName(),
cons[a]);
String desc = getDescription(oldInfo);
MBeanParameterInfo[] params = oldInfo.getSignature();
MBeanParameterInfo[] pinfo = new MBeanParameterInfo[params.length];
for (int b = 0; b < pinfo.length; ++b)
{
String pdesc = getDescription(oldInfo, params[b], b);
String pname = getParameterName(oldInfo, params[b], b);
pinfo[b] = new MBeanParameterInfo(pname, params[b].getType(),
pdesc);
}
cinfo[a] = new MBeanConstructorInfo(oldInfo.getName(), desc,
pinfo);
}
cinfo = getConstructors(cinfo, impl);
MBeanOperationInfo[] oinfo = new MBeanOperationInfo[operations.size()];
for (int a = 0; a < oinfo.length; ++a)
{
MBeanOperationInfo oldInfo = (MBeanOperationInfo) operations.get(a);
String desc = getDescription(oldInfo);
int impact = getImpact(oldInfo);
MBeanParameterInfo[] params = oldInfo.getSignature();
MBeanParameterInfo[] pinfo = new MBeanParameterInfo[params.length];
for (int b = 0; b < pinfo.length; ++b)
{
String pdesc = getDescription(oldInfo, params[b], b);
String pname = getParameterName(oldInfo, params[b], b);
pinfo[b] = new MBeanParameterInfo(pname, params[b].getType(),
pdesc);
}
oinfo[a] = new MBeanOperationInfo(oldInfo.getName(), desc, pinfo,
oldInfo.getReturnType(), impact);
}
info = new MBeanInfo(impl.getClass().getName(), impl.getClass().getName(),
ainfo, cinfo, oinfo, null);
String cname = getClassName(info);
String desc = getDescription(info);
MBeanNotificationInfo[] ninfo = null;
if (impl instanceof NotificationBroadcaster)
ninfo = ((NotificationBroadcaster) impl).getNotificationInfo();
info = new MBeanInfo(cname, desc, ainfo, cinfo, oinfo, ninfo);
cacheMBeanInfo(info);
return info;
}
/**
* Returns the interface for this management bean.
*
* @return the management interface.
*/
public final Class<?> getMBeanInterface()
{
return iface;
}
/**
* Returns the name of the nth parameter of the constructor
* that will be used in the supplied {@link MBeanParameterInfo}
* instance. This is a customization hook, so that subclasses
* can provide a custom name. By default, this calls
* <code>param.getName()</code>.
*
* @param info the {@link MBeanConstructorInfo} instance constructed
* via reflection.
* @param param the {@link MBeanParameterInfo} instance constructed
* via reflection.
* @param n the number of the parameter, in order to link it to the
* information on the constructor.
* @return the name to use in the instance.
*/
protected String getParameterName(MBeanConstructorInfo info,
MBeanParameterInfo param, int n)
{
return param.getName();
}
/**
* Returns the name of the nth parameter of the operation
* that will be used in the supplied {@link MBeanParameterInfo}
* instance. This is a customization hook, so that subclasses
* can provide a custom name. By default, this calls
* <code>param.getName()</code>.
*
* @param info the {@link MBeanOperationInfo} instance constructed
* via reflection.
* @param param the {@link MBeanParameterInfo} instance constructed
* via reflection.
* @param n the number of the parameter, in order to link it to the
* information on the operation.
* @return the name to use in the instance.
*/
protected String getParameterName(MBeanOperationInfo info,
MBeanParameterInfo param, int n)
{
return param.getName();
}
/**
* Invokes the specified action on the management bean using
* the supplied parameters. The signature of the action is
* specified by a {@link String} array, which lists the classes
* corresponding to each parameter. The class loader used to
* load these classes is the same as that used for loading the
* management bean itself.
*
* @param name the name of the action to invoke.
* @param params the parameters used to call the action.
* @param signature the signature of the action.
* @return the return value of the action.
* @throws MBeanException if the action throws an exception. The
* thrown exception is the cause of this
* exception.
* @throws ReflectionException if an exception occurred in trying
* to use the reflection interface
* to invoke the action. The
* thrown exception is the cause of
* this exception.
*/
public Object invoke(String name, Object[] params, String[] signature)
throws MBeanException, ReflectionException
{
if (name.startsWith("get") || name.startsWith("is") ||
name.startsWith("set"))
throw new ReflectionException(new NoSuchMethodException(),
"Invocation of an attribute " +
"method is disallowed.");
ClassLoader loader = getClass().getClassLoader();
Class<?>[] sigTypes;
if (signature != null)
{
sigTypes = new Class<?>[signature.length];
for (int a = 0; a < signature.length; ++a)
try
{
sigTypes[a] = Class.forName(signature[a], true, loader);
}
catch (ClassNotFoundException e)
{
throw new ReflectionException(e, "The class, " + signature[a] +
", in the method signature " +
"could not be loaded.");
}
}
else
sigTypes = null;
Method method;
try
{
method = iface.getMethod(name, sigTypes);
}
catch (NoSuchMethodException e)
{
throw new ReflectionException(e, "The method, " + name +
", could not be found.");
}
Object result;
try
{
result = method.invoke(impl, params);
}
catch (IllegalAccessException e)
{
throw new ReflectionException(e, "Failed to call " + name);
}
catch (IllegalArgumentException e)
{
throw new ReflectionException(e, "Failed to call " + name);
}
catch (InvocationTargetException e)
{
throw new MBeanException((Exception) e.getCause(), "The method "
+ name + " threw an exception");
}
return result;
}
/**
* Sets the value of the specified attribute of the
* management bean. The management bean should perform
* a lookup for the named attribute, and sets its value
* using the associated setter method, if possible.
*
* @param attribute the attribute to set.
* @throws AttributeNotFoundException if the attribute does not
* correspond to an attribute
* of the bean.
* @throws InvalidAttributeValueException if the value is invalid
* for this particular
* attribute of the bean.
* @throws MBeanException if setting the attribute causes
* the bean to throw an exception (which
* becomes the cause of this exception).
* @throws ReflectionException if an exception occurred in trying
* to use the reflection interface
* to lookup the attribute. The
* thrown exception is the cause of
* this exception.
* @see #getAttribute(String)
*/
public void setAttribute(Attribute attribute)
throws AttributeNotFoundException, InvalidAttributeValueException,
MBeanException, ReflectionException
{
String name = attribute.getName();
String attName = name.substring(0, 1).toUpperCase() + name.substring(1);
Object val = attribute.getValue();
try
{
getMutator(attName, val.getClass()).invoke(impl, new Object[] { val });
}
catch (IllegalAccessException e)
{
throw new ReflectionException(e, "Failed to set " + name);
}
catch (IllegalArgumentException e)
{
throw ((InvalidAttributeValueException)
new InvalidAttributeValueException(attribute.getValue() +
" is an invalid value for " +
name).initCause(e));
}
catch (InvocationTargetException e)
{
throw new MBeanException(e, "The getter of " + name +
" threw an exception");
}
}
/**
* Sets the value of each of the specified attributes
* to that supplied by the {@link Attribute} object.
* The returned list contains the attributes that were
* set and their new values.
*
* @param attributes the attributes to set.
* @return a list of the changed attributes.
* @see #getAttributes(AttributeList)
*/
public AttributeList setAttributes(AttributeList attributes)
{
AttributeList list = new AttributeList(attributes.size());
Iterator<Object> it = attributes.iterator();
while (it.hasNext())
{
try
{
Attribute attrib = (Attribute) it.next();
setAttribute(attrib);
list.add(attrib);
}
catch (AttributeNotFoundException e)
{
/* Ignored */
}
catch (InvalidAttributeValueException e)
{
/* Ignored */
}
catch (ReflectionException e)
{
/* Ignored */
}
catch (MBeanException e)
{
/* Ignored */
}
}
return list;
}
/**
* Replaces the implementation of the interface used by this
* instance with the one specified. The new implementation
* must be non-null and implement the interface specified on
* construction of this instance.
*
* @throws IllegalArgumentException if <code>impl</code> is <code>null</code>.
* @throws NotCompliantMBeanException if <code>impl</code> doesn't implement
* the interface or a method appears
* in the interface that doesn't comply
* with the naming conventions.
*/
public void setImplementation(Object impl)
throws NotCompliantMBeanException
{
if (impl == null)
throw new IllegalArgumentException("The specified implementation is null.");
if (!(iface.isInstance(impl)))
throw new NotCompliantMBeanException("The instance, " + impl +
", is not an instance of " + iface);
this.impl = impl;
}
/**
* Returns the mutator method for a particular attribute name
* with a parameter type matching that of the given value.
*
* @param name the name of the attribute.
* @param type the type of the parameter.
* @return the appropriate mutator method.
* @throws AttributeNotFoundException if a method can't be found.
*/
private Method getMutator(String name, Class<?> type)
throws AttributeNotFoundException
{
String mutator = "set" + name;
Exception ex = null;
try
{
return iface.getMethod(mutator, type);
}
catch (NoSuchMethodException e)
{
/* Ignored; we'll try harder instead */
ex = e;
}
/* Special cases */
if (type == Boolean.class)
try
{
return iface.getMethod(mutator, Boolean.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
if (type == Byte.class)
try
{
return iface.getMethod(mutator, Byte.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
if (type == Character.class)
try
{
return iface.getMethod(mutator, Character.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
if (type == Double.class)
try
{
return iface.getMethod(mutator, Double.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
if (type == Float.class)
try
{
return iface.getMethod(mutator, Float.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
if (type == Integer.class)
try
{
return iface.getMethod(mutator, Integer.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
if (type == Long.class)
try
{
return iface.getMethod(mutator, Long.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
if (type == Short.class)
try
{
return iface.getMethod(mutator, Short.TYPE);
}
catch (NoSuchMethodException e)
{
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(e));
}
/* Superclasses and interfaces */
for (Class<?> i : type.getInterfaces())
try
{
return getMutator(name, i);
}
catch (AttributeNotFoundException e)
{
ex = e;
}
Class<?> sclass = type.getSuperclass();
if (sclass != null && sclass != Object.class)
try
{
return getMutator(name, sclass);
}
catch (AttributeNotFoundException e)
{
ex = e;
}
/* If we get this far, give up */
throw ((AttributeNotFoundException)
new AttributeNotFoundException("The attribute, " + name +
", was not found.").initCause(ex));
}
}