cd6d4007aa
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
551 lines
17 KiB
Java
551 lines
17 KiB
Java
/* MBeanPermission.java -- Permissions controlling server access.
|
|
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 gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.security.Permission;
|
|
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
|
|
import java.util.HashSet;
|
|
import java.util.Iterator;
|
|
import java.util.Set;
|
|
import java.util.TreeSet;
|
|
|
|
/**
|
|
* <p>
|
|
* Represents the permissions required to perform
|
|
* operations using the {@link MBeanServer}. As with
|
|
* all {@link java.security.Permission} objects, an
|
|
* instance of this class either represents a permission
|
|
* already held or one that is required to access a
|
|
* particular service. In the case of {@link MBeanPermission}s,
|
|
* implication checks are made using an instance of this class
|
|
* when a user requests an operation from the server, and a
|
|
* {@link SecurityManager} is in place.
|
|
* </p>
|
|
* <p>
|
|
* An {@link MBeanPermission} consists of four elements,
|
|
* which all have to match for the permission to be implied.
|
|
* These are as follows:
|
|
* </p>
|
|
* <ol>
|
|
* <li><strong>The action</strong>. For a required permission,
|
|
* this is a single value. For a permission held by the user,
|
|
* this is a list of comma-separated actions (with spaces allowed),
|
|
* or <code>*</code> (representing all actions). {@link #getActions()}
|
|
* returns this value.</li>
|
|
* <li><strong>The class name</strong>. For a required permission,
|
|
* this is the class name of the bean being accessed, if any. If
|
|
* a bean isn't involved in this action, the value is <code>null</code>.
|
|
* For a permission held by the user, it has one of three values:
|
|
* <ol>
|
|
* <li>The empty string, implying any class.</li>
|
|
* <li><code>*</code>, also implying any class.</li>
|
|
* <li>A class name pattern, which may specify a single class
|
|
* (e.g. <code>java.lang.Object</code>) or a series of classes
|
|
* using the wildcard character <code>*</code> (e.g.
|
|
* <code>javax.swing.*</code>.)</li>
|
|
* </ol></li>
|
|
* <li><strong>The member</strong>. For a required permission,
|
|
* this is the member of the bean being accessed (an attribute
|
|
* or operation), if any. If a member of the bean isn't involved
|
|
* in this action, the value is <code>null</code>.
|
|
* For a permission held by the user, it has one of three values:
|
|
* <ol>
|
|
* <li>The empty string, implying any member.</li>
|
|
* <li><code>*</code>, also implying any member.</li>
|
|
* <li>The name of a member.</li>
|
|
* </ol></li>
|
|
* <li>The object name</strong>. For a required permission,
|
|
* this is the {@link ObjectName} of the bean being accessed, if
|
|
* any. If a bean isn't involved in this action, the value is
|
|
* <code>null</code>. The name may not be a pattern.
|
|
* For a permission held by the user, it may be the empty
|
|
* string (allowing everything) or an {@link ObjectName}
|
|
* pattern.
|
|
* </li></ol>
|
|
* {@link #getName()} returns the latter three of these as a
|
|
* single string:
|
|
* </p>
|
|
* <p><code>className#member[objectName]</code></p>
|
|
* <p>
|
|
* where <code>""</code> is disallowed, as, although any of
|
|
* the elements may be omitted, not all of them should be
|
|
* left out simultaneously. <code>"-"</code> is used to
|
|
* represent <code>null</code>. When this occurs in a
|
|
* required permission, anything may match it. When this
|
|
* forms part of a permission held by the user, it only
|
|
* matches another <code>null</code> value.
|
|
* </p>
|
|
* <p>The list of valid actions is as follows:</p>
|
|
* <ul>
|
|
* <li>addNotificationListener</li>
|
|
* <li>getAttribute</li>
|
|
* <li>getClassLoader</li>
|
|
* <li>getClassLoaderFor</li>
|
|
* <li>getClassLoaderRepository</li>
|
|
* <li>getDomains</li>
|
|
* <li>getMBeanInfo</li>
|
|
* <li>getObjectInstance</li>
|
|
* <li>instantiate</li>
|
|
* <li>invoke</li>
|
|
* <li>isInstanceOf</li>
|
|
* <li>queryMBeans</li>
|
|
* <li>queryNames</li>
|
|
* <li>registerMBean</li>
|
|
* <li>removeNotificationListener</li>
|
|
* <li>setAttribute</li>
|
|
* <li>unregisterMBean</li>
|
|
* </ul>
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
* @since 1.5
|
|
*/
|
|
public class MBeanPermission
|
|
extends Permission
|
|
{
|
|
|
|
/**
|
|
* Compatible with JDK 1.5
|
|
*/
|
|
private static final long serialVersionUID = -2416928705275160661L;
|
|
|
|
/**
|
|
* The list of actions associated with this permission.
|
|
*/
|
|
private String actions;
|
|
|
|
/**
|
|
* The list of actions as an ordered set.
|
|
*/
|
|
private transient Set<String> actionSet;
|
|
|
|
/**
|
|
* The set of valid actions.
|
|
*/
|
|
private static final Set<String> validSet;
|
|
|
|
/**
|
|
* Initialise the set of valid actions.
|
|
*/
|
|
static
|
|
{
|
|
validSet = new HashSet<String>();
|
|
validSet.add("addNotificationListener");
|
|
validSet.add("getAttribute");
|
|
validSet.add("getClassLoader");
|
|
validSet.add("getClassLoaderFor");
|
|
validSet.add("getClassLoaderRepository");
|
|
validSet.add("getDomains");
|
|
validSet.add("getMBeanInfo");
|
|
validSet.add("getObjectInstance");
|
|
validSet.add("instantiate");
|
|
validSet.add("invoke");
|
|
validSet.add("isInstanceOf");
|
|
validSet.add("queryMBeans");
|
|
validSet.add("queryNames");
|
|
validSet.add("registerMBean");
|
|
validSet.add("removeNotificationListener");
|
|
validSet.add("setAttribute");
|
|
validSet.add("unregisterMBean");
|
|
}
|
|
|
|
/**
|
|
* Constructs a new {@link MBeanPermission} with the specified name
|
|
* and actions. The name is of the form <code>className#member[objectName]</code>,
|
|
* where each element is optional, but a completely empty or <code>null</code>
|
|
* name is disallowed. Actions are specified as a comma-separated list
|
|
* and may also not be empty or <code>null</code>.
|
|
*
|
|
* @param name the name of the permission.
|
|
* @param actions the actions associated with this permission.
|
|
* @throws IllegalArgumentException if the name or actions are invalid.
|
|
*/
|
|
public MBeanPermission(String name, String actions)
|
|
{
|
|
super(name);
|
|
if (name == null || name.length() == 0)
|
|
throw new IllegalArgumentException("The supplied name was null or empty.");
|
|
if (actions == null || actions.length() == 0)
|
|
throw new IllegalArgumentException("The supplied action list was null or empty.");
|
|
this.actions = actions;
|
|
updateActionSet();
|
|
}
|
|
|
|
/**
|
|
* Constructs a new {@link MBeanPermission} with the specified class name,
|
|
* member, object name and actions. The name of the permission is created
|
|
* using the form <code>className#member[objectName]</code>,
|
|
* where each element is optional, but an empty or <code>null</code>
|
|
* name is disallowed. Actions are specified as a comma-separated list
|
|
* and may also not be empty or <code>null</code>.
|
|
*
|
|
* @param className the name of the class to which this permission applies,
|
|
* or either <code>null</code> or <code>"-"</code> for a
|
|
* value which may be implied by any class name, but not
|
|
* imply any class name itself.
|
|
* @param member the member of the class to which this permission applies,
|
|
* or either <code>null</code> or <code>"-"</code> for a
|
|
* value which may be implied by any member, but not
|
|
* imply any member itself.
|
|
* @param name the {@link ObjectName} to which this permission applies,
|
|
* or <code>null</code> for a value which may be implied by
|
|
* any object name, but not imply any object name itself.
|
|
* @param actions the actions associated with this permission.
|
|
*/
|
|
public MBeanPermission(String className, String member,
|
|
ObjectName name, String actions)
|
|
{
|
|
this((className == null ? "-" : className) + "#"
|
|
+ (member == null ? "-" : member) + "["
|
|
+ (name == null ? "-" : name.toString()) + "]", actions);
|
|
}
|
|
|
|
/**
|
|
* Returns true if the given object is also an {@link MBeanPermission}
|
|
* with the same name and actions.
|
|
*
|
|
* @param obj the object to test.
|
|
* @return true if the object is an {@link MBeanPermission} with
|
|
* the same name and actions.
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof MBeanPermission)
|
|
{
|
|
MBeanPermission p = (MBeanPermission) obj;
|
|
return (p.getName().equals(getName()) &&
|
|
p.getActions().equals(actions));
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns the list of actions in alphabetical order.
|
|
*
|
|
* @return the list of actions.
|
|
*/
|
|
public String getActions()
|
|
{
|
|
Iterator<String> it = actionSet.iterator();
|
|
CPStringBuilder builder = new CPStringBuilder();
|
|
while (it.hasNext())
|
|
{
|
|
builder.append(it.next());
|
|
if (it.hasNext())
|
|
builder.append(",");
|
|
}
|
|
return builder.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns the hashcode of the permission as the sum
|
|
* of the hashcodes of the name and actions.
|
|
*
|
|
* @return the hashcode of the permission.
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
return getName().hashCode() + actions.hashCode();
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Returns true if this permission implies the supplied permission.
|
|
* This happens if the following holds:
|
|
* </p>
|
|
* <ul>
|
|
* <li>The supplied permission is an {@link MBeanPermission}</li>
|
|
* <li>The supplied permission has either a <code>null</code> classname
|
|
* or its classname matches the classname of this permission. A
|
|
* classname of <code>"*"</code> for this permission always matches
|
|
* the classname of the supplied permission. Generally, <code>'*'</code>
|
|
* acts as a wildcard, so <code>".*"</code> matches <code>'.'</code>
|
|
* followed by anything.</li>
|
|
* <li>The supplied permission has either a <code>null</code> member
|
|
* or its member matches the member of this permission. A member of
|
|
* <code>"*"</code> for this permission always matches the member
|
|
* of the supplied permission.</li>
|
|
* <li>The supplied permission has either a <code>null</code> object name
|
|
* or its object name matches the object name of this permission. If the
|
|
* object name of this permission is a pattern, {@link ObjectName#apply(ObjectName)}
|
|
* may be used as well.</li>
|
|
* <li>The supplied permission's actions are a subset of the actions
|
|
* of this permission. If the <code>queryMBeans</code> action is presented,
|
|
* the <code>queryNames</code> action is implied.</li>
|
|
* </ul>
|
|
*
|
|
* @param p the permission to check that this permission implies.
|
|
* @return true if this permission implies <code>p</code>.
|
|
*/
|
|
public boolean implies(Permission p)
|
|
{
|
|
if (p instanceof MBeanPermission)
|
|
{
|
|
MBeanPermission mp = (MBeanPermission) p;
|
|
NameHolder pName = new NameHolder(mp.getName());
|
|
NameHolder name = new NameHolder(getName());
|
|
if (!(name.equals(pName)))
|
|
return false;
|
|
for (String nextAction : mp.actionSet)
|
|
{
|
|
boolean found = actions.contains(nextAction);
|
|
if (!found)
|
|
if (nextAction.equals("queryNames"))
|
|
found = actions.contains("queryMBeans");
|
|
if (!found)
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Small helper class to handle deconstruction of the name.
|
|
*
|
|
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
|
|
*/
|
|
private class NameHolder
|
|
{
|
|
|
|
/**
|
|
* The class name.
|
|
*/
|
|
private String className;
|
|
|
|
/**
|
|
* The member.
|
|
*/
|
|
private String member;
|
|
|
|
/**
|
|
* The object name.
|
|
*/
|
|
private ObjectName objectName;
|
|
|
|
/**
|
|
* Constructs a broken-down name from a given name.
|
|
*
|
|
* @param name the name to break down.
|
|
*/
|
|
public NameHolder(String name)
|
|
{
|
|
String objectName = null;
|
|
int memberIndex = name.indexOf("#");
|
|
int onIndex = name.indexOf("[");
|
|
if (onIndex == -1)
|
|
{
|
|
if (memberIndex == -1)
|
|
className = name;
|
|
else
|
|
{
|
|
className = name.substring(0, memberIndex);
|
|
member = name.substring(memberIndex + 1);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (memberIndex == -1)
|
|
{
|
|
className = name.substring(0, onIndex);
|
|
objectName = name.substring(onIndex + 1,
|
|
name.length() - 1);
|
|
}
|
|
else
|
|
{
|
|
className = name.substring(0, memberIndex);
|
|
member = name.substring(memberIndex + 1, onIndex);
|
|
objectName = name.substring(onIndex + 1,
|
|
name.length() - 1);
|
|
}
|
|
}
|
|
if (className.equals("-"))
|
|
className = null;
|
|
if (member.equals("-"))
|
|
member = null;
|
|
if (objectName == null || objectName.equals("-"))
|
|
this.objectName = null;
|
|
else
|
|
try
|
|
{
|
|
this.objectName = new ObjectName(objectName);
|
|
}
|
|
catch (MalformedObjectNameException e)
|
|
{
|
|
throw (Error)
|
|
(new InternalError("Invalid object name.").initCause(e));
|
|
}
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Returns true if the supplied object is also a
|
|
* {@link NameHolder} and the following holds:
|
|
* </p>
|
|
* <ul>
|
|
* <li>The supplied classname is <code>null</code> or the two match. A
|
|
* classname of <code>"*"</code> for this holder always matches
|
|
* the classname of the supplied holder. Generally, <code>'*'</code>
|
|
* acts as a wildcard, so <code>".*"</code> matches <code>'.'</code>
|
|
* followed by anything.</li>
|
|
* <li>The supplied name holder has either a <code>null</code> member
|
|
* or its member matches the member of this name holder. A member of
|
|
* <code>"*"</code> for this name holder always matches the member
|
|
* of the supplied name holder.</li>
|
|
* <li>The supplied name holder has either a <code>null</code> object name
|
|
* or its object name matches the object name of this name holder. If the
|
|
* object name of this name holder is a pattern,
|
|
* {@link ObjectName#apply(ObjectName)} may be used as well.</li>
|
|
* </ul>
|
|
*
|
|
* @param obj the object to compare with this.
|
|
* @return true if the above holds.
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (obj instanceof NameHolder)
|
|
{
|
|
NameHolder nh = (NameHolder) obj;
|
|
boolean cn = false;
|
|
String ocn = nh.getClassName();
|
|
if (ocn == null || className.equals("*"))
|
|
cn = true;
|
|
else
|
|
{
|
|
int wcIndex = className.indexOf("*");
|
|
if (wcIndex != -1)
|
|
cn = ocn.startsWith(className.substring(0, wcIndex));
|
|
else
|
|
cn = ocn.equals(className);
|
|
}
|
|
boolean m = false;
|
|
String om = nh.getMember();
|
|
if (om == null || member.equals("*"))
|
|
m = true;
|
|
else
|
|
m = om.equals(member);
|
|
boolean on = false;
|
|
ObjectName oon = nh.getObjectName();
|
|
if (oon == null)
|
|
on = true;
|
|
else if (objectName.isPattern())
|
|
on = objectName.apply(oon);
|
|
else
|
|
on = oon.equals(objectName);
|
|
return (cn && m && on);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Returns the class name.
|
|
*/
|
|
public String getClassName()
|
|
{
|
|
return className;
|
|
}
|
|
|
|
/**
|
|
* Returns the member.
|
|
*/
|
|
public String getMember()
|
|
{
|
|
return member;
|
|
}
|
|
|
|
/**
|
|
* Returns the object name.
|
|
*/
|
|
public ObjectName getObjectName()
|
|
{
|
|
return objectName;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Updates the action set from the current value of
|
|
* the actions string.
|
|
*/
|
|
private void updateActionSet()
|
|
{
|
|
String[] actionsArray = actions.split(",");
|
|
actionSet = new TreeSet<String>();
|
|
for (int a = 0; a < actionsArray.length; ++a)
|
|
actionSet.add(actionsArray[a].trim());
|
|
}
|
|
|
|
/**
|
|
* Reads the object from a stream and ensures the incoming
|
|
* data is valid.
|
|
*
|
|
* @param in the input stream.
|
|
* @throws IOException if an I/O error occurs.
|
|
* @throws ClassNotFoundException if a class used by the object
|
|
* can not be found.
|
|
*/
|
|
private void readObject(ObjectInputStream in)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
in.defaultReadObject();
|
|
updateActionSet();
|
|
checkActions();
|
|
}
|
|
|
|
/**
|
|
* Checks that the actions used in this permission
|
|
* are from the valid set.
|
|
*
|
|
* @throws IllegalArgumentException if the name or actions are invalid.
|
|
*/
|
|
private void checkActions()
|
|
{
|
|
for (String action : actionSet)
|
|
{
|
|
if (!(validSet.contains(action)))
|
|
throw new IllegalArgumentException("Invalid action "
|
|
+ action + " found.");
|
|
}
|
|
}
|
|
|
|
}
|
|
|