
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
665 lines
22 KiB
Java
665 lines
22 KiB
Java
/* FileHandler.java -- a class for publishing log messages to log files
|
|
Copyright (C) 2002, 2003, 2004, 2005 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.util.logging;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.io.File;
|
|
import java.io.FileOutputStream;
|
|
import java.io.FilterOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.OutputStream;
|
|
import java.util.LinkedList;
|
|
import java.util.ListIterator;
|
|
|
|
/**
|
|
* A <code>FileHandler</code> publishes log records to a set of log
|
|
* files. A maximum file size can be specified; as soon as a log file
|
|
* reaches the size limit, it is closed and the next file in the set
|
|
* is taken.
|
|
*
|
|
* <p><strong>Configuration:</strong> Values of the subsequent
|
|
* <code>LogManager</code> properties are taken into consideration
|
|
* when a <code>FileHandler</code> is initialized. If a property is
|
|
* not defined, or if it has an invalid value, a default is taken
|
|
* without an exception being thrown.
|
|
*
|
|
* <ul>
|
|
*
|
|
* <li><code>java.util.FileHandler.level</code> - specifies
|
|
* the initial severity level threshold. Default value:
|
|
* <code>Level.ALL</code>.</li>
|
|
*
|
|
* <li><code>java.util.FileHandler.filter</code> - specifies
|
|
* the name of a Filter class. Default value: No Filter.</li>
|
|
*
|
|
* <li><code>java.util.FileHandler.formatter</code> - specifies
|
|
* the name of a Formatter class. Default value:
|
|
* <code>java.util.logging.XMLFormatter</code>.</li>
|
|
*
|
|
* <li><code>java.util.FileHandler.encoding</code> - specifies
|
|
* the name of the character encoding. Default value:
|
|
* the default platform encoding.</li>
|
|
*
|
|
* <li><code>java.util.FileHandler.limit</code> - specifies the number
|
|
* of bytes a log file is approximately allowed to reach before it
|
|
* is closed and the handler switches to the next file in the
|
|
* rotating set. A value of zero means that files can grow
|
|
* without limit. Default value: 0 (unlimited growth).</li>
|
|
*
|
|
* <li><code>java.util.FileHandler.count</code> - specifies the number
|
|
* of log files through which this handler cycles. Default value:
|
|
* 1.</li>
|
|
*
|
|
* <li><code>java.util.FileHandler.pattern</code> - specifies a
|
|
* pattern for the location and name of the produced log files.
|
|
* See the section on <a href="#filePatterns">file name
|
|
* patterns</a> for details. Default value:
|
|
* <code>"%h/java%u.log"</code>.</li>
|
|
*
|
|
* <li><code>java.util.FileHandler.append</code> - specifies
|
|
* whether the handler will append log records to existing
|
|
* files, or whether the handler will clear log files
|
|
* upon switching to them. Default value: <code>false</code>,
|
|
* indicating that files will be cleared.</li>
|
|
*
|
|
* </ul>
|
|
*
|
|
* <p><a name="filePatterns"><strong>File Name Patterns:</strong></a>
|
|
* The name and location and log files are specified with pattern
|
|
* strings. The handler will replace the following character sequences
|
|
* when opening log files:
|
|
*
|
|
* <p><ul>
|
|
* <li><code>/</code> - replaced by the platform-specific path name
|
|
* separator. This value is taken from the system property
|
|
* <code>file.separator</code>.</li>
|
|
*
|
|
* <li><code>%t</code> - replaced by the platform-specific location of
|
|
* the directory intended for temporary files. This value is
|
|
* taken from the system property <code>java.io.tmpdir</code>.</li>
|
|
*
|
|
* <li><code>%h</code> - replaced by the location of the home
|
|
* directory of the current user. This value is taken from the
|
|
* system property <code>user.home</code>.</li>
|
|
*
|
|
* <li><code>%g</code> - replaced by a generation number for
|
|
* distinguisthing the individual items in the rotating set
|
|
* of log files. The generation number cycles through the
|
|
* sequence 0, 1, ..., <code>count</code> - 1.</li>
|
|
*
|
|
* <li><code>%u</code> - replaced by a unique number for
|
|
* distinguisthing the output files of several concurrently
|
|
* running processes. The <code>FileHandler</code> starts
|
|
* with 0 when it tries to open a log file. If the file
|
|
* cannot be opened because it is currently in use,
|
|
* the unique number is incremented by one and opening
|
|
* is tried again. These steps are repeated until the
|
|
* opening operation succeeds.
|
|
*
|
|
* <p>FIXME: Is the following correct? Please review. The unique
|
|
* number is determined for each log file individually when it is
|
|
* opened upon switching to the next file. Therefore, it is not
|
|
* correct to assume that all log files in a rotating set bear the
|
|
* same unique number.
|
|
*
|
|
* <p>FIXME: The Javadoc for the Sun reference implementation
|
|
* says: "Note that the use of unique ids to avoid conflicts is
|
|
* only guaranteed to work reliably when using a local disk file
|
|
* system." Why? This needs to be mentioned as well, in case
|
|
* the reviewers decide the statement is true. Otherwise,
|
|
* file a bug report with Sun.</li>
|
|
*
|
|
* <li><code>%%</code> - replaced by a single percent sign.</li>
|
|
* </ul>
|
|
*
|
|
* <p>If the pattern string does not contain <code>%g</code> and
|
|
* <code>count</code> is greater than one, the handler will append
|
|
* the string <code>.%g</code> to the specified pattern.
|
|
*
|
|
* <p>If the handler attempts to open a log file, this log file
|
|
* is being used at the time of the attempt, and the pattern string
|
|
* does not contain <code>%u</code>, the handler will append
|
|
* the string <code>.%u</code> to the specified pattern. This
|
|
* step is performed after any generation number has been
|
|
* appended.
|
|
*
|
|
* <p><em>Examples for the GNU platform:</em>
|
|
*
|
|
* <p><ul>
|
|
*
|
|
* <li><code>%h/java%u.log</code> will lead to a single log file
|
|
* <code>/home/janet/java0.log</code>, assuming <code>count</code>
|
|
* equals 1, the user's home directory is
|
|
* <code>/home/janet</code>, and the attempt to open the file
|
|
* succeeds.</li>
|
|
*
|
|
* <li><code>%h/java%u.log</code> will lead to three log files
|
|
* <code>/home/janet/java0.log.0</code>,
|
|
* <code>/home/janet/java0.log.1</code>, and
|
|
* <code>/home/janet/java0.log.2</code>,
|
|
* assuming <code>count</code> equals 3, the user's home
|
|
* directory is <code>/home/janet</code>, and all attempts
|
|
* to open files succeed.</li>
|
|
*
|
|
* <li><code>%h/java%u.log</code> will lead to three log files
|
|
* <code>/home/janet/java0.log.0</code>,
|
|
* <code>/home/janet/java1.log.1</code>, and
|
|
* <code>/home/janet/java0.log.2</code>,
|
|
* assuming <code>count</code> equals 3, the user's home
|
|
* directory is <code>/home/janet</code>, and the attempt
|
|
* to open <code>/home/janet/java0.log.1</code> fails.</li>
|
|
*
|
|
* </ul>
|
|
*
|
|
* @author Sascha Brawer (brawer@acm.org)
|
|
*/
|
|
public class FileHandler
|
|
extends StreamHandler
|
|
{
|
|
/**
|
|
* A literal that prefixes all file-handler related properties in the
|
|
* logging.properties file.
|
|
*/
|
|
private static final String PROPERTY_PREFIX = "java.util.logging.FileHandler";
|
|
/**
|
|
* The name of the property to set for specifying a file naming (incl. path)
|
|
* pattern to use with rotating log files.
|
|
*/
|
|
private static final String PATTERN_KEY = PROPERTY_PREFIX + ".pattern";
|
|
/**
|
|
* The default pattern to use when the <code>PATTERN_KEY</code> property was
|
|
* not specified in the logging.properties file.
|
|
*/
|
|
private static final String DEFAULT_PATTERN = "%h/java%u.log";
|
|
/**
|
|
* The name of the property to set for specifying an approximate maximum
|
|
* amount, in bytes, to write to any one log output file. A value of zero
|
|
* (which is the default) implies a no limit.
|
|
*/
|
|
private static final String LIMIT_KEY = PROPERTY_PREFIX + ".limit";
|
|
private static final int DEFAULT_LIMIT = 0;
|
|
/**
|
|
* The name of the property to set for specifying how many output files to
|
|
* cycle through. The default value is 1.
|
|
*/
|
|
private static final String COUNT_KEY = PROPERTY_PREFIX + ".count";
|
|
private static final int DEFAULT_COUNT = 1;
|
|
/**
|
|
* The name of the property to set for specifying whether this handler should
|
|
* append, or not, its output to existing files. The default value is
|
|
* <code>false</code> meaning NOT to append.
|
|
*/
|
|
private static final String APPEND_KEY = PROPERTY_PREFIX + ".append";
|
|
private static final boolean DEFAULT_APPEND = false;
|
|
|
|
/**
|
|
* The number of bytes a log file is approximately allowed to reach
|
|
* before it is closed and the handler switches to the next file in
|
|
* the rotating set. A value of zero means that files can grow
|
|
* without limit.
|
|
*/
|
|
private final int limit;
|
|
|
|
|
|
/**
|
|
* The number of log files through which this handler cycles.
|
|
*/
|
|
private final int count;
|
|
|
|
|
|
/**
|
|
* The pattern for the location and name of the produced log files.
|
|
* See the section on <a href="#filePatterns">file name patterns</a>
|
|
* for details.
|
|
*/
|
|
private final String pattern;
|
|
|
|
|
|
/**
|
|
* Indicates whether the handler will append log records to existing
|
|
* files (<code>true</code>), or whether the handler will clear log files
|
|
* upon switching to them (<code>false</code>).
|
|
*/
|
|
private final boolean append;
|
|
|
|
|
|
/**
|
|
* The number of bytes that have currently been written to the stream.
|
|
* Package private for use in inner classes.
|
|
*/
|
|
long written;
|
|
|
|
|
|
/**
|
|
* A linked list of files we are, or have written to. The entries
|
|
* are file path strings, kept in the order
|
|
*/
|
|
private LinkedList logFiles;
|
|
|
|
|
|
/**
|
|
* Constructs a <code>FileHandler</code>, taking all property values
|
|
* from the current {@link LogManager LogManager} configuration.
|
|
*
|
|
* @throws java.io.IOException FIXME: The Sun Javadoc says: "if
|
|
* there are IO problems opening the files." This conflicts
|
|
* with the general principle that configuration errors do
|
|
* not prohibit construction. Needs review.
|
|
*
|
|
* @throws SecurityException if a security manager exists and
|
|
* the caller is not granted the permission to control
|
|
* the logging infrastructure.
|
|
*/
|
|
public FileHandler()
|
|
throws IOException, SecurityException
|
|
{
|
|
this(LogManager.getLogManager().getProperty(PATTERN_KEY),
|
|
LogManager.getIntProperty(LIMIT_KEY, DEFAULT_LIMIT),
|
|
LogManager.getIntProperty(COUNT_KEY, DEFAULT_COUNT),
|
|
LogManager.getBooleanProperty(APPEND_KEY, DEFAULT_APPEND));
|
|
}
|
|
|
|
|
|
/* FIXME: Javadoc missing. */
|
|
public FileHandler(String pattern)
|
|
throws IOException, SecurityException
|
|
{
|
|
this(pattern, DEFAULT_LIMIT, DEFAULT_COUNT, DEFAULT_APPEND);
|
|
}
|
|
|
|
|
|
/* FIXME: Javadoc missing. */
|
|
public FileHandler(String pattern, boolean append)
|
|
throws IOException, SecurityException
|
|
{
|
|
this(pattern, DEFAULT_LIMIT, DEFAULT_COUNT, append);
|
|
}
|
|
|
|
|
|
/* FIXME: Javadoc missing. */
|
|
public FileHandler(String pattern, int limit, int count)
|
|
throws IOException, SecurityException
|
|
{
|
|
this(pattern, limit, count,
|
|
LogManager.getBooleanProperty(APPEND_KEY, DEFAULT_APPEND));
|
|
}
|
|
|
|
|
|
/**
|
|
* Constructs a <code>FileHandler</code> given the pattern for the
|
|
* location and name of the produced log files, the size limit, the
|
|
* number of log files thorough which the handler will rotate, and
|
|
* the <code>append</code> property. All other property values are
|
|
* taken from the current {@link LogManager LogManager}
|
|
* configuration.
|
|
*
|
|
* @param pattern The pattern for the location and name of the
|
|
* produced log files. See the section on <a
|
|
* href="#filePatterns">file name patterns</a> for details.
|
|
* If <code>pattern</code> is <code>null</code>, the value is
|
|
* taken from the {@link LogManager LogManager} configuration
|
|
* property
|
|
* <code>java.util.logging.FileHandler.pattern</code>.
|
|
* However, this is a pecularity of the GNU implementation,
|
|
* and Sun's API specification does not mention what behavior
|
|
* is to be expected for <code>null</code>. Therefore,
|
|
* applications should not rely on this feature.
|
|
*
|
|
* @param limit specifies the number of bytes a log file is
|
|
* approximately allowed to reach before it is closed and the
|
|
* handler switches to the next file in the rotating set. A
|
|
* value of zero means that files can grow without limit.
|
|
*
|
|
* @param count specifies the number of log files through which this
|
|
* handler cycles.
|
|
*
|
|
* @param append specifies whether the handler will append log
|
|
* records to existing files (<code>true</code>), or whether the
|
|
* handler will clear log files upon switching to them
|
|
* (<code>false</code>).
|
|
*
|
|
* @throws java.io.IOException FIXME: The Sun Javadoc says: "if
|
|
* there are IO problems opening the files." This conflicts
|
|
* with the general principle that configuration errors do
|
|
* not prohibit construction. Needs review.
|
|
*
|
|
* @throws SecurityException if a security manager exists and
|
|
* the caller is not granted the permission to control
|
|
* the logging infrastructure.
|
|
* <p>FIXME: This seems in contrast to all other handler
|
|
* constructors -- verify this by running tests against
|
|
* the Sun reference implementation.
|
|
*/
|
|
public FileHandler(String pattern,
|
|
int limit,
|
|
int count,
|
|
boolean append)
|
|
throws IOException, SecurityException
|
|
{
|
|
super(/* output stream, created below */ null,
|
|
PROPERTY_PREFIX,
|
|
/* default level */ Level.ALL,
|
|
/* formatter */ null,
|
|
/* default formatter */ XMLFormatter.class);
|
|
|
|
if ((limit <0) || (count < 1))
|
|
throw new IllegalArgumentException();
|
|
|
|
this.pattern = pattern != null ? pattern : DEFAULT_PATTERN;
|
|
this.limit = limit;
|
|
this.count = count;
|
|
this.append = append;
|
|
this.written = 0;
|
|
this.logFiles = new LinkedList ();
|
|
|
|
setOutputStream (createFileStream (this.pattern, limit, count, append,
|
|
/* generation */ 0));
|
|
}
|
|
|
|
|
|
/* FIXME: Javadoc missing. */
|
|
private OutputStream createFileStream(String pattern,
|
|
int limit,
|
|
int count,
|
|
boolean append,
|
|
int generation)
|
|
{
|
|
String path;
|
|
int unique = 0;
|
|
|
|
/* Throws a SecurityException if the caller does not have
|
|
* LoggingPermission("control").
|
|
*/
|
|
LogManager.getLogManager().checkAccess();
|
|
|
|
/* Default value from the java.util.logging.FileHandler.pattern
|
|
* LogManager configuration property.
|
|
*/
|
|
if (pattern == null)
|
|
pattern = LogManager.getLogManager().getProperty(PATTERN_KEY);
|
|
if (pattern == null)
|
|
pattern = DEFAULT_PATTERN;
|
|
|
|
if (count > 1 && !has (pattern, 'g'))
|
|
pattern = pattern + ".%g";
|
|
|
|
do
|
|
{
|
|
path = replaceFileNameEscapes(pattern, generation, unique, count);
|
|
|
|
try
|
|
{
|
|
File file = new File(path);
|
|
if (!file.exists () || append)
|
|
{
|
|
FileOutputStream fout = new FileOutputStream (file, append);
|
|
// FIXME we need file locks for this to work properly, but they
|
|
// are not implemented yet in Classpath! Madness!
|
|
// FileChannel channel = fout.getChannel ();
|
|
// FileLock lock = channel.tryLock ();
|
|
// if (lock != null) // We've locked the file.
|
|
// {
|
|
if (logFiles.isEmpty ())
|
|
logFiles.addFirst (path);
|
|
return new ostr (fout);
|
|
// }
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
reportError (null, ex, ErrorManager.OPEN_FAILURE);
|
|
}
|
|
|
|
unique = unique + 1;
|
|
if (!has (pattern, 'u'))
|
|
pattern = pattern + ".%u";
|
|
}
|
|
while (true);
|
|
}
|
|
|
|
|
|
/**
|
|
* Replaces the substrings <code>"/"</code> by the value of the
|
|
* system property <code>"file.separator"</code>, <code>"%t"</code>
|
|
* by the value of the system property
|
|
* <code>"java.io.tmpdir"</code>, <code>"%h"</code> by the value of
|
|
* the system property <code>"user.home"</code>, <code>"%g"</code>
|
|
* by the value of <code>generation</code>, <code>"%u"</code> by the
|
|
* value of <code>uniqueNumber</code>, and <code>"%%"</code> by a
|
|
* single percent character. If <code>pattern</code> does
|
|
* <em>not</em> contain the sequence <code>"%g"</code>,
|
|
* the value of <code>generation</code> will be appended to
|
|
* the result.
|
|
*
|
|
* @throws NullPointerException if one of the system properties
|
|
* <code>"file.separator"</code>,
|
|
* <code>"java.io.tmpdir"</code>, or
|
|
* <code>"user.home"</code> has no value and the
|
|
* corresponding escape sequence appears in
|
|
* <code>pattern</code>.
|
|
*/
|
|
private static String replaceFileNameEscapes(String pattern,
|
|
int generation,
|
|
int uniqueNumber,
|
|
int count)
|
|
{
|
|
CPStringBuilder buf = new CPStringBuilder(pattern);
|
|
String replaceWith;
|
|
boolean foundGeneration = false;
|
|
|
|
int pos = 0;
|
|
do
|
|
{
|
|
// Uncomment the next line for finding bugs.
|
|
// System.out.println(buf.substring(0,pos) + '|' + buf.substring(pos));
|
|
|
|
if (buf.charAt(pos) == '/')
|
|
{
|
|
/* The same value is also provided by java.io.File.separator. */
|
|
replaceWith = System.getProperty("file.separator");
|
|
buf.replace(pos, pos + 1, replaceWith);
|
|
pos = pos + replaceWith.length() - 1;
|
|
continue;
|
|
}
|
|
|
|
if (buf.charAt(pos) == '%')
|
|
{
|
|
switch (buf.charAt(pos + 1))
|
|
{
|
|
case 't':
|
|
replaceWith = System.getProperty("java.io.tmpdir");
|
|
break;
|
|
|
|
case 'h':
|
|
replaceWith = System.getProperty("user.home");
|
|
break;
|
|
|
|
case 'g':
|
|
replaceWith = Integer.toString(generation);
|
|
foundGeneration = true;
|
|
break;
|
|
|
|
case 'u':
|
|
replaceWith = Integer.toString(uniqueNumber);
|
|
break;
|
|
|
|
case '%':
|
|
replaceWith = "%";
|
|
break;
|
|
|
|
default:
|
|
replaceWith = "??";
|
|
break; // FIXME: Throw exception?
|
|
}
|
|
|
|
buf.replace(pos, pos + 2, replaceWith);
|
|
pos = pos + replaceWith.length() - 1;
|
|
continue;
|
|
}
|
|
}
|
|
while (++pos < buf.length() - 1);
|
|
|
|
if (!foundGeneration && (count > 1))
|
|
{
|
|
buf.append('.');
|
|
buf.append(generation);
|
|
}
|
|
|
|
return buf.toString();
|
|
}
|
|
|
|
|
|
/* FIXME: Javadoc missing. */
|
|
public void publish(LogRecord record)
|
|
{
|
|
if (limit > 0 && written >= limit)
|
|
rotate ();
|
|
super.publish(record);
|
|
flush ();
|
|
}
|
|
|
|
/**
|
|
* Rotates the current log files, possibly removing one if we
|
|
* exceed the file count.
|
|
*/
|
|
private synchronized void rotate ()
|
|
{
|
|
if (logFiles.size () > 0)
|
|
{
|
|
File f1 = null;
|
|
ListIterator lit = null;
|
|
|
|
// If we reach the file count, ditch the oldest file.
|
|
if (logFiles.size () == count)
|
|
{
|
|
f1 = new File ((String) logFiles.getLast ());
|
|
f1.delete ();
|
|
lit = logFiles.listIterator (logFiles.size () - 1);
|
|
}
|
|
// Otherwise, move the oldest to a new location.
|
|
else
|
|
{
|
|
String path = replaceFileNameEscapes (pattern, logFiles.size (),
|
|
/* unique */ 0, count);
|
|
f1 = new File (path);
|
|
logFiles.addLast (path);
|
|
lit = logFiles.listIterator (logFiles.size () - 1);
|
|
}
|
|
|
|
// Now rotate the files.
|
|
while (lit.hasPrevious ())
|
|
{
|
|
String s = (String) lit.previous ();
|
|
File f2 = new File (s);
|
|
f2.renameTo (f1);
|
|
f1 = f2;
|
|
}
|
|
}
|
|
|
|
setOutputStream (createFileStream (pattern, limit, count, append,
|
|
/* generation */ 0));
|
|
|
|
// Reset written count.
|
|
written = 0;
|
|
}
|
|
|
|
/**
|
|
* Tell if <code>pattern</code> contains the pattern sequence
|
|
* with character <code>escape</code>. That is, if <code>escape</code>
|
|
* is 'g', this method returns true if the given pattern contains
|
|
* "%g", and not just the substring "%g" (for example, in the case of
|
|
* "%%g").
|
|
*
|
|
* @param pattern The pattern to test.
|
|
* @param escape The escape character to search for.
|
|
* @return True iff the pattern contains the escape sequence with the
|
|
* given character.
|
|
*/
|
|
private static boolean has (final String pattern, final char escape)
|
|
{
|
|
final int len = pattern.length ();
|
|
boolean sawPercent = false;
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
char c = pattern.charAt (i);
|
|
if (sawPercent)
|
|
{
|
|
if (c == escape)
|
|
return true;
|
|
if (c == '%') // Double percent
|
|
{
|
|
sawPercent = false;
|
|
continue;
|
|
}
|
|
}
|
|
sawPercent = (c == '%');
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* An output stream that tracks the number of bytes written to it.
|
|
*/
|
|
private final class ostr extends FilterOutputStream
|
|
{
|
|
private ostr (OutputStream out)
|
|
{
|
|
super (out);
|
|
}
|
|
|
|
public void write (final int b) throws IOException
|
|
{
|
|
out.write (b);
|
|
FileHandler.this.written++; // FIXME: synchronize?
|
|
}
|
|
|
|
public void write (final byte[] b) throws IOException
|
|
{
|
|
write (b, 0, b.length);
|
|
}
|
|
|
|
public void write (final byte[] b, final int offset, final int length)
|
|
throws IOException
|
|
{
|
|
out.write (b, offset, length);
|
|
FileHandler.this.written += length; // FIXME: synchronize?
|
|
}
|
|
}
|
|
}
|