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
861 lines
30 KiB
Java
861 lines
30 KiB
Java
/* URLClassLoader.java -- ClassLoader that loads classes from one or more URLs
|
|
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 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 gnu.java.net.loader.FileURLLoader;
|
|
import gnu.java.net.loader.JarURLLoader;
|
|
import gnu.java.net.loader.RemoteURLLoader;
|
|
import gnu.java.net.loader.Resource;
|
|
import gnu.java.net.loader.URLLoader;
|
|
import gnu.java.net.loader.URLStreamHandlerCache;
|
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.EOFException;
|
|
import java.io.File;
|
|
import java.io.FilePermission;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.lang.reflect.Constructor;
|
|
import java.lang.reflect.InvocationTargetException;
|
|
import java.security.AccessControlContext;
|
|
import java.security.AccessController;
|
|
import java.security.CodeSource;
|
|
import java.security.PermissionCollection;
|
|
import java.security.PrivilegedAction;
|
|
import java.security.SecureClassLoader;
|
|
import java.security.cert.Certificate;
|
|
import java.util.ArrayList;
|
|
import java.util.Enumeration;
|
|
import java.util.Vector;
|
|
import java.util.jar.Attributes;
|
|
import java.util.jar.Manifest;
|
|
|
|
|
|
/**
|
|
* A secure class loader that can load classes and resources from
|
|
* multiple locations. Given an array of <code>URL</code>s this class
|
|
* loader will retrieve classes and resources by fetching them from
|
|
* possible remote locations. Each <code>URL</code> is searched in
|
|
* order in which it was added. If the file portion of the
|
|
* <code>URL</code> ends with a '/' character then it is interpreted
|
|
* as a base directory, otherwise it is interpreted as a jar file from
|
|
* which the classes/resources are resolved.
|
|
*
|
|
* <p>New instances can be created by two static
|
|
* <code>newInstance()</code> methods or by three public
|
|
* contructors. Both ways give the option to supply an initial array
|
|
* of <code>URL</code>s and (optionally) a parent classloader (that is
|
|
* different from the standard system class loader).</p>
|
|
*
|
|
* <p>Normally creating a <code>URLClassLoader</code> throws a
|
|
* <code>SecurityException</code> if a <code>SecurityManager</code> is
|
|
* installed and the <code>checkCreateClassLoader()</code> method does
|
|
* not return true. But the <code>newInstance()</code> methods may be
|
|
* used by any code as long as it has permission to acces the given
|
|
* <code>URL</code>s. <code>URLClassLoaders</code> created by the
|
|
* <code>newInstance()</code> methods also explicitly call the
|
|
* <code>checkPackageAccess()</code> method of
|
|
* <code>SecurityManager</code> if one is installed before trying to
|
|
* load a class. Note that only subclasses of
|
|
* <code>URLClassLoader</code> can add new URLs after the
|
|
* URLClassLoader had been created. But it is always possible to get
|
|
* an array of all URLs that the class loader uses to resolve classes
|
|
* and resources by way of the <code>getURLs()</code> method.</p>
|
|
*
|
|
* <p>Open issues:
|
|
* <ul>
|
|
*
|
|
* <li>Should the URLClassLoader actually add the locations found in
|
|
* the manifest or is this the responsibility of some other
|
|
* loader/(sub)class? (see <a
|
|
* href="http://java.sun.com/products/jdk/1.4/docs/guide/extensions/spec.html">
|
|
* Extension Mechanism Architecture - Bundles Extensions</a>)</li>
|
|
*
|
|
* <li>How does <code>definePackage()</code> and sealing work
|
|
* precisely?</li>
|
|
*
|
|
* <li>We save and use the security context (when a created by
|
|
* <code>newInstance()</code> but do we have to use it in more
|
|
* places?</li>
|
|
*
|
|
* <li>The use of <code>URLStreamHandler</code>s has not been tested.</li>
|
|
*
|
|
* </ul>
|
|
* </p>
|
|
*
|
|
* @since 1.2
|
|
*
|
|
* @author Mark Wielaard (mark@klomp.org)
|
|
* @author Wu Gansha (gansha.wu@intel.com)
|
|
*/
|
|
public class URLClassLoader extends SecureClassLoader
|
|
{
|
|
// Class Variables
|
|
|
|
/**
|
|
* A cache to store mappings between handler factory and its
|
|
* private protocol handler cache (also a HashMap), so we can avoid
|
|
* creating handlers each time the same protocol comes.
|
|
*/
|
|
private static URLStreamHandlerCache factoryCache
|
|
= new URLStreamHandlerCache();
|
|
|
|
/**
|
|
* The prefix for URL loaders.
|
|
*/
|
|
private static final String URL_LOADER_PREFIX = "gnu.java.net.loader.Load_";
|
|
|
|
// Instance variables
|
|
|
|
/** Locations to load classes from */
|
|
private final Vector<URL> urls = new Vector<URL>();
|
|
|
|
/**
|
|
* Store pre-parsed information for each url into this vector: each
|
|
* element is a URL loader. A jar file has its own class-path
|
|
* attribute which adds to the URLs that will be searched, but this
|
|
* does not add to the list of urls.
|
|
*/
|
|
private final Vector<URLLoader> urlinfos = new Vector<URLLoader>();
|
|
|
|
/** Factory used to get the protocol handlers of the URLs */
|
|
private final URLStreamHandlerFactory factory;
|
|
|
|
/**
|
|
* The security context when created from <code>newInstance()</code>
|
|
* or null when created through a normal constructor or when no
|
|
* <code>SecurityManager</code> was installed.
|
|
*/
|
|
private final AccessControlContext securityContext;
|
|
|
|
// Helper classes
|
|
|
|
/**
|
|
* Creates a URLClassLoader that gets classes from the supplied URLs.
|
|
* To determine if this classloader may be created the constructor of
|
|
* the super class (<code>SecureClassLoader</code>) is called first, which
|
|
* can throw a SecurityException. Then the supplied URLs are added
|
|
* in the order given to the URLClassLoader which uses these URLs to
|
|
* load classes and resources (after using the default parent ClassLoader).
|
|
*
|
|
* @param urls Locations that should be searched by this ClassLoader when
|
|
* resolving Classes or Resources.
|
|
* @exception SecurityException if the SecurityManager disallows the
|
|
* creation of a ClassLoader.
|
|
* @see SecureClassLoader
|
|
*/
|
|
public URLClassLoader(URL[] urls) throws SecurityException
|
|
{
|
|
super();
|
|
this.factory = null;
|
|
this.securityContext = null;
|
|
addURLs(urls);
|
|
}
|
|
|
|
/**
|
|
* Creates a <code>URLClassLoader</code> that gets classes from the supplied
|
|
* <code>URL</code>s.
|
|
* To determine if this classloader may be created the constructor of
|
|
* the super class (<code>SecureClassLoader</code>) is called first, which
|
|
* can throw a SecurityException. Then the supplied URLs are added
|
|
* in the order given to the URLClassLoader which uses these URLs to
|
|
* load classes and resources (after using the supplied parent ClassLoader).
|
|
* @param urls Locations that should be searched by this ClassLoader when
|
|
* resolving Classes or Resources.
|
|
* @param parent The parent class loader used before trying this class
|
|
* loader.
|
|
* @exception SecurityException if the SecurityManager disallows the
|
|
* creation of a ClassLoader.
|
|
* @exception SecurityException
|
|
* @see SecureClassLoader
|
|
*/
|
|
public URLClassLoader(URL[] urls, ClassLoader parent)
|
|
throws SecurityException
|
|
{
|
|
super(parent);
|
|
this.factory = null;
|
|
this.securityContext = null;
|
|
addURLs(urls);
|
|
}
|
|
|
|
// Package-private to avoid a trampoline constructor.
|
|
/**
|
|
* Package-private constructor used by the static
|
|
* <code>newInstance(URL[])</code> method. Creates an
|
|
* <code>URLClassLoader</code> with the given parent but without any
|
|
* <code>URL</code>s yet. This is used to bypass the normal security
|
|
* check for creating classloaders, but remembers the security
|
|
* context which will be used when defining classes. The
|
|
* <code>URL</code>s to load from must be added by the
|
|
* <code>newInstance()</code> method in the security context of the
|
|
* caller.
|
|
*
|
|
* @param securityContext the security context of the unprivileged code.
|
|
*/
|
|
URLClassLoader(ClassLoader parent, AccessControlContext securityContext)
|
|
{
|
|
super(parent);
|
|
this.factory = null;
|
|
this.securityContext = securityContext;
|
|
}
|
|
|
|
/**
|
|
* Creates a URLClassLoader that gets classes from the supplied URLs.
|
|
* To determine if this classloader may be created the constructor of
|
|
* the super class (<CODE>SecureClassLoader</CODE>) is called first, which
|
|
* can throw a SecurityException. Then the supplied URLs are added
|
|
* in the order given to the URLClassLoader which uses these URLs to
|
|
* load classes and resources (after using the supplied parent ClassLoader).
|
|
* It will use the supplied <CODE>URLStreamHandlerFactory</CODE> to get the
|
|
* protocol handlers of the supplied URLs.
|
|
* @param urls Locations that should be searched by this ClassLoader when
|
|
* resolving Classes or Resources.
|
|
* @param parent The parent class loader used before trying this class
|
|
* loader.
|
|
* @param factory Used to get the protocol handler for the URLs.
|
|
* @exception SecurityException if the SecurityManager disallows the
|
|
* creation of a ClassLoader.
|
|
* @exception SecurityException
|
|
* @see SecureClassLoader
|
|
*/
|
|
public URLClassLoader(URL[] urls, ClassLoader parent,
|
|
URLStreamHandlerFactory factory)
|
|
throws SecurityException
|
|
{
|
|
super(parent);
|
|
this.securityContext = null;
|
|
this.factory = factory;
|
|
// If this factory is not yet in factoryCache, add it.
|
|
factoryCache.add(factory);
|
|
addURLs(urls);
|
|
}
|
|
|
|
// Methods
|
|
|
|
/**
|
|
* Adds a new location to the end of the internal URL store.
|
|
* @param newUrl the location to add
|
|
*/
|
|
protected void addURL(URL newUrl)
|
|
{
|
|
urls.add(newUrl);
|
|
addURLImpl(newUrl);
|
|
}
|
|
|
|
private void addURLImpl(URL newUrl)
|
|
{
|
|
synchronized (this)
|
|
{
|
|
if (newUrl == null)
|
|
return; // Silently ignore...
|
|
|
|
// Reset the toString() value.
|
|
thisString = null;
|
|
|
|
// Create a loader for this URL.
|
|
URLLoader loader = null;
|
|
String file = newUrl.getFile();
|
|
String protocol = newUrl.getProtocol();
|
|
|
|
// If we have a file: URL, we want to make it absolute
|
|
// here, before we decide whether it is really a jar.
|
|
URL absoluteURL;
|
|
if ("file".equals (protocol))
|
|
{
|
|
File dir = new File(file);
|
|
try
|
|
{
|
|
absoluteURL = dir.getCanonicalFile().toURL();
|
|
}
|
|
catch (IOException ignore)
|
|
{
|
|
try
|
|
{
|
|
absoluteURL = dir.getAbsoluteFile().toURL();
|
|
}
|
|
catch (MalformedURLException _)
|
|
{
|
|
// This really should not happen.
|
|
absoluteURL = newUrl;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// This doesn't hurt, and it simplifies the logic a
|
|
// little.
|
|
absoluteURL = newUrl;
|
|
}
|
|
|
|
// First see if we can find a handler with the correct name.
|
|
try
|
|
{
|
|
Class<?> handler = Class.forName(URL_LOADER_PREFIX + protocol);
|
|
Class<?>[] argTypes = new Class<?>[] { URLClassLoader.class,
|
|
URLStreamHandlerCache.class,
|
|
URLStreamHandlerFactory.class,
|
|
URL.class,
|
|
URL.class };
|
|
Constructor k = handler.getDeclaredConstructor(argTypes);
|
|
loader
|
|
= (URLLoader) k.newInstance(new Object[] { this,
|
|
factoryCache,
|
|
factory,
|
|
newUrl,
|
|
absoluteURL });
|
|
}
|
|
catch (ClassNotFoundException ignore)
|
|
{
|
|
// Fall through.
|
|
}
|
|
catch (NoSuchMethodException nsme)
|
|
{
|
|
// Programming error in the class library.
|
|
InternalError vme
|
|
= new InternalError("couldn't find URLLoader constructor");
|
|
vme.initCause(nsme);
|
|
throw vme;
|
|
}
|
|
catch (InstantiationException inste)
|
|
{
|
|
// Programming error in the class library.
|
|
InternalError vme
|
|
= new InternalError("couldn't instantiate URLLoader");
|
|
vme.initCause(inste);
|
|
throw vme;
|
|
}
|
|
catch (InvocationTargetException ite)
|
|
{
|
|
// Programming error in the class library.
|
|
InternalError vme
|
|
= new InternalError("error instantiating URLLoader");
|
|
vme.initCause(ite);
|
|
throw vme;
|
|
}
|
|
catch (IllegalAccessException illae)
|
|
{
|
|
// Programming error in the class library.
|
|
InternalError vme
|
|
= new InternalError("invalid access to URLLoader");
|
|
vme.initCause(illae);
|
|
throw vme;
|
|
}
|
|
|
|
if (loader == null)
|
|
{
|
|
// If it is not a directory, use the jar loader.
|
|
if (! (file.endsWith("/") || file.endsWith(File.separator)))
|
|
loader = new JarURLLoader(this, factoryCache, factory,
|
|
newUrl, absoluteURL);
|
|
else if ("file".equals(protocol))
|
|
loader = new FileURLLoader(this, factoryCache, factory,
|
|
newUrl, absoluteURL);
|
|
else
|
|
loader = new RemoteURLLoader(this, factoryCache, factory,
|
|
newUrl);
|
|
}
|
|
|
|
urlinfos.add(loader);
|
|
ArrayList<URLLoader> extra = loader.getClassPath();
|
|
if (extra != null)
|
|
urlinfos.addAll(extra);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Adds an array of new locations to the end of the internal URL
|
|
* store. Called from the the constructors. Should not call to the
|
|
* protected addURL() method since that can be overridden and
|
|
* subclasses are not yet in a good state at this point.
|
|
* jboss 4.0.3 for example depends on this.
|
|
*
|
|
* @param newUrls the locations to add
|
|
*/
|
|
private void addURLs(URL[] newUrls)
|
|
{
|
|
for (int i = 0; i < newUrls.length; i++)
|
|
{
|
|
urls.add(newUrls[i]);
|
|
addURLImpl(newUrls[i]);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Look in both Attributes for a given value. The first Attributes
|
|
* object, if not null, has precedence.
|
|
*/
|
|
private String getAttributeValue(Attributes.Name name, Attributes first,
|
|
Attributes second)
|
|
{
|
|
String result = null;
|
|
if (first != null)
|
|
result = first.getValue(name);
|
|
if (result == null)
|
|
result = second.getValue(name);
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Defines a Package based on the given name and the supplied manifest
|
|
* information. The manifest indicates the title, version and
|
|
* vendor information of the specification and implementation and whether the
|
|
* package is sealed. If the Manifest indicates that the package is sealed
|
|
* then the Package will be sealed with respect to the supplied URL.
|
|
*
|
|
* @param name The name of the package
|
|
* @param manifest The manifest describing the specification,
|
|
* implementation and sealing details of the package
|
|
* @param url the code source url to seal the package
|
|
* @return the defined Package
|
|
* @throws IllegalArgumentException If this package name already exists
|
|
* in this class loader
|
|
*/
|
|
protected Package definePackage(String name, Manifest manifest, URL url)
|
|
throws IllegalArgumentException
|
|
{
|
|
// Compute the name of the package as it may appear in the
|
|
// Manifest.
|
|
CPStringBuilder xform = new CPStringBuilder(name);
|
|
for (int i = xform.length () - 1; i >= 0; --i)
|
|
if (xform.charAt(i) == '.')
|
|
xform.setCharAt(i, '/');
|
|
xform.append('/');
|
|
String xformName = xform.toString();
|
|
|
|
Attributes entryAttr = manifest.getAttributes(xformName);
|
|
Attributes attr = manifest.getMainAttributes();
|
|
|
|
String specTitle
|
|
= getAttributeValue(Attributes.Name.SPECIFICATION_TITLE,
|
|
entryAttr, attr);
|
|
String specVersion
|
|
= getAttributeValue(Attributes.Name.SPECIFICATION_VERSION,
|
|
entryAttr, attr);
|
|
String specVendor
|
|
= getAttributeValue(Attributes.Name.SPECIFICATION_VENDOR,
|
|
entryAttr, attr);
|
|
String implTitle
|
|
= getAttributeValue(Attributes.Name.IMPLEMENTATION_TITLE,
|
|
entryAttr, attr);
|
|
String implVersion
|
|
= getAttributeValue(Attributes.Name.IMPLEMENTATION_VERSION,
|
|
entryAttr, attr);
|
|
String implVendor
|
|
= getAttributeValue(Attributes.Name.IMPLEMENTATION_VENDOR,
|
|
entryAttr, attr);
|
|
|
|
// Look if the Manifest indicates that this package is sealed
|
|
// XXX - most likely not completely correct!
|
|
// Shouldn't we also check the sealed attribute of the complete jar?
|
|
// http://java.sun.com/products/jdk/1.4/docs/guide/extensions/spec.html#bundled
|
|
// But how do we get that jar manifest here?
|
|
String sealed = attr.getValue(Attributes.Name.SEALED);
|
|
if ("false".equals(sealed))
|
|
// make sure that the URL is null so the package is not sealed
|
|
url = null;
|
|
|
|
return definePackage(name,
|
|
specTitle, specVendor, specVersion,
|
|
implTitle, implVendor, implVersion,
|
|
url);
|
|
}
|
|
|
|
/**
|
|
* Finds (the first) class by name from one of the locations. The locations
|
|
* are searched in the order they were added to the URLClassLoader.
|
|
*
|
|
* @param className the classname to find
|
|
* @exception ClassNotFoundException when the class could not be found or
|
|
* loaded
|
|
* @return a Class object representing the found class
|
|
*/
|
|
protected Class<?> findClass(final String className)
|
|
throws ClassNotFoundException
|
|
{
|
|
// Just try to find the resource by the (almost) same name
|
|
String resourceName = className.replace('.', '/') + ".class";
|
|
int max = urlinfos.size();
|
|
Resource resource = null;
|
|
for (int i = 0; i < max && resource == null; i++)
|
|
{
|
|
URLLoader loader = (URLLoader)urlinfos.elementAt(i);
|
|
if (loader == null)
|
|
continue;
|
|
|
|
Class k = loader.getClass(className);
|
|
if (k != null)
|
|
return k;
|
|
|
|
resource = loader.getResource(resourceName);
|
|
}
|
|
if (resource == null)
|
|
throw new ClassNotFoundException(className + " not found in " + this);
|
|
|
|
// Try to read the class data, create the CodeSource, Package and
|
|
// construct the class (and watch out for those nasty IOExceptions)
|
|
try
|
|
{
|
|
byte[] data;
|
|
InputStream in = resource.getInputStream();
|
|
try
|
|
{
|
|
int length = resource.getLength();
|
|
if (length != -1)
|
|
{
|
|
// We know the length of the data.
|
|
// Just try to read it in all at once
|
|
data = new byte[length];
|
|
int pos = 0;
|
|
while (length - pos > 0)
|
|
{
|
|
int len = in.read(data, pos, length - pos);
|
|
if (len == -1)
|
|
throw new EOFException("Not enough data reading from: "
|
|
+ in);
|
|
pos += len;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// We don't know the data length.
|
|
// Have to read it in chunks.
|
|
ByteArrayOutputStream out = new ByteArrayOutputStream(4096);
|
|
byte[] b = new byte[4096];
|
|
int l = 0;
|
|
while (l != -1)
|
|
{
|
|
l = in.read(b);
|
|
if (l != -1)
|
|
out.write(b, 0, l);
|
|
}
|
|
data = out.toByteArray();
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
in.close();
|
|
}
|
|
final byte[] classData = data;
|
|
|
|
// Now get the CodeSource
|
|
final CodeSource source = resource.getCodeSource();
|
|
|
|
// Find out package name
|
|
String packageName = null;
|
|
int lastDot = className.lastIndexOf('.');
|
|
if (lastDot != -1)
|
|
packageName = className.substring(0, lastDot);
|
|
|
|
if (packageName != null && getPackage(packageName) == null)
|
|
{
|
|
// define the package
|
|
Manifest manifest = resource.getLoader().getManifest();
|
|
if (manifest == null)
|
|
definePackage(packageName, null, null, null, null, null, null,
|
|
null);
|
|
else
|
|
definePackage(packageName, manifest,
|
|
resource.getLoader().getBaseURL());
|
|
}
|
|
|
|
// And finally construct the class!
|
|
SecurityManager sm = System.getSecurityManager();
|
|
Class result = null;
|
|
if (sm != null && securityContext != null)
|
|
{
|
|
result = AccessController.doPrivileged
|
|
(new PrivilegedAction<Class>()
|
|
{
|
|
public Class run()
|
|
{
|
|
return defineClass(className, classData,
|
|
0, classData.length,
|
|
source);
|
|
}
|
|
}, securityContext);
|
|
}
|
|
else
|
|
result = defineClass(className, classData, 0, classData.length, source);
|
|
|
|
// Avoid NullPointerExceptions.
|
|
Certificate[] resourceCertificates = resource.getCertificates();
|
|
if(resourceCertificates != null)
|
|
super.setSigners(result, resourceCertificates);
|
|
|
|
return result;
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
throw new ClassNotFoundException(className + " not found in " + this, ioe);
|
|
}
|
|
}
|
|
|
|
// Cached String representation of this URLClassLoader
|
|
private String thisString;
|
|
|
|
/**
|
|
* Returns a String representation of this URLClassLoader giving the
|
|
* actual Class name, the URLs that are searched and the parent
|
|
* ClassLoader.
|
|
*/
|
|
public String toString()
|
|
{
|
|
synchronized (this)
|
|
{
|
|
if (thisString == null)
|
|
{
|
|
CPStringBuilder sb = new CPStringBuilder();
|
|
sb.append(this.getClass().getName());
|
|
sb.append("{urls=[" );
|
|
URL[] thisURLs = getURLs();
|
|
for (int i = 0; i < thisURLs.length; i++)
|
|
{
|
|
sb.append(thisURLs[i]);
|
|
if (i < thisURLs.length - 1)
|
|
sb.append(',');
|
|
}
|
|
sb.append(']');
|
|
sb.append(", parent=");
|
|
sb.append(getParent());
|
|
sb.append('}');
|
|
thisString = sb.toString();
|
|
}
|
|
return thisString;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Finds the first occurrence of a resource that can be found. The locations
|
|
* are searched in the order they were added to the URLClassLoader.
|
|
*
|
|
* @param resourceName the resource name to look for
|
|
* @return the URLResource for the resource if found, null otherwise
|
|
*/
|
|
private Resource findURLResource(String resourceName)
|
|
{
|
|
int max = urlinfos.size();
|
|
for (int i = 0; i < max; i++)
|
|
{
|
|
URLLoader loader = (URLLoader) urlinfos.elementAt(i);
|
|
if (loader == null)
|
|
continue;
|
|
|
|
Resource resource = loader.getResource(resourceName);
|
|
if (resource != null)
|
|
return resource;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Finds the first occurrence of a resource that can be found.
|
|
*
|
|
* @param resourceName the resource name to look for
|
|
* @return the URL if found, null otherwise
|
|
*/
|
|
public URL findResource(String resourceName)
|
|
{
|
|
Resource resource = findURLResource(resourceName);
|
|
if (resource != null)
|
|
return resource.getURL();
|
|
|
|
// Resource not found
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Finds all the resources with a particular name from all the locations.
|
|
*
|
|
* @param resourceName the name of the resource to lookup
|
|
* @return a (possible empty) enumeration of URLs where the resource can be
|
|
* found
|
|
* @exception IOException when an error occurs accessing one of the
|
|
* locations
|
|
*/
|
|
public Enumeration<URL> findResources(String resourceName)
|
|
throws IOException
|
|
{
|
|
Vector<URL> resources = new Vector<URL>();
|
|
int max = urlinfos.size();
|
|
for (int i = 0; i < max; i++)
|
|
{
|
|
URLLoader loader = (URLLoader) urlinfos.elementAt(i);
|
|
Resource resource = loader.getResource(resourceName);
|
|
if (resource != null)
|
|
resources.add(resource.getURL());
|
|
}
|
|
return resources.elements();
|
|
}
|
|
|
|
/**
|
|
* Returns the permissions needed to access a particular code
|
|
* source. These permissions includes those returned by
|
|
* <code>SecureClassLoader.getPermissions()</code> and the actual
|
|
* permissions to access the objects referenced by the URL of the
|
|
* code source. The extra permissions added depend on the protocol
|
|
* and file portion of the URL in the code source. If the URL has
|
|
* the "file" protocol ends with a '/' character then it must be a
|
|
* directory and a file Permission to read everything in that
|
|
* directory and all subdirectories is added. If the URL had the
|
|
* "file" protocol and doesn't end with a '/' character then it must
|
|
* be a normal file and a file permission to read that file is
|
|
* added. If the <code>URL</code> has any other protocol then a
|
|
* socket permission to connect and accept connections from the host
|
|
* portion of the URL is added.
|
|
*
|
|
* @param source The codesource that needs the permissions to be accessed
|
|
* @return the collection of permissions needed to access the code resource
|
|
* @see java.security.SecureClassLoader#getPermissions(CodeSource)
|
|
*/
|
|
protected PermissionCollection getPermissions(CodeSource source)
|
|
{
|
|
// XXX - This implementation does exactly as the Javadoc describes.
|
|
// But maybe we should/could use URLConnection.getPermissions()?
|
|
// First get the permissions that would normally be granted
|
|
PermissionCollection permissions = super.getPermissions(source);
|
|
|
|
// Now add any extra permissions depending on the URL location.
|
|
URL url = source.getLocation();
|
|
String protocol = url.getProtocol();
|
|
if (protocol.equals("file"))
|
|
{
|
|
String file = url.getFile();
|
|
|
|
// If the file end in / it must be an directory.
|
|
if (file.endsWith("/") || file.endsWith(File.separator))
|
|
{
|
|
// Grant permission to read everything in that directory and
|
|
// all subdirectories.
|
|
permissions.add(new FilePermission(file + "-", "read"));
|
|
}
|
|
else
|
|
{
|
|
// It is a 'normal' file.
|
|
// Grant permission to access that file.
|
|
permissions.add(new FilePermission(file, "read"));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Grant permission to connect to and accept connections from host
|
|
String host = url.getHost();
|
|
if (host != null)
|
|
permissions.add(new SocketPermission(host, "connect,accept"));
|
|
}
|
|
|
|
return permissions;
|
|
}
|
|
|
|
/**
|
|
* Returns all the locations that this class loader currently uses the
|
|
* resolve classes and resource. This includes both the initially supplied
|
|
* URLs as any URLs added later by the loader.
|
|
* @return All the currently used URLs
|
|
*/
|
|
public URL[] getURLs()
|
|
{
|
|
return (URL[]) urls.toArray(new URL[urls.size()]);
|
|
}
|
|
|
|
/**
|
|
* Creates a new instance of a <code>URLClassLoader</code> that gets
|
|
* classes from the supplied <code>URL</code>s. This class loader
|
|
* will have as parent the standard system class loader.
|
|
*
|
|
* @param urls the initial URLs used to resolve classes and
|
|
* resources
|
|
*
|
|
* @return the class loader
|
|
*
|
|
* @exception SecurityException when the calling code does not have
|
|
* permission to access the given <code>URL</code>s
|
|
*/
|
|
public static URLClassLoader newInstance(URL[] urls)
|
|
throws SecurityException
|
|
{
|
|
return newInstance(urls, null);
|
|
}
|
|
|
|
/**
|
|
* Creates a new instance of a <code>URLClassLoader</code> that gets
|
|
* classes from the supplied <code>URL</code>s and with the supplied
|
|
* loader as parent class loader.
|
|
*
|
|
* @param urls the initial URLs used to resolve classes and
|
|
* resources
|
|
* @param parent the parent class loader
|
|
*
|
|
* @return the class loader
|
|
*
|
|
* @exception SecurityException when the calling code does not have
|
|
* permission to access the given <code>URL</code>s
|
|
*/
|
|
public static URLClassLoader newInstance(URL[] urls, final ClassLoader parent)
|
|
throws SecurityException
|
|
{
|
|
SecurityManager sm = System.getSecurityManager();
|
|
if (sm == null)
|
|
return new URLClassLoader(urls, parent);
|
|
else
|
|
{
|
|
final Object securityContext = sm.getSecurityContext();
|
|
|
|
// XXX - What to do with anything else then an AccessControlContext?
|
|
if (! (securityContext instanceof AccessControlContext))
|
|
throw new SecurityException("securityContext must be AccessControlContext: "
|
|
+ securityContext);
|
|
|
|
URLClassLoader loader =
|
|
AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>()
|
|
{
|
|
public URLClassLoader run()
|
|
{
|
|
return new URLClassLoader(parent,
|
|
(AccessControlContext) securityContext);
|
|
}
|
|
});
|
|
loader.addURLs(urls);
|
|
return loader;
|
|
}
|
|
}
|
|
}
|