
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
944 lines
31 KiB
Java
944 lines
31 KiB
Java
/* ObjectName.java -- Represent the name of a bean, or a pattern for a name.
|
|
Copyright (C) 2006, 2007 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 gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.Serializable;
|
|
|
|
import java.util.Hashtable;
|
|
import java.util.Iterator;
|
|
import java.util.Map;
|
|
import java.util.TreeMap;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InvalidObjectException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
|
|
/**
|
|
* <p>
|
|
* An {@link ObjectName} instance represents the name of a management
|
|
* bean, or a pattern which may match the name of one or more
|
|
* management beans. Patterns are distinguished from names by the
|
|
* presence of the '?' and '*' characters (which match a single
|
|
* character and a series of zero or more characters, respectively).
|
|
* </p>
|
|
* <p>
|
|
* Each name begins with a domain element, which is terminated by
|
|
* a ':' character. The domain may be empty. If so, it will be
|
|
* replaced by the default domain of the bean server in certain
|
|
* contexts. The domain is a pattern, if it contains either '?'
|
|
* or '*'. To avoid collisions, it is usual to use reverse
|
|
* DNS names for the domain, as in Java package and property names.
|
|
* </p>
|
|
* <p>
|
|
* Following the ':' character is a series of properties. The list
|
|
* is separated by commas, and largely consists of unordered key-value
|
|
* pairs, separated by an equals sign ('='). At most one element may
|
|
* be an asterisk ('*'), which turns the {@link ObjectName} instance
|
|
* into a <emph>property list pattern</emph>. In this situation, the pattern
|
|
* matches a name if the name contains at least those key-value pairs
|
|
* given and has the same domain.
|
|
* </p>
|
|
* <p>
|
|
* A <emph>key</emph> is a string of characters which doesn't include
|
|
* any of those used as delimiters or in patterns (':', '=', ',', '?'
|
|
* and '*'). Keys must be unique.
|
|
* </p>
|
|
* <p>
|
|
* A value may be <emph>quoted</emph> or <emph>unquoted</emph>. Unquoted
|
|
* values obey the same rules as given for keys above. Quoted values are
|
|
* surrounded by quotation marks ("), and use a backslash ('\') character
|
|
* to include quotes ('\"'), backslashes ('\\'), newlines ('\n'), and
|
|
* the pattern characters ('\?' and '\*'). The quotes and backslashes
|
|
* (after expansion) are considered part of the value.
|
|
* </p>
|
|
* <p>
|
|
* Both quoted and unquoted values may contain the wildcard characters
|
|
* '?' and '*'. A name with at least one value containing a wildcard
|
|
* character is known as a <emph>property value pattern</emph>. A
|
|
* name is generally a <emph>property pattern</emph> if it is either
|
|
* a <emph>property list pattern</emph> or <emph>property value pattern</emph>.
|
|
* </p>
|
|
* <p>
|
|
* Spaces are maintained within the different parts of the name. Thus,
|
|
* '<code>domain: key1 = value1 </code>' has a key ' key1 ' with value
|
|
* ' value1 '. Newlines are disallowed, except where escaped in quoted
|
|
* values.
|
|
* </p>
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @since 1.5
|
|
*/
|
|
public class ObjectName
|
|
implements Serializable, QueryExp
|
|
{
|
|
|
|
private static final long serialVersionUID = 1081892073854801359L;
|
|
|
|
/**
|
|
* The wildcard {@link ObjectName} {@code "*:*"}
|
|
*
|
|
* @since 1.6
|
|
*/
|
|
public static final ObjectName WILDCARD;
|
|
|
|
/**
|
|
* The domain of the name.
|
|
*/
|
|
private transient String domain;
|
|
|
|
/**
|
|
* The properties, as key-value pairs.
|
|
*/
|
|
private transient TreeMap<String,String> properties;
|
|
|
|
/**
|
|
* The properties as a string (stored for ordering).
|
|
*/
|
|
private transient String propertyListString;
|
|
|
|
/**
|
|
* True if this object name is a property list pattern.
|
|
*/
|
|
private transient boolean propertyListPattern;
|
|
|
|
/**
|
|
* True if this object name is a property value pattern.
|
|
*/
|
|
private transient boolean propertyValuePattern;
|
|
|
|
/**
|
|
* The management server associated with this object name.
|
|
*/
|
|
private transient MBeanServer server;
|
|
|
|
/**
|
|
* Static initializer to set up the wildcard.
|
|
*/
|
|
static
|
|
{
|
|
try
|
|
{
|
|
WILDCARD = new ObjectName("");
|
|
}
|
|
catch (MalformedObjectNameException e)
|
|
{
|
|
throw (InternalError) (new InternalError("A problem occurred " +
|
|
"initializing the ObjectName " +
|
|
"wildcard.").initCause(e));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Constructs an {@link ObjectName} instance from the given string,
|
|
* which should be of the form
|
|
* <domain>:<properties><wild>. <domain>
|
|
* represents the domain section of the name. <properties>
|
|
* represents the key-value pairs, as returned by {@link
|
|
* #getKeyPropertyListString()}. <wild> is the optional
|
|
* asterisk present in the property list. If the string doesn't
|
|
* represent a property pattern, it will be empty. If it does,
|
|
* it will be either ',*' or '*', depending on whether other
|
|
* properties are present or not, respectively.
|
|
*
|
|
* @param name the string to use to construct this instance.
|
|
* @throws MalformedObjectNameException if the string is of the
|
|
* wrong format.
|
|
* @throws NullPointerException if <code>name</code> is
|
|
* <code>null</code>.
|
|
*/
|
|
public ObjectName(String name)
|
|
throws MalformedObjectNameException
|
|
{
|
|
if (name.length() == 0)
|
|
name = "*:*";
|
|
parse(name);
|
|
}
|
|
|
|
/**
|
|
* Parse the name in the same form as the constructor. Used by
|
|
* readObject().
|
|
*/
|
|
private void parse(String name)
|
|
throws MalformedObjectNameException
|
|
{
|
|
int domainSep = name.indexOf(':');
|
|
if (domainSep == -1)
|
|
throw new MalformedObjectNameException("No domain separator was found.");
|
|
domain = name.substring(0, domainSep);
|
|
String rest = name.substring(domainSep + 1);
|
|
properties = new TreeMap<String,String>();
|
|
String[] pairs = rest.split(",");
|
|
if (pairs.length == 0 && !isPattern())
|
|
throw new MalformedObjectNameException("A name that is not a " +
|
|
"pattern must contain at " +
|
|
"least one key-value pair.");
|
|
propertyListString = "";
|
|
for (int a = 0; a < pairs.length; ++a)
|
|
{
|
|
if (pairs[a].equals("*"))
|
|
{
|
|
if (propertyListPattern)
|
|
throw new MalformedObjectNameException("Multiple wildcards " +
|
|
"in properties.");
|
|
propertyListPattern = true;
|
|
continue;
|
|
}
|
|
int sep = pairs[a].indexOf('=');
|
|
if (sep == -1)
|
|
throw new MalformedObjectNameException("A key must be " +
|
|
"followed by a value.");
|
|
String key = pairs[a].substring(0, sep);
|
|
if (properties.containsKey(key))
|
|
throw new MalformedObjectNameException("The same key occurs " +
|
|
"more than once.");
|
|
String value = pairs[a].substring(sep+1);
|
|
properties.put(key, value);
|
|
propertyListString += key + "=" + value + ",";
|
|
}
|
|
if (propertyListString.length() > 0)
|
|
propertyListString =
|
|
propertyListString.substring(0, propertyListString.length() - 1);
|
|
checkComponents();
|
|
}
|
|
|
|
/**
|
|
* Constructs an {@link ObjectName} instance using the given
|
|
* domain and the one specified property.
|
|
*
|
|
* @param domain the domain part of the object name.
|
|
* @param key the key of the property.
|
|
* @param value the value of the property.
|
|
* @throws MalformedObjectNameException the domain, key or value
|
|
* contains an illegal
|
|
* character or the value
|
|
* does not follow the quoting
|
|
* specifications.
|
|
* @throws NullPointerException if one of the parameters is
|
|
* <code>null</code>.
|
|
*/
|
|
public ObjectName(String domain, String key, String value)
|
|
throws MalformedObjectNameException
|
|
{
|
|
this.domain = domain;
|
|
properties = new TreeMap<String,String>();
|
|
properties.put(key, value);
|
|
checkComponents();
|
|
}
|
|
|
|
/**
|
|
* Constructs an {@link ObjectName} instance using the given
|
|
* domain and properties.
|
|
*
|
|
* @param domain the domain part of the object name.
|
|
* @param properties the key-value property pairs.
|
|
* @throws MalformedObjectNameException the domain, a key or a value
|
|
* contains an illegal
|
|
* character or a value
|
|
* does not follow the quoting
|
|
* specifications.
|
|
* @throws NullPointerException if one of the parameters is
|
|
* <code>null</code>.
|
|
*/
|
|
public ObjectName(String domain, Hashtable<String,String> properties)
|
|
throws MalformedObjectNameException
|
|
{
|
|
this.domain = domain;
|
|
this.properties = new TreeMap<String,String>();
|
|
this.properties.putAll(properties);
|
|
checkComponents();
|
|
}
|
|
|
|
/**
|
|
* Checks the legality of the domain and the properties.
|
|
*
|
|
* @throws MalformedObjectNameException the domain, a key or a value
|
|
* contains an illegal
|
|
* character or a value
|
|
* does not follow the quoting
|
|
* specifications.
|
|
*/
|
|
private void checkComponents()
|
|
throws MalformedObjectNameException
|
|
{
|
|
if (domain.indexOf(':') != -1)
|
|
throw new MalformedObjectNameException("The domain includes a ':' " +
|
|
"character.");
|
|
if (domain.indexOf('\n') != -1)
|
|
throw new MalformedObjectNameException("The domain includes a newline " +
|
|
"character.");
|
|
char[] keychars = new char[] { '\n', ':', ',', '*', '?', '=' };
|
|
char[] valchars = new char[] { '\n', ':', ',', '=' };
|
|
for (Map.Entry<String,String> entry : properties.entrySet())
|
|
{
|
|
for (int a = 0; a < keychars.length; ++a)
|
|
if (entry.getKey().indexOf(keychars[a]) != -1)
|
|
throw new MalformedObjectNameException("A key contains a '" +
|
|
keychars[a] + "' " +
|
|
"character.");
|
|
String value = entry.getValue();
|
|
int quote = value.indexOf('"');
|
|
if (quote == 0)
|
|
{
|
|
try
|
|
{
|
|
unquote(value);
|
|
}
|
|
catch (IllegalArgumentException e)
|
|
{
|
|
throw (MalformedObjectNameException)
|
|
new MalformedObjectNameException("The quoted value is " +
|
|
"invalid.").initCause(e);
|
|
}
|
|
}
|
|
else if (quote != -1)
|
|
throw new MalformedObjectNameException("A value contains " +
|
|
"a '\"' character.");
|
|
else
|
|
{
|
|
for (int a = 0; a < valchars.length; ++a)
|
|
if (value.indexOf(valchars[a]) != -1)
|
|
throw new MalformedObjectNameException("A value contains " +
|
|
"a '" + valchars[a] + "' " +
|
|
"character.");
|
|
|
|
}
|
|
if (value.indexOf('*') != -1 || value.indexOf('?') != -1)
|
|
propertyValuePattern = true;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Attempts to find a match between this name and the one supplied.
|
|
* The following criteria are used:
|
|
* </p>
|
|
* <ul>
|
|
* <li>If the supplied name is a pattern, <code>false</code> is
|
|
* returned.</li>
|
|
* <li>If this name is a pattern, this method returns <code>true</code>
|
|
* if the supplied name matches the pattern.</li>
|
|
* <li>If this name is not a pattern, the result of
|
|
* <code>equals(name)</code> is returned.
|
|
* </ul>
|
|
*
|
|
* @param name the name to find a match with.
|
|
* @return true if the name either matches this pattern or is
|
|
* equivalent to this name under the criteria of
|
|
* {@link #equals(java.lang.Object)}
|
|
* @throws NullPointerException if <code>name</code> is <code>null</code>.
|
|
*/
|
|
public boolean apply(ObjectName name)
|
|
{
|
|
if (name.isPattern())
|
|
return false;
|
|
|
|
if (!isPattern())
|
|
return equals(name);
|
|
|
|
if (isDomainPattern())
|
|
{
|
|
if (!domainMatches(domain, 0, name.getDomain(), 0))
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
if (!domain.equals(name.getDomain()))
|
|
return false;
|
|
}
|
|
|
|
if (isPropertyPattern())
|
|
{
|
|
Hashtable<String,String> oProps = name.getKeyPropertyList();
|
|
for (Map.Entry<String,String> entry : properties.entrySet())
|
|
{
|
|
String key = entry.getKey();
|
|
if (!(oProps.containsKey(key)))
|
|
return false;
|
|
String val = entry.getValue();
|
|
if (!(val.equals(oProps.get(key))))
|
|
return false;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (!getCanonicalKeyPropertyListString().equals
|
|
(name.getCanonicalKeyPropertyListString()))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Returns true if the domain matches the pattern.
|
|
*
|
|
* @param pattern the pattern to match against.
|
|
* @param patternindex the index into the pattern to start matching.
|
|
* @param domain the domain to match.
|
|
* @param domainindex the index into the domain to start matching.
|
|
* @return true if the domain matches the pattern.
|
|
*/
|
|
private static boolean domainMatches(String pattern, int patternindex,
|
|
String domain, int domainindex)
|
|
{
|
|
while (patternindex < pattern.length())
|
|
{
|
|
char c = pattern.charAt(patternindex++);
|
|
|
|
if (c == '*')
|
|
{
|
|
for (int i = domain.length(); i >= domainindex; i--)
|
|
{
|
|
if (domainMatches(pattern, patternindex, domain, i))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
if (domainindex >= domain.length())
|
|
return false;
|
|
|
|
if (c != '?' && c != domain.charAt(domainindex))
|
|
return false;
|
|
|
|
domainindex++;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Compares the specified object with this one. The two
|
|
* are judged to be equivalent if the given object is an
|
|
* instance of {@link ObjectName} and has an equal canonical
|
|
* form (as returned by {@link #getCanonicalName()}).
|
|
*
|
|
* @param obj the object to compare with this.
|
|
* @return true if the object is also an {@link ObjectName}
|
|
* with an equivalent canonical form.
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof ObjectName)
|
|
{
|
|
ObjectName o = (ObjectName) obj;
|
|
return getCanonicalName().equals(o.getCanonicalName());
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns the property list in canonical form. The keys
|
|
* are ordered using the lexicographic ordering used by
|
|
* {@link java.lang.String#compareTo(java.lang.Object)}.
|
|
*
|
|
* @return the property list, with the keys in lexicographic
|
|
* order.
|
|
*/
|
|
public String getCanonicalKeyPropertyListString()
|
|
{
|
|
CPStringBuilder builder = new CPStringBuilder();
|
|
Iterator<Map.Entry<String,String>> i = properties.entrySet().iterator();
|
|
while (i.hasNext())
|
|
{
|
|
Map.Entry<String,String> entry = i.next();
|
|
builder.append(entry.getKey() + "=" + entry.getValue());
|
|
if (i.hasNext())
|
|
builder.append(",");
|
|
}
|
|
return builder.toString();
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Returns the name as a string in canonical form. More precisely,
|
|
* this returns a string of the format
|
|
* <domain>:<properties><wild>. <properties>
|
|
* is the same value as returned by
|
|
* {@link #getCanonicalKeyPropertyListString()}. <wild>
|
|
* is:
|
|
* </p>
|
|
* <ul>
|
|
* <li>an empty string, if the object name is not a property pattern.</li>
|
|
* <li>'*' if <properties> is empty.</li>
|
|
* <li>',*' if there is at least one key-value pair.</li>
|
|
* </ul>
|
|
*
|
|
* @return the canonical string form of the object name, as specified
|
|
* above.
|
|
*/
|
|
public String getCanonicalName()
|
|
{
|
|
return domain + ":" +
|
|
getCanonicalKeyPropertyListString() +
|
|
(isPropertyPattern() ? (properties.isEmpty() ? "*" : ",*") : "");
|
|
}
|
|
|
|
/**
|
|
* Returns the domain part of the object name.
|
|
*
|
|
* @return the domain.
|
|
*/
|
|
public String getDomain()
|
|
{
|
|
return domain;
|
|
}
|
|
|
|
/**
|
|
* Returns an {@link ObjectName} instance that is substitutable for the
|
|
* one given. The instance returned may be a subclass of {@link ObjectName},
|
|
* but is not guaranteed to be of the same type as the given name, if that
|
|
* should also turn out to be a subclass. The returned instance may or may
|
|
* not be equivalent to the one given. The purpose of this method is to provide
|
|
* an instance of {@link ObjectName} with a well-defined semantics, such as may
|
|
* be used in cases where the given name is not trustworthy.
|
|
*
|
|
* @param name the {@link ObjectName} to provide a substitute for.
|
|
* @return a substitute for the given name, which may or may not be a subclass
|
|
* of {@link ObjectName}. In either case, the returned object is
|
|
* guaranteed to have the semantics defined here.
|
|
* @throws NullPointerException if <code>name</code> is <code>null</code>.
|
|
*/
|
|
public static ObjectName getInstance(ObjectName name)
|
|
{
|
|
try
|
|
{
|
|
return new ObjectName(name.getCanonicalName());
|
|
}
|
|
catch (MalformedObjectNameException e)
|
|
{
|
|
throw (InternalError)
|
|
(new InternalError("The canonical name of " +
|
|
"the given name is invalid.").initCause(e));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns an {@link ObjectName} instance for the specified name, represented
|
|
* as a {@link java.lang.String}. The instance returned may be a subclass of
|
|
* {@link ObjectName} and may or may not be equivalent to earlier instances
|
|
* returned by this method for the same string.
|
|
*
|
|
* @param name the {@link ObjectName} to provide an instance of.
|
|
* @return a instance for the given name, which may or may not be a subclass
|
|
* of {@link ObjectName}.
|
|
* @throws MalformedObjectNameException the domain, a key or a value
|
|
* contains an illegal
|
|
* character or a value
|
|
* does not follow the quoting
|
|
* specifications.
|
|
* @throws NullPointerException if <code>name</code> is <code>null</code>.
|
|
*/
|
|
public static ObjectName getInstance(String name)
|
|
throws MalformedObjectNameException
|
|
{
|
|
return new ObjectName(name);
|
|
}
|
|
|
|
/**
|
|
* Returns an {@link ObjectName} instance for the specified name, represented
|
|
* as a series of {@link java.lang.String} objects for the domain and a single
|
|
* property, as a key-value pair. The instance returned may be a subclass of
|
|
* {@link ObjectName} and may or may not be equivalent to earlier instances
|
|
* returned by this method for the same parameters.
|
|
*
|
|
* @param domain the domain part of the object name.
|
|
* @param key the key of the property.
|
|
* @param value the value of the property.
|
|
* @return a instance for the given name, which may or may not be a subclass
|
|
* of {@link ObjectName}.
|
|
* @throws MalformedObjectNameException the domain, a key or a value
|
|
* contains an illegal
|
|
* character or a value
|
|
* does not follow the quoting
|
|
* specifications.
|
|
* @throws NullPointerException if <code>name</code> is <code>null</code>.
|
|
*/
|
|
public static ObjectName getInstance(String domain, String key, String value)
|
|
throws MalformedObjectNameException
|
|
{
|
|
return new ObjectName(domain, key, value);
|
|
}
|
|
|
|
/**
|
|
* Returns an {@link ObjectName} instance for the specified name, represented
|
|
* as a domain {@link java.lang.String} and a table of properties. The
|
|
* instance returned may be a subclass of {@link ObjectName} and may or may
|
|
* not be equivalent to earlier instances returned by this method for the
|
|
* same string.
|
|
*
|
|
* @param domain the domain part of the object name.
|
|
* @param properties the key-value property pairs.
|
|
* @return a instance for the given name, which may or may not be a subclass
|
|
* of {@link ObjectName}.
|
|
* @throws MalformedObjectNameException the domain, a key or a value
|
|
* contains an illegal
|
|
* character or a value
|
|
* does not follow the quoting
|
|
* specifications.
|
|
* @throws NullPointerException if <code>name</code> is <code>null</code>.
|
|
*/
|
|
public static ObjectName getInstance(String domain,
|
|
Hashtable<String,String> properties)
|
|
throws MalformedObjectNameException
|
|
{
|
|
return new ObjectName(domain, properties);
|
|
}
|
|
|
|
/**
|
|
* Returns the property value corresponding to the given key.
|
|
*
|
|
* @param key the key of the property to be obtained.
|
|
* @return the value of the specified property.
|
|
* @throws NullPointerException if <code>key</code> is <code>null</code>.
|
|
*/
|
|
public String getKeyProperty(String key)
|
|
{
|
|
if (key == null)
|
|
throw new NullPointerException("Null key given in request for a value.");
|
|
return (String) properties.get(key);
|
|
}
|
|
|
|
/**
|
|
* Returns the properties in a {@link java.util.Hashtable}. The table
|
|
* contains each of the properties as keys mapped to their value. The
|
|
* returned table is not unmodifiable, but changes made to it will not
|
|
* be reflected in the object name.
|
|
*
|
|
* @return a {@link java.util.Hashtable}, containing each of the object
|
|
* name's properties.
|
|
*/
|
|
public Hashtable<String,String> getKeyPropertyList()
|
|
{
|
|
return new Hashtable<String,String>(properties);
|
|
}
|
|
|
|
/**
|
|
* Returns a {@link java.lang.String} representation of the property
|
|
* list. If the object name was created using {@link
|
|
* ObjectName(String)}, then this string will contain the properties
|
|
* in the same order they were given in at creation.
|
|
*
|
|
* @return the property list.
|
|
*/
|
|
public String getKeyPropertyListString()
|
|
{
|
|
if (propertyListString != null)
|
|
return propertyListString;
|
|
return getCanonicalKeyPropertyListString();
|
|
}
|
|
|
|
/**
|
|
* Returns a hash code for this object name. This is calculated as the
|
|
* summation of the hash codes of the domain and the properties.
|
|
*
|
|
* @return a hash code for this object name.
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return domain.hashCode() + properties.hashCode();
|
|
}
|
|
|
|
/**
|
|
* Returns true if the domain of this object name is a pattern.
|
|
* This is the case if it contains one or more wildcard characters
|
|
* ('*' or '?').
|
|
*
|
|
* @return true if the domain is a pattern.
|
|
*/
|
|
public boolean isDomainPattern()
|
|
{
|
|
return domain.contains("?") || domain.contains("*");
|
|
}
|
|
|
|
/**
|
|
* Returns true if this is an object name pattern. An object
|
|
* name pattern has a domain containing a wildcard character
|
|
* ('*' or '?') and/or a '*' in the list of properties.
|
|
* This method will return true if either {@link #isDomainPattern()}
|
|
* or {@link #isPropertyPattern()} does.
|
|
*
|
|
* @return true if this is an object name pattern.
|
|
*/
|
|
public boolean isPattern()
|
|
{
|
|
return isDomainPattern() || isPropertyPattern();
|
|
}
|
|
|
|
/**
|
|
* Returns true if this object name is a property list
|
|
* pattern, a property value pattern or both.
|
|
*
|
|
* @return true if the properties of this name contain a pattern.
|
|
* @see #isPropertyListPattern
|
|
* @see #isPropertyValuePattern
|
|
*/
|
|
public boolean isPropertyPattern()
|
|
{
|
|
return propertyListPattern || propertyValuePattern;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this object name is a property list pattern. This is
|
|
* the case if the list of properties contains an '*'.
|
|
*
|
|
* @return true if this is a property list pattern.
|
|
* @since 1.6
|
|
*/
|
|
public boolean isPropertyListPattern()
|
|
{
|
|
return propertyListPattern;
|
|
}
|
|
|
|
/**
|
|
* Returns true if this object name is a property value pattern. This is
|
|
* the case if one of the values contains a wildcard character,
|
|
* '?' or '*'.
|
|
*
|
|
* @return true if this is a property value pattern.
|
|
* @since 1.6
|
|
*/
|
|
public boolean isPropertyValuePattern()
|
|
{
|
|
return propertyValuePattern;
|
|
}
|
|
|
|
/**
|
|
* Returns true if the value of the given key is a pattern. This is
|
|
* the case if the value contains a wildcard character, '?' or '*'.
|
|
*
|
|
* @param key the key whose value should be checked.
|
|
* @return true if the value of the given key is a pattern.
|
|
* @since 1.6
|
|
* @throws NullPointerException if {@code key} is {@code null}.
|
|
* @throws IllegalArgumentException if {@code key} is not a valid
|
|
* property.
|
|
*/
|
|
public boolean isPropertyValuePattern(String key)
|
|
{
|
|
String value = getKeyProperty(key);
|
|
if (value == null)
|
|
throw new IllegalArgumentException(key + " is not a valid property.");
|
|
return value.indexOf('?') != -1 || value.indexOf('*') != -1;
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Returns a quoted version of the supplied string. The string may
|
|
* contain any character. The resulting quoted version is guaranteed
|
|
* to be usable as the value of a property, so this method provides
|
|
* a good way of ensuring that a value is legal.
|
|
* </p>
|
|
* <p>
|
|
* The string is transformed as follows:
|
|
* </p>
|
|
* <ul>
|
|
* <li>The string is prefixed with an opening quote character, '"'.
|
|
* <li>For each character, s:
|
|
* <ul>
|
|
* <li>If s is a quote ('"'), it is replaced by a backslash
|
|
* followed by a quote.</li>
|
|
* <li>If s is a star ('*'), it is replaced by a backslash followed
|
|
* by a star.</li>
|
|
* <li>If s is a question mark ('?'), it is replaced by a backslash
|
|
* followed by a question mark.</li>
|
|
* <li>If s is a backslash ('\'), it is replaced by two backslashes.</li>
|
|
* <li>If s is a newline character, it is replaced by a backslash followed by
|
|
* a '\n'.</li>
|
|
* <li>Otherwise, s is used verbatim.
|
|
* </ul></li>
|
|
* <li>The string is terminated with a closing quote character, '"'.</li>
|
|
* </ul>
|
|
*
|
|
* @param string the string to quote.
|
|
* @return a quoted version of the supplied string.
|
|
* @throws NullPointerException if <code>string</code> is <code>null</code>.
|
|
*/
|
|
public static String quote(String string)
|
|
{
|
|
CPStringBuilder builder = new CPStringBuilder();
|
|
builder.append('"');
|
|
for (int a = 0; a < string.length(); ++a)
|
|
{
|
|
char s = string.charAt(a);
|
|
switch (s)
|
|
{
|
|
case '"':
|
|
builder.append("\\\"");
|
|
break;
|
|
case '*':
|
|
builder.append("\\*");
|
|
break;
|
|
case '?':
|
|
builder.append("\\?");
|
|
break;
|
|
case '\\':
|
|
builder.append("\\\\");
|
|
break;
|
|
case '\n':
|
|
builder.append("\\\n");
|
|
break;
|
|
default:
|
|
builder.append(s);
|
|
}
|
|
}
|
|
builder.append('"');
|
|
return builder.toString();
|
|
}
|
|
|
|
/**
|
|
* Changes the {@link MBeanServer} on which this query is performed.
|
|
*
|
|
* @param server the new server to use.
|
|
*/
|
|
public void setMBeanServer(MBeanServer server)
|
|
{
|
|
this.server = server;
|
|
}
|
|
|
|
/**
|
|
* Returns a textual representation of the object name.
|
|
*
|
|
* <p>The format is unspecified beyond that equivalent object
|
|
* names will return the same string from this method, but note
|
|
* that Tomcat depends on the string returned by this method
|
|
* being a valid textual representation of the object name and
|
|
* will fail to start if it is not.
|
|
*
|
|
* @return a textual representation of the object name.
|
|
*/
|
|
public String toString()
|
|
{
|
|
return getCanonicalName();
|
|
}
|
|
|
|
|
|
/**
|
|
* Serialize this {@link ObjectName}. The serialized
|
|
* form is the same as the string parsed by the constructor.
|
|
*
|
|
* @param out the output stream to write to.
|
|
* @throws IOException if an I/O error occurs.
|
|
*/
|
|
private void writeObject(ObjectOutputStream out)
|
|
throws IOException
|
|
{
|
|
out.defaultWriteObject();
|
|
CPStringBuilder buffer = new CPStringBuilder(getDomain());
|
|
buffer.append(':');
|
|
String properties = getKeyPropertyListString();
|
|
buffer.append(properties);
|
|
if (isPropertyPattern())
|
|
{
|
|
if (properties.length() == 0)
|
|
buffer.append("*");
|
|
else
|
|
buffer.append(",*");
|
|
}
|
|
out.writeObject(buffer.toString());
|
|
}
|
|
|
|
/**
|
|
* Reads the serialized form, which is that used
|
|
* by the constructor.
|
|
*
|
|
* @param in the input stream to read from.
|
|
* @throws IOException if an I/O error occurs.
|
|
*/
|
|
private void readObject(ObjectInputStream in)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
in.defaultReadObject();
|
|
String objectName = (String)in.readObject();
|
|
try
|
|
{
|
|
parse(objectName);
|
|
}
|
|
catch (MalformedObjectNameException x)
|
|
{
|
|
throw new InvalidObjectException(x.toString());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Unquotes the supplied string. The quotation marks are removed as
|
|
* are the backslashes preceding the escaped characters ('"', '?',
|
|
* '*', '\n', '\\'). A one-to-one mapping exists between quoted and
|
|
* unquoted values. As a result, a string <code>s</code> should be
|
|
* equal to <code>unquote(quote(s))</code>.
|
|
*
|
|
* @param q the quoted string to unquote.
|
|
* @return the unquoted string.
|
|
* @throws NullPointerException if <code>q</code> is <code>null</code>.
|
|
* @throws IllegalArgumentException if the string is not a valid
|
|
* quoted string i.e. it is not
|
|
* surrounded by quotation marks
|
|
* and/or characters are not properly
|
|
* escaped.
|
|
*/
|
|
public static String unquote(String q)
|
|
{
|
|
if (q.charAt(0) != '"')
|
|
throw new IllegalArgumentException("The string does " +
|
|
"not start with a quote.");
|
|
if (q.charAt(q.length() - 1) != '"')
|
|
throw new IllegalArgumentException("The string does " +
|
|
"not end with a quote.");
|
|
CPStringBuilder builder = new CPStringBuilder();
|
|
for (int a = 1; a < (q.length() - 1); ++a)
|
|
{
|
|
char n = q.charAt(a);
|
|
if (n == '\\')
|
|
{
|
|
n = q.charAt(++a);
|
|
if (n != '"' && n != '?' && n != '*' &&
|
|
n != 'n' && n != '\\')
|
|
throw new IllegalArgumentException("Illegal escaped character: "
|
|
+ n);
|
|
}
|
|
else if (n == '"' || n == '\n')
|
|
throw new IllegalArgumentException("Illegal character: " + n);
|
|
builder.append(n);
|
|
}
|
|
|
|
return builder.toString();
|
|
}
|
|
|
|
}
|