
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
531 lines
20 KiB
Java
531 lines
20 KiB
Java
/* Activatable.java -- A common ancestor for the activatable objects.
|
|
Copyright (c) 1996, 1997, 1998, 1999, 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.rmi.activation;
|
|
|
|
import gnu.java.rmi.server.ActivatableServerRef;
|
|
import gnu.java.rmi.server.UnicastServer;
|
|
import gnu.java.rmi.server.UnicastServerRef;
|
|
|
|
import java.lang.reflect.Field;
|
|
import java.rmi.MarshalledObject;
|
|
import java.rmi.NoSuchObjectException;
|
|
import java.rmi.Remote;
|
|
import java.rmi.RemoteException;
|
|
import java.rmi.server.ObjID;
|
|
import java.rmi.server.RMIClientSocketFactory;
|
|
import java.rmi.server.RMIServerSocketFactory;
|
|
import java.rmi.server.RemoteObject;
|
|
import java.rmi.server.RemoteServer;
|
|
import java.rmi.server.UnicastRemoteObject;
|
|
|
|
/**
|
|
* A common ancestor for the implementations of the activatable objects. Such
|
|
* objects require persistent access over time and can be activated by the
|
|
* system. The derived classes also implements the needed interface of some
|
|
* remote object and usually have the two parameter constructor, the first
|
|
* parameter being the {@link ActivationID} and the second the
|
|
* {@link MarshalledObject}. Activatable is the main class that developers need
|
|
* to use to implement and manage activatable objects. It also contains methods
|
|
* for making activatable remote objects that are not derived from the
|
|
* Activatable class.
|
|
*
|
|
* @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub)
|
|
*/
|
|
public abstract class Activatable
|
|
extends RemoteServer
|
|
{
|
|
|
|
/**
|
|
* Use SVUID for interoperability.
|
|
*/
|
|
static final long serialVersionUID = - 3120617863591563455L;
|
|
|
|
/**
|
|
* The object activation id.
|
|
*/
|
|
final ActivationID id;
|
|
|
|
/**
|
|
* This constructor is used to register export the object on the given port. A
|
|
* subclass of the Activatable class calls this constructor to register and
|
|
* export the object during initial construction. As a side-effect of
|
|
* activatable object construction, the remote object is both "registered"
|
|
* with the activation system and "exported" (on an anonymous port, if port is
|
|
* zero) to the RMI runtime so that it is available to accept incoming calls
|
|
* from clients.
|
|
*
|
|
* @param codebase the object code base url
|
|
* @param data the data, needed to activate the object.
|
|
* @param restart specifies reactivation mode after crash. If true, the object
|
|
* is activated when activator is restarted or the activation group
|
|
* is restarted. If false, the object is only activated on demand.
|
|
* This flag does has no effect during the normal operation (the
|
|
* object is normally activated on demand).
|
|
* @param port the port, on which the object will become available. The value
|
|
* 0 means anonymous port.
|
|
* @throws ActivationException if the activation failed
|
|
* @throws RemoteException if the remote call failed.
|
|
*/
|
|
protected Activatable(String codebase, MarshalledObject<?> data,
|
|
boolean restart, int port) throws ActivationException,
|
|
RemoteException
|
|
{
|
|
ActivationDesc descriptor = new ActivationDesc(getClass().getName(),
|
|
codebase, data, restart);
|
|
id = obtainId(descriptor);
|
|
exportObject(this, id, port);
|
|
}
|
|
|
|
/**
|
|
* This constructor is used to register export the object on the given port,
|
|
* additionally specifying the socket factories. A subclass of the Activatable
|
|
* class calls this constructor to register and export the object during
|
|
* initial construction.
|
|
*
|
|
* @param codebase the object code base url
|
|
* @param data the data, needed to activate the object.
|
|
* @param restart specifies reactivation mode after crash. If true, the object
|
|
* is activated when activator is restarted or the activation group
|
|
* is restarted. If false, the object is only activated on demand.
|
|
* This flag does has no effect during the normal operation (the
|
|
* object is normally activated on demand).
|
|
* @param port the port, on which the object will become available. The value
|
|
* 0 means anonymous port.
|
|
* @param csf the client socket factory
|
|
* @param ssf the server socket factory
|
|
* @throws ActivationException if the activation failed
|
|
* @throws RemoteException if the remote call failed.
|
|
*/
|
|
protected Activatable(String codebase, MarshalledObject<?> data,
|
|
boolean restart, int port, RMIClientSocketFactory csf,
|
|
RMIServerSocketFactory ssf) throws ActivationException,
|
|
RemoteException
|
|
{
|
|
ActivationDesc descriptor = new ActivationDesc(getClass().getName(),
|
|
codebase, data, restart);
|
|
id = obtainId(descriptor);
|
|
exportObject(this, id, port);
|
|
}
|
|
|
|
/**
|
|
* Creates the new instance of activatable with the given activation id and is
|
|
* listening at the given port. A subclass of the Activatable class calls this
|
|
* constructor when the object itself is activated via its special
|
|
* "activation" constructor with the two parameters ({@link ActivationID},
|
|
* {@link MarshalledObject}). As a side effect, the object is exported and is
|
|
* available to accept incomming calls.
|
|
*
|
|
* @param anId the activation id
|
|
* @param port the port, on which the activatable will be listening
|
|
* @throws RemoteException if the activation failed.
|
|
*/
|
|
protected Activatable(ActivationID anId, int port) throws RemoteException
|
|
{
|
|
id = anId;
|
|
try
|
|
{
|
|
exportObject(this, anId, port);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
e.printStackTrace();
|
|
RemoteException acex =
|
|
new RemoteException("cannot export Activatable", e);
|
|
throw acex;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates the new instance of activatable with the given activation id and is
|
|
* listening at the given port, using the specified client and server sockets
|
|
* factories. A subclass of the Activatable class calls this
|
|
* constructor when the object itself is activated via its special
|
|
* "activation" constructor with the two parameters ({@link ActivationID},
|
|
* {@link MarshalledObject}). As a side effect, the object is exported and is
|
|
* available to accept incomming calls.
|
|
*
|
|
* @param anId the activation id
|
|
* @param port the port, on which the activatable will be listening
|
|
* @param csf the client socket factory
|
|
* @param ssf the server socket factory
|
|
*
|
|
* @throws RemoteException if the remote call failed
|
|
*/
|
|
protected Activatable(ActivationID anId, int port, RMIClientSocketFactory csf,
|
|
RMIServerSocketFactory ssf) throws RemoteException
|
|
{
|
|
id = anId;
|
|
try
|
|
{
|
|
exportObject(this, anId, port, csf, ssf);
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
RemoteException acex = new RemoteException();
|
|
acex.initCause(e);
|
|
throw acex;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get the objects activation identifier.
|
|
*
|
|
* @return the object activation identifier
|
|
*/
|
|
protected ActivationID getID()
|
|
{
|
|
return id;
|
|
}
|
|
|
|
/**
|
|
* Obtain the activation Id from the activation descriptor by registering
|
|
* within the current group.
|
|
*/
|
|
static ActivationID obtainId(ActivationDesc descriptor)
|
|
throws RemoteException, UnknownGroupException, ActivationException
|
|
{
|
|
ActivationGroupID id = descriptor.getGroupID();
|
|
ActivationSystem system;
|
|
|
|
if (id != null)
|
|
system = id.getSystem();
|
|
else
|
|
system = ActivationGroup.currentGroupID().getSystem();
|
|
return system.registerObject(descriptor);
|
|
}
|
|
|
|
/**
|
|
* This method registers an activatable object. The object is expected to be
|
|
* on the anonymous port (null client and server socket factories).
|
|
*
|
|
* @param desc the object description.
|
|
* @return the remote stub for the activatable object (the first call on this
|
|
* stub will activate the object).
|
|
* @throws UnknownGroupException if the object group identifier is unknown
|
|
* @throws ActivationException if the activation system is not running
|
|
* @throws RemoteException if the remote call fails
|
|
*/
|
|
public static Remote register(ActivationDesc desc)
|
|
throws UnknownGroupException, ActivationException, RemoteException
|
|
{
|
|
ActivationID id = obtainId(desc);
|
|
try
|
|
{
|
|
return toStub(
|
|
id,
|
|
Thread.currentThread().getContextClassLoader().loadClass(
|
|
desc.getClassName()));
|
|
}
|
|
catch (ClassNotFoundException e)
|
|
{
|
|
throw new ActivationException("Class not found: "+desc.getClassName());
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Inactivates and unexports the object. The subsequent calls will activate
|
|
* the object again. The object is not inactivated if it is currently
|
|
* executing calls.
|
|
*
|
|
* @param id the id of the object being inactivated
|
|
* @return true if the object has been inactivated, false if it has not been
|
|
* inactivated because of the running or pending calls.
|
|
* @throws UnknownObjectException if the object is unknown.
|
|
* @throws ActivationException if the object group is not active
|
|
* @throws RemoteException if the remote call fails
|
|
*/
|
|
public static boolean inactive(ActivationID id)
|
|
throws UnknownObjectException, ActivationException, RemoteException
|
|
{
|
|
if (id.group!=null)
|
|
id.group.inactiveObject(id);
|
|
return UnicastRemoteObject.unexportObject(id.activate(false), false);
|
|
}
|
|
|
|
/**
|
|
* Unregister the object (the object will no longer be activable with that id)
|
|
*
|
|
* @param id the object id
|
|
* @throws UnknownObjectException if the id is unknown
|
|
* @throws ActivationException if the activation system is not running
|
|
* @throws RemoteException if the remote call fails.
|
|
*/
|
|
public static void unregister(ActivationID id) throws UnknownObjectException,
|
|
ActivationException, RemoteException
|
|
{
|
|
ActivationGroup.currentGroupId.getSystem().unregisterObject(id);
|
|
UnicastServer.unregisterActivatable(id);
|
|
}
|
|
|
|
/**
|
|
* Register and export the object that activatable object that is not derived
|
|
* from the Activatable super class. It creates and registers the object
|
|
* activation descriptor. There is no need to call this method if the object
|
|
* extends Activable, as its work is done in the constructor
|
|
* {@link #Activatable(String, MarshalledObject, boolean, int)}.
|
|
*
|
|
* @param obj the object, that is exported, becoming available at the given
|
|
* port.
|
|
* @param location the object code location (codebase).
|
|
* @param data the data, needed to activate the object
|
|
* @param restart the restart mode
|
|
* @param port the port, where the object will be available
|
|
*
|
|
* @return the created object activation ID.
|
|
*
|
|
* @throws ActivationException if the activation group is not active
|
|
* @throws RemoteException if the registration or export fails
|
|
*/
|
|
public static ActivationID exportObject(Remote obj, String location,
|
|
MarshalledObject<?> data,
|
|
boolean restart, int port)
|
|
throws ActivationException, RemoteException
|
|
{
|
|
ActivationDesc descriptor = new ActivationDesc(obj.getClass().getName(),
|
|
location, data, restart);
|
|
ActivationID id = obtainId(descriptor);
|
|
Remote stub = exportObject(obj, id, port);
|
|
return id;
|
|
}
|
|
|
|
/**
|
|
* Register and export the object that activatable object that is not derived
|
|
* from the Activatable super class. It creates and registers the object
|
|
* activation descriptor. There is no need to call this method if the object
|
|
* extends Activable, as its work is done in the constructor
|
|
* {@link #Activatable(String, MarshalledObject, boolean, int, RMIClientSocketFactory, RMIServerSocketFactory)}
|
|
*
|
|
* @param obj the object, that is exported, becoming available at the given
|
|
* port.
|
|
* @param location the object code location (codebase).
|
|
* @param data the data, needed to activate the object
|
|
* @param restart the restart mode
|
|
* @param port the port, where the object will be available
|
|
* @param csf the client socket factory
|
|
* @param ssf the server socket factory
|
|
*
|
|
* @return the created object activation ID.
|
|
*
|
|
* @throws ActivationException if the activation group is not active
|
|
* @throws RemoteException if the registration or export fails
|
|
*/
|
|
public static ActivationID exportObject(Remote obj, String location,
|
|
MarshalledObject data,
|
|
boolean restart, int port,
|
|
RMIClientSocketFactory csf,
|
|
RMIServerSocketFactory ssf)
|
|
throws ActivationException, RemoteException
|
|
{
|
|
ActivationDesc descriptor = new ActivationDesc(obj.getClass().getName(),
|
|
location, data, restart);
|
|
ActivationID id = obtainId(descriptor);
|
|
Remote stub = exportObject(obj, id, port, csf, ssf);
|
|
return id;
|
|
|
|
}
|
|
|
|
/**
|
|
* During activation, this exportObject method should be invoked explicitly by
|
|
* the activatable object, that does is not derived from the Activatable
|
|
* class. There is no need to call this method if the object extends
|
|
* Activable, as its work is done in the constructor
|
|
* {@link #Activatable(ActivationID, int)}
|
|
*
|
|
* @param obj the object
|
|
* @param id the known activation id
|
|
* @param port the object port
|
|
*
|
|
* @return the remote stub of the activatable object
|
|
*
|
|
* @throws RemoteException if the object export fails
|
|
*/
|
|
public static Remote exportObject(Remote obj, ActivationID id, int port)
|
|
throws RemoteException
|
|
{
|
|
Remote stub = export(id, obj, port, null);
|
|
return stub;
|
|
}
|
|
|
|
/**
|
|
* During activation, this exportObject method should be invoked explicitly by
|
|
* the activatable object, that does is not derived from the Activatable
|
|
* class. There is no need to call this method if the object extends
|
|
* Activable, as its work is done in the constructor
|
|
* {@link #Activatable(ActivationID, int)}
|
|
*
|
|
* @param obj the object
|
|
* @param id the known activation id
|
|
* @param port the object port
|
|
* @param csf the client socket factory
|
|
* @param ssf the server socket factory
|
|
*
|
|
* @return the remote stub of the activatable object
|
|
*
|
|
* @throws RemoteException if the object export fails
|
|
*/
|
|
public static Remote exportObject(Remote obj, ActivationID id, int port,
|
|
RMIClientSocketFactory csf,
|
|
RMIServerSocketFactory ssf)
|
|
throws RemoteException
|
|
{
|
|
Remote stub = export(id, obj, port, ssf);
|
|
return stub;
|
|
|
|
}
|
|
|
|
/**
|
|
* Make the remote object unavailable for incoming calls. This method also
|
|
* unregisters the object, so it cannot be activated again by incomming call
|
|
* (unless registered).
|
|
*
|
|
* @param obj the object to unexport
|
|
* @param force if true, cancel all pending or running calls to that object
|
|
* (if false, the object with such calls is not unexported and false
|
|
* is returned by this method).
|
|
* @return if the object was successfully unexported, false otherwise
|
|
* @throws NoSuchObjectException if such object is not known
|
|
*/
|
|
public static boolean unexportObject(Remote obj, boolean force)
|
|
throws NoSuchObjectException
|
|
{
|
|
Object aref = UnicastServer.getExportedRef(obj);
|
|
|
|
// Unregister it also (otherwise will be activated during the subsequent
|
|
// call.
|
|
if (aref instanceof ActivatableServerRef)
|
|
{
|
|
ActivatableServerRef aar = (ActivatableServerRef) aref;
|
|
UnicastServer.unregisterActivatable(aar.actId);
|
|
}
|
|
return UnicastRemoteObject.unexportObject(obj, force);
|
|
}
|
|
|
|
static Remote exportObject(Remote obj, int port,
|
|
RMIServerSocketFactory serverSocketFactory)
|
|
throws RemoteException
|
|
{
|
|
UnicastServerRef sref = null;
|
|
if (obj instanceof RemoteObject)
|
|
sref = (UnicastServerRef) ((RemoteObject) obj).getRef();
|
|
|
|
if (sref == null)
|
|
sref = new UnicastServerRef(new ObjID(), port, serverSocketFactory);
|
|
|
|
Remote stub = sref.exportObject(obj);
|
|
// addStub(obj, stub);
|
|
// TODO Need to change the place of the stub repository
|
|
return stub;
|
|
}
|
|
|
|
/**
|
|
* Create and export the new remote object, making it available at the given
|
|
* port, using sockets, produced by the specified factories.
|
|
*
|
|
* @param port the port, on that the object should become available. Zero
|
|
* means anonymous port.
|
|
* @param serverSocketFactory the server socket factory
|
|
*/
|
|
private static Remote export(ActivationID id, Remote obj, int port,
|
|
RMIServerSocketFactory serverSocketFactory)
|
|
throws RemoteException
|
|
{
|
|
ActivatableServerRef sref = null;
|
|
sref = new ActivatableServerRef(makeId(id), id, port, serverSocketFactory);
|
|
return sref.exportObject(obj);
|
|
}
|
|
|
|
/**
|
|
* Make the object ID from the activation ID. The same activation ID always
|
|
* produces the identical object id.
|
|
*
|
|
* @param aid the activation id
|
|
*
|
|
* @return the object id
|
|
*/
|
|
private static ObjID makeId(ActivationID aid)
|
|
{
|
|
ObjID id = new ObjID(0);
|
|
|
|
// The fields of both ObjID and ActivationID must be package private,
|
|
// so we need to use the reflection to access them anyway.
|
|
// Probably other implementations use some very different approach.
|
|
|
|
try
|
|
{
|
|
Field idUid = ObjID.class.getDeclaredField("space");
|
|
Field aidUid = ActivationID.class.getDeclaredField("uid");
|
|
|
|
aidUid.setAccessible(true);
|
|
idUid.setAccessible(true);
|
|
|
|
idUid.set(id, aidUid.get(aid));
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
InternalError ierr = new InternalError("Unable to set UID field");
|
|
ierr.initCause(e);
|
|
throw ierr;
|
|
}
|
|
|
|
return id;
|
|
}
|
|
|
|
/**
|
|
* Connect the object to the UnicastServer (export), but not activate it.
|
|
* The object will be activated on the first call.
|
|
*/
|
|
static Remote toStub(ActivationID anId, Class stubFor)
|
|
{
|
|
try
|
|
{
|
|
ActivatableServerRef asr =
|
|
new ActivatableServerRef(makeId(anId), anId, 0, null);
|
|
UnicastServer.exportActivatableObject(asr);
|
|
return asr.exportClass(stubFor);
|
|
}
|
|
catch (RemoteException e)
|
|
{
|
|
InternalError ierr = new InternalError(
|
|
"Failed to obtain activatable stub");
|
|
ierr.initCause(e);
|
|
throw ierr;
|
|
}
|
|
}
|
|
}
|