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
637 lines
17 KiB
Java
637 lines
17 KiB
Java
/* SocketPermission.java -- Class modeling permissions for socket operations
|
|
Copyright (C) 1998, 2000, 2001, 2002, 2004, 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 java.net;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.IOException;
|
|
import java.io.ObjectInputStream;
|
|
import java.io.ObjectOutputStream;
|
|
import java.io.Serializable;
|
|
import java.security.Permission;
|
|
import java.security.PermissionCollection;
|
|
import java.util.StringTokenizer;
|
|
|
|
|
|
/**
|
|
* This class models a specific set of permssions for connecting to a
|
|
* host. There are two elements to this, the host/port combination and
|
|
* the permission list.
|
|
* <p>
|
|
* The host/port combination is specified as followed
|
|
* <p>
|
|
* <pre>
|
|
* hostname[:[-]port[-[port]]]
|
|
* </pre>
|
|
* <p>
|
|
* The hostname portion can be either a hostname or IP address. If it is
|
|
* a hostname, a wildcard is allowed in hostnames. This wildcard is a "*"
|
|
* and matches one or more characters. Only one "*" may appear in the
|
|
* host and it must be the leftmost character. For example,
|
|
* "*.urbanophile.com" matches all hosts in the "urbanophile.com" domain.
|
|
* <p>
|
|
* The port portion can be either a single value, or a range of values
|
|
* treated as inclusive. The first or the last port value in the range
|
|
* can be omitted in which case either the minimum or maximum legal
|
|
* value for a port (respectively) is used by default. Here are some
|
|
* examples:
|
|
* <p><ul>
|
|
* <li>8080 - Represents port 8080 only</li>
|
|
* <li>2000-3000 - Represents ports 2000 through 3000 inclusive</li>
|
|
* <li>-4000 - Represents ports 0 through 4000 inclusive</li>
|
|
* <li>1024- - Represents ports 1024 through 65535 inclusive</li>
|
|
* </ul><p>
|
|
* The permission list is a comma separated list of individual permissions.
|
|
* These individual permissions are:
|
|
* <p>
|
|
* <pre>
|
|
* accept
|
|
* connect
|
|
* listen
|
|
* resolve
|
|
* </pre>
|
|
* <p>
|
|
* The "listen" permission is only relevant if the host is localhost. If
|
|
* any permission at all is specified, then resolve permission is implied to
|
|
* exist.
|
|
* <p>
|
|
* Here are a variety of examples of how to create SocketPermission's
|
|
* <p><pre>
|
|
* SocketPermission("www.urbanophile.com", "connect");
|
|
* Can connect to any port on www.urbanophile.com
|
|
* SocketPermission("www.urbanophile.com:80", "connect,accept");
|
|
* Can connect to or accept connections from www.urbanophile.com on port 80
|
|
* SocketPermission("localhost:1024-", "listen,accept,connect");
|
|
* Can connect to, accept from, an listen on any local port number 1024
|
|
* and up.
|
|
* SocketPermission("*.edu", "connect");
|
|
* Can connect to any host in the edu domain
|
|
* SocketPermission("197.197.20.1", "accept");
|
|
* Can accept connections from 197.197.20.1
|
|
* </pre><p>
|
|
*
|
|
* This class also supports IPv6 addresses. These should be specified
|
|
* in either RFC 2732 format or in full uncompressed form.
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @author Written by Aaron M. Renn (arenn@urbanophile.com)
|
|
* @author Extensively modified by Gary Benson (gbenson@redhat.com)
|
|
*/
|
|
public final class SocketPermission extends Permission implements Serializable
|
|
{
|
|
static final long serialVersionUID = -7204263841984476862L;
|
|
|
|
/**
|
|
* A hostname (possibly wildcarded). Will be set if and only if
|
|
* this object was initialized with a hostname.
|
|
*/
|
|
private transient String hostname = null;
|
|
|
|
/**
|
|
* An IP address (IPv4 or IPv6). Will be set if and only if this
|
|
* object was initialized with a single literal IP address.
|
|
*/
|
|
private transient InetAddress address = null;
|
|
|
|
/**
|
|
* A range of ports.
|
|
*/
|
|
private transient int minport;
|
|
private transient int maxport;
|
|
|
|
/**
|
|
* Values used for minimum and maximum ports when one or both bounds
|
|
* are omitted. This class is essentially independent of the
|
|
* networking code it describes, so we do not limit ports to the
|
|
* usual network limits of 1 and 65535.
|
|
*/
|
|
private static final int MIN_PORT = 0;
|
|
private static final int MAX_PORT = Integer.MAX_VALUE;
|
|
|
|
/**
|
|
* The actions for which we have permission. This field is present
|
|
* to make the serialized form correct and should not be used by
|
|
* anything other than writeObject: everything else should use
|
|
* actionmask.
|
|
*/
|
|
private String actions;
|
|
|
|
/**
|
|
* A bitmask representing the actions for which we have permission.
|
|
*/
|
|
private transient int actionmask;
|
|
|
|
/**
|
|
* The available actions, in the canonical order required for getActions().
|
|
*/
|
|
private static final String[] ACTIONS = new String[] {
|
|
"connect", "listen", "accept", "resolve"};
|
|
|
|
/**
|
|
* Initializes a new instance of <code>SocketPermission</code> with the
|
|
* specified host/port combination and actions string.
|
|
*
|
|
* @param hostport The hostname/port number combination
|
|
* @param actions The actions string
|
|
*/
|
|
public SocketPermission(String hostport, String actions)
|
|
{
|
|
super(processHostport(hostport));
|
|
|
|
setHostPort(getName());
|
|
setActions(actions);
|
|
}
|
|
|
|
/**
|
|
* There are two cases in which hostport needs rewriting before
|
|
* being passed to the superclass constructor. If hostport is an
|
|
* empty string then it is substituted with "localhost". And if
|
|
* the host part of hostport is a literal IPv6 address in the full
|
|
* uncompressed form not enclosed with "[" and "]" then we enclose
|
|
* it with them.
|
|
*/
|
|
private static String processHostport(String hostport)
|
|
{
|
|
if (hostport.length() == 0)
|
|
return "localhost";
|
|
|
|
if (hostport.charAt(0) == '[')
|
|
return hostport;
|
|
|
|
int colons = 0;
|
|
boolean colon_allowed = true;
|
|
for (int i = 0; i < hostport.length(); i++)
|
|
{
|
|
if (hostport.charAt(i) == ':')
|
|
{
|
|
if (!colon_allowed)
|
|
throw new IllegalArgumentException("Ambiguous hostport part");
|
|
colons++;
|
|
colon_allowed = false;
|
|
}
|
|
else
|
|
colon_allowed = true;
|
|
}
|
|
|
|
switch (colons)
|
|
{
|
|
case 0:
|
|
case 1:
|
|
// a hostname or IPv4 address
|
|
return hostport;
|
|
|
|
case 7:
|
|
// an IPv6 address with no ports
|
|
return "[" + hostport + "]";
|
|
|
|
case 8:
|
|
// an IPv6 address with ports
|
|
int last_colon = hostport.lastIndexOf(':');
|
|
return "[" + hostport.substring(0, last_colon) + "]"
|
|
+ hostport.substring(last_colon);
|
|
|
|
default:
|
|
throw new IllegalArgumentException("Ambiguous hostport part");
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Parse the hostport argument to the constructor.
|
|
*/
|
|
private void setHostPort(String hostport)
|
|
{
|
|
// Split into host and ports
|
|
String host, ports;
|
|
if (hostport.charAt(0) == '[')
|
|
{
|
|
// host is a bracketed IPv6 address
|
|
int end = hostport.indexOf("]");
|
|
if (end == -1)
|
|
throw new IllegalArgumentException("Unmatched '['");
|
|
host = hostport.substring(1, end);
|
|
|
|
address = InetAddress.getByLiteral(host);
|
|
if (address == null)
|
|
throw new IllegalArgumentException("Bad IPv6 address");
|
|
|
|
if (end == hostport.length() - 1)
|
|
ports = "";
|
|
else if (hostport.charAt(end + 1) == ':')
|
|
ports = hostport.substring(end + 2);
|
|
else
|
|
throw new IllegalArgumentException("Bad character after ']'");
|
|
}
|
|
else
|
|
{
|
|
// host is a hostname or IPv4 address
|
|
int sep = hostport.indexOf(":");
|
|
if (sep == -1)
|
|
{
|
|
host = hostport;
|
|
ports = "";
|
|
}
|
|
else
|
|
{
|
|
host = hostport.substring(0, sep);
|
|
ports = hostport.substring(sep + 1);
|
|
}
|
|
|
|
address = InetAddress.getByLiteral(host);
|
|
if (address == null)
|
|
{
|
|
if (host.lastIndexOf('*') > 0)
|
|
throw new IllegalArgumentException("Bad hostname");
|
|
|
|
hostname = host;
|
|
}
|
|
}
|
|
|
|
// Parse and validate the ports
|
|
if (ports.length() == 0)
|
|
{
|
|
minport = MIN_PORT;
|
|
maxport = MAX_PORT;
|
|
}
|
|
else
|
|
{
|
|
int sep = ports.indexOf("-");
|
|
if (sep == -1)
|
|
{
|
|
// a single port
|
|
minport = maxport = Integer.parseInt(ports);
|
|
}
|
|
else
|
|
{
|
|
if (ports.indexOf("-", sep + 1) != -1)
|
|
throw new IllegalArgumentException("Unexpected '-'");
|
|
|
|
if (sep == 0)
|
|
{
|
|
// an upper bound
|
|
minport = MIN_PORT;
|
|
maxport = Integer.parseInt(ports.substring(1));
|
|
}
|
|
else if (sep == ports.length() - 1)
|
|
{
|
|
// a lower bound
|
|
minport =
|
|
Integer.parseInt(ports.substring(0, ports.length() - 1));
|
|
maxport = MAX_PORT;
|
|
}
|
|
else
|
|
{
|
|
// a range with two bounds
|
|
minport = Integer.parseInt(ports.substring(0, sep));
|
|
maxport = Integer.parseInt(ports.substring(sep + 1));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Parse the actions argument to the constructor.
|
|
*/
|
|
private void setActions(String actionstring)
|
|
{
|
|
actionmask = 0;
|
|
|
|
boolean resolve_needed = false;
|
|
boolean resolve_present = false;
|
|
|
|
StringTokenizer t = new StringTokenizer(actionstring, ",");
|
|
while (t.hasMoreTokens())
|
|
{
|
|
String action = t.nextToken();
|
|
action = action.trim().toLowerCase();
|
|
setAction(action);
|
|
|
|
if (action.equals("resolve"))
|
|
resolve_present = true;
|
|
else
|
|
resolve_needed = true;
|
|
}
|
|
|
|
if (resolve_needed && !resolve_present)
|
|
setAction("resolve");
|
|
}
|
|
|
|
/**
|
|
* Parse one element of the actions argument to the constructor.
|
|
*/
|
|
private void setAction(String action)
|
|
{
|
|
for (int i = 0; i < ACTIONS.length; i++)
|
|
{
|
|
if (action.equals(ACTIONS[i]))
|
|
{
|
|
actionmask |= 1 << i;
|
|
return;
|
|
}
|
|
}
|
|
throw new IllegalArgumentException("Unknown action " + action);
|
|
}
|
|
|
|
/**
|
|
* Tests this object for equality against another. This will be true if
|
|
* and only if the passed object is an instance of
|
|
* <code>SocketPermission</code> and both its hostname/port combination
|
|
* and permissions string are identical.
|
|
*
|
|
* @param obj The object to test against for equality
|
|
*
|
|
* @return <code>true</code> if object is equal to this object,
|
|
* <code>false</code> otherwise.
|
|
*/
|
|
public boolean equals(Object obj)
|
|
{
|
|
SocketPermission p;
|
|
|
|
if (obj instanceof SocketPermission)
|
|
p = (SocketPermission) obj;
|
|
else
|
|
return false;
|
|
|
|
if (p.actionmask != actionmask ||
|
|
p.minport != minport ||
|
|
p.maxport != maxport)
|
|
return false;
|
|
|
|
if (address != null)
|
|
{
|
|
if (p.address == null)
|
|
return false;
|
|
else
|
|
return p.address.equals(address);
|
|
}
|
|
else
|
|
{
|
|
if (p.hostname == null)
|
|
return false;
|
|
else
|
|
return p.hostname.equals(hostname);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a hash code value for this object. Overrides the
|
|
* <code>Permission.hashCode()</code>.
|
|
*
|
|
* @return A hash code
|
|
*/
|
|
public int hashCode()
|
|
{
|
|
int code = actionmask + minport + maxport;
|
|
if (address != null)
|
|
code += address.hashCode();
|
|
else
|
|
code += hostname.hashCode();
|
|
return code;
|
|
}
|
|
|
|
/**
|
|
* Returns the list of permission actions in this object in canonical
|
|
* order. The canonical order is "connect,listen,accept,resolve"
|
|
*
|
|
* @return The permitted action string.
|
|
*/
|
|
public String getActions()
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder("");
|
|
|
|
for (int i = 0; i < ACTIONS.length; i++)
|
|
{
|
|
if ((actionmask & (1 << i)) != 0)
|
|
{
|
|
if (sb.length() != 0)
|
|
sb.append(",");
|
|
sb.append(ACTIONS[i]);
|
|
}
|
|
}
|
|
|
|
return sb.toString();
|
|
}
|
|
|
|
/**
|
|
* Returns a new <code>PermissionCollection</code> object that can hold
|
|
* <code>SocketPermission</code>'s.
|
|
*
|
|
* @return A new <code>PermissionCollection</code>.
|
|
*/
|
|
public PermissionCollection newPermissionCollection()
|
|
{
|
|
// FIXME: Implement
|
|
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Returns an array of all IP addresses represented by this object.
|
|
*/
|
|
private InetAddress[] getAddresses()
|
|
{
|
|
if (address != null)
|
|
return new InetAddress[] {address};
|
|
|
|
try
|
|
{
|
|
return InetAddress.getAllByName(hostname);
|
|
}
|
|
catch (UnknownHostException e)
|
|
{
|
|
return new InetAddress[0];
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the canonical hostname represented by this object,
|
|
* or null if this object represents a wildcarded domain.
|
|
*/
|
|
private String getCanonicalHostName()
|
|
{
|
|
if (address != null)
|
|
return address.internalGetCanonicalHostName();
|
|
if (hostname.charAt(0) == '*')
|
|
return null;
|
|
try
|
|
{
|
|
return InetAddress.getByName(hostname).internalGetCanonicalHostName();
|
|
}
|
|
catch (UnknownHostException e)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns true if the permission object passed it is implied by the
|
|
* this permission. This will be true if:
|
|
*
|
|
* <ul>
|
|
* <li>The argument is of type <code>SocketPermission</code></li>
|
|
* <li>The actions list of the argument are in this object's actions</li>
|
|
* <li>The port range of the argument is within this objects port range</li>
|
|
* <li>The hostname is equal to or a subset of this objects hostname</li>
|
|
* </ul>
|
|
*
|
|
* <p>The argument's hostname will be a subset of this object's hostname if:</p>
|
|
*
|
|
* <ul>
|
|
* <li>The argument's hostname or IP address is equal to this object's.</li>
|
|
* <li>The argument's canonical hostname is equal to this object's.</li>
|
|
* <li>The argument's canonical name matches this domains hostname with
|
|
* wildcards</li>
|
|
* </ul>
|
|
*
|
|
* @param perm The <code>Permission</code> to check against
|
|
*
|
|
* @return <code>true</code> if the <code>Permission</code> is implied by
|
|
* this object, <code>false</code> otherwise.
|
|
*/
|
|
public boolean implies(Permission perm)
|
|
{
|
|
SocketPermission p;
|
|
|
|
// First make sure we are the right object type
|
|
if (perm instanceof SocketPermission)
|
|
p = (SocketPermission) perm;
|
|
else
|
|
return false;
|
|
|
|
// If p was initialised with an empty hostname then we do not
|
|
// imply it. This is not part of the spec, but it seems necessary.
|
|
if (p.hostname != null && p.hostname.length() == 0)
|
|
return false;
|
|
|
|
// Next check the actions
|
|
if ((p.actionmask & actionmask) != p.actionmask)
|
|
return false;
|
|
|
|
// Then check the ports
|
|
if ((p.minport < minport) || (p.maxport > maxport))
|
|
return false;
|
|
|
|
// Finally check the hosts
|
|
String p_canon = null;
|
|
|
|
// Return true if this object was initialized with a single
|
|
// IP address which one of p's IP addresses is equal to.
|
|
if (address != null)
|
|
{
|
|
InetAddress[] addrs = p.getAddresses();
|
|
for (int i = 0; i < addrs.length; i++)
|
|
{
|
|
if (address.equals(addrs[i]))
|
|
return true;
|
|
}
|
|
}
|
|
|
|
// Return true if this object is a wildcarded domain that
|
|
// p's canonical name matches.
|
|
if (hostname != null && hostname.charAt(0) == '*')
|
|
{
|
|
p_canon = p.getCanonicalHostName();
|
|
if (p_canon != null && p_canon.endsWith(hostname.substring(1)))
|
|
return true;
|
|
|
|
}
|
|
|
|
// Return true if this one of this object's IP addresses
|
|
// is equal to one of p's.
|
|
if (address == null)
|
|
{
|
|
InetAddress[] addrs = p.getAddresses();
|
|
InetAddress[] p_addrs = p.getAddresses();
|
|
|
|
for (int i = 0; i < addrs.length; i++)
|
|
{
|
|
for (int j = 0; j < p_addrs.length; j++)
|
|
{
|
|
if (addrs[i].equals(p_addrs[j]))
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Return true if this object's canonical name equals p's.
|
|
String canon = getCanonicalHostName();
|
|
if (canon != null)
|
|
{
|
|
if (p_canon == null)
|
|
p_canon = p.getCanonicalHostName();
|
|
if (p_canon != null && canon.equals(p_canon))
|
|
return true;
|
|
}
|
|
|
|
// Didn't make it
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Deserializes a <code>SocketPermission</code> object from
|
|
* an input stream.
|
|
*
|
|
* @param input the input stream.
|
|
* @throws IOException if an I/O error occurs in the stream.
|
|
* @throws ClassNotFoundException if the class of the
|
|
* serialized object could not be found.
|
|
*/
|
|
private void readObject(ObjectInputStream input)
|
|
throws IOException, ClassNotFoundException
|
|
{
|
|
input.defaultReadObject();
|
|
setHostPort(getName());
|
|
setActions(actions);
|
|
}
|
|
|
|
/**
|
|
* Serializes a <code>SocketPermission</code> object to an
|
|
* output stream.
|
|
*
|
|
* @param output the output stream.
|
|
* @throws IOException if an I/O error occurs in the stream.
|
|
*/
|
|
private void writeObject(ObjectOutputStream output)
|
|
throws IOException
|
|
{
|
|
actions = getActions();
|
|
output.defaultWriteObject();
|
|
}
|
|
}
|