
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
671 lines
23 KiB
Java
671 lines
23 KiB
Java
/* NamingManager.java -- Creates contexts and objects
|
|
Copyright (C) 2000, 2001, 2002, 2003, 2004,
|
|
2006 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package javax.naming.spi;
|
|
|
|
import gnu.classpath.VMStackWalker;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import java.util.Enumeration;
|
|
import java.util.Hashtable;
|
|
import java.util.StringTokenizer;
|
|
|
|
import javax.naming.CannotProceedException;
|
|
import javax.naming.Context;
|
|
import javax.naming.Name;
|
|
import javax.naming.NamingException;
|
|
import javax.naming.NoInitialContextException;
|
|
import javax.naming.RefAddr;
|
|
import javax.naming.Reference;
|
|
import javax.naming.Referenceable;
|
|
import javax.naming.StringRefAddr;
|
|
|
|
/**
|
|
* Contains methods for creating contexts and objects referred to by
|
|
* location information. The location is specified in the scope of the
|
|
* certain naming or directory service. This class only contais static
|
|
* methods and cannot be instantiated.
|
|
*/
|
|
public class NamingManager
|
|
{
|
|
/**
|
|
* The environment property into which getContinuationContext() stores the
|
|
* value of the CannotProceedException parameter. The value of this field
|
|
* is <i>java.naming.spi.CannotProceedException<i>.
|
|
*/
|
|
public static final String CPE = "java.naming.spi.CannotProceedException";
|
|
|
|
private static InitialContextFactoryBuilder icfb;
|
|
|
|
// Package private so DirectoryManager can access it.
|
|
static ObjectFactoryBuilder ofb;
|
|
|
|
// This class cannot be instantiated.
|
|
NamingManager ()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Checks if the initial context factory builder has been set.
|
|
*
|
|
* @return true if the builder has been set
|
|
*
|
|
* @see #setInitialContextFactoryBuilder(InitialContextFactoryBuilder)
|
|
*/
|
|
public static boolean hasInitialContextFactoryBuilder ()
|
|
{
|
|
return icfb != null;
|
|
}
|
|
|
|
/**
|
|
* Creates the initial context. If the initial object factory builder has
|
|
* been set with {@link #setObjectFactoryBuilder(ObjectFactoryBuilder)},
|
|
* the work is delegated to this builder. Otherwise, the method searches
|
|
* for the property Context.INITIAL_CONTEXT_FACTORY first in the passed
|
|
* table and then in the system properties. The value of this property is
|
|
* uses as a class name to install the context factory. The corresponding
|
|
* class must exist, be public and have the public parameterless constructor.
|
|
*
|
|
* @param environment the properties, used to create the context.
|
|
*
|
|
* @return the created context
|
|
*
|
|
* @throws NoInitialContextException if the initial builder is not set,
|
|
* the property Context.INITIAL_CONTEXT_FACTORY is missing of the
|
|
* class, named by this property, cannot be instantiated.
|
|
* @throws NamingException if throws by the context factory
|
|
*/
|
|
public static Context getInitialContext (Hashtable<?, ?> environment)
|
|
throws NamingException
|
|
{
|
|
InitialContextFactory icf = null;
|
|
|
|
if (icfb != null)
|
|
icf = icfb.createInitialContextFactory(environment);
|
|
else
|
|
{
|
|
String java_naming_factory_initial = null;
|
|
if (environment != null)
|
|
java_naming_factory_initial
|
|
= (String) environment.get (Context.INITIAL_CONTEXT_FACTORY);
|
|
if (java_naming_factory_initial == null)
|
|
java_naming_factory_initial =
|
|
System.getProperty (Context.INITIAL_CONTEXT_FACTORY);
|
|
if (java_naming_factory_initial == null)
|
|
throw new
|
|
NoInitialContextException ("Can't find property: "
|
|
+ Context.INITIAL_CONTEXT_FACTORY);
|
|
|
|
try
|
|
{
|
|
icf = (InitialContextFactory)Class.forName
|
|
(java_naming_factory_initial, true,
|
|
Thread.currentThread().getContextClassLoader())
|
|
.newInstance ();
|
|
}
|
|
catch (Exception exception)
|
|
{
|
|
NoInitialContextException e
|
|
= new NoInitialContextException
|
|
("Can't load InitialContextFactory class: "
|
|
+ java_naming_factory_initial);
|
|
e.setRootCause(exception);
|
|
throw e;
|
|
}
|
|
}
|
|
|
|
return icf.getInitialContext (environment);
|
|
}
|
|
|
|
/**
|
|
* <p>
|
|
* Creates the URL context for the given URL scheme id.
|
|
* </p>
|
|
* <p>
|
|
* The class name of the factory that creates the context has the naming
|
|
* pattern scheme-idURLContextFactory. For instance, the factory for the "ftp"
|
|
* sheme should be named "ftpURLContextFactory".
|
|
* </p>
|
|
* <p>
|
|
* The Context.URL_PKG_PREFIXES environment property contains the
|
|
* colon-separated list of the possible package prefixes. The package name is
|
|
* constructed concatenating the package prefix with the scheme id. This
|
|
* property is searched in the passed <i>environment</i> parameter and later
|
|
* in the system properties.
|
|
* </p>
|
|
* <p>
|
|
* If the factory class cannot be found in the specified packages, system will
|
|
* try to use the default internal factory for the given scheme.
|
|
* </p>
|
|
* <p>
|
|
* After the factory is instantiated, its method
|
|
* {@link ObjectFactory#getObjectInstance(Object, Name, Context, Hashtable)}
|
|
* is called to create and return the object instance.
|
|
*
|
|
* @param refInfo passed to the factory
|
|
* @param name passed to the factory
|
|
* @param nameCtx passed to the factory
|
|
* @param scheme the url scheme that must be supported by the given context
|
|
* @param environment the properties for creating the factory and context (may
|
|
* be null)
|
|
* @return the created context
|
|
* @throws NamingException if thrown by the factory when creating the context.
|
|
*/
|
|
static Context getURLContext(Object refInfo, Name name, Context nameCtx,
|
|
String scheme, Hashtable<?,?> environment)
|
|
throws NamingException
|
|
{
|
|
// Doc specifies com.sun.jndi.url as the final destination, but we cannot
|
|
// put our classes into such namespace.
|
|
String defaultPrefix = "gnu.javax.naming.jndi.url";
|
|
|
|
// The final default location, as specified in the documentation.
|
|
String finalPrefix = "com.sun.jndi.url";
|
|
|
|
CPStringBuilder allPrefixes = new CPStringBuilder();
|
|
|
|
String prefixes;
|
|
if (environment != null)
|
|
{
|
|
prefixes = (String) environment.get(Context.URL_PKG_PREFIXES);
|
|
if (prefixes != null)
|
|
allPrefixes.append(prefixes);
|
|
}
|
|
|
|
prefixes = System.getProperty(Context.URL_PKG_PREFIXES);
|
|
if (prefixes != null)
|
|
{
|
|
if (allPrefixes.length() > 0)
|
|
allPrefixes.append(':');
|
|
allPrefixes.append(prefixes);
|
|
}
|
|
|
|
if (allPrefixes.length() > 0)
|
|
allPrefixes.append(':');
|
|
allPrefixes.append(defaultPrefix);
|
|
allPrefixes.append(':');
|
|
allPrefixes.append(finalPrefix);
|
|
|
|
scheme = scheme + "." + scheme + "URLContextFactory";
|
|
|
|
StringTokenizer tokens = new StringTokenizer(allPrefixes.toString(), ":");
|
|
while (tokens.hasMoreTokens())
|
|
{
|
|
String aTry = tokens.nextToken();
|
|
try
|
|
{
|
|
String tryClass = aTry + "." + scheme;
|
|
Class factoryClass = forName(tryClass);
|
|
if (factoryClass != null)
|
|
{
|
|
Object obj;
|
|
try
|
|
{
|
|
ObjectFactory factory = (ObjectFactory) factoryClass.newInstance();
|
|
obj = factory.getObjectInstance(refInfo, name, nameCtx,
|
|
environment);
|
|
Context ctx = (Context) obj;
|
|
if (ctx != null)
|
|
return ctx;
|
|
}
|
|
catch (RuntimeException e)
|
|
{
|
|
// TODO Auto-generated catch block
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
}
|
|
catch (ClassNotFoundException _1)
|
|
{
|
|
// Ignore it.
|
|
}
|
|
catch (ClassCastException _2)
|
|
{
|
|
// This means that the class we found was not an
|
|
// ObjectFactory or that the factory returned something
|
|
// which was not a Context.
|
|
}
|
|
catch (InstantiationException _3)
|
|
{
|
|
// If we couldn't instantiate the factory we might get
|
|
// this.
|
|
}
|
|
catch (IllegalAccessException _4)
|
|
{
|
|
// Another possibility when instantiating.
|
|
}
|
|
catch (NamingException _5)
|
|
{
|
|
throw _5;
|
|
}
|
|
catch (Exception _6)
|
|
{
|
|
// Anything from getObjectInstance.
|
|
}
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Load the class with the given name. This method tries to use the context
|
|
* class loader first. If this fails, it searches for the suitable class
|
|
* loader in the caller stack trace. This method is a central point where all
|
|
* requests to find a class by name are delegated.
|
|
*/
|
|
static Class forName(String className)
|
|
{
|
|
try
|
|
{
|
|
return Class.forName(className, true,
|
|
Thread.currentThread().getContextClassLoader());
|
|
}
|
|
catch (ClassNotFoundException nex)
|
|
{
|
|
/**
|
|
* Returns the first user defined class loader on the call stack, or
|
|
* null when no non-null class loader was found.
|
|
*/
|
|
Class[] ctx = VMStackWalker.getClassContext();
|
|
for (int i = 0; i < ctx.length; i++)
|
|
{
|
|
// Since we live in a class loaded by the bootstrap
|
|
// class loader, getClassLoader is safe to call without
|
|
// needing to be wrapped in a privileged action.
|
|
ClassLoader cl = ctx[i].getClassLoader();
|
|
try
|
|
{
|
|
if (cl != null)
|
|
return Class.forName(className, true, cl);
|
|
}
|
|
catch (ClassNotFoundException nex2)
|
|
{
|
|
// Try next.
|
|
}
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
|
|
/**
|
|
* <p>
|
|
* Creates the URL context for the given URL scheme id.
|
|
* </p>
|
|
* <p>
|
|
* The class name of the factory that creates the context has the naming
|
|
* pattern scheme-idURLContextFactory. For instance, the factory for the
|
|
* "ftp" scheme should be named "ftpURLContextFactory".
|
|
* The Context.URL_PKG_PREFIXES environment property contains the
|
|
* colon-separated list of the possible package prefixes. The package name
|
|
* is constructed by concatenating the package prefix with the scheme id.
|
|
* </p>
|
|
* <p>
|
|
* If the factory class cannot be found in the specified packages, the
|
|
* system will try to use the default internal factory for the given scheme.
|
|
* </p>
|
|
* <p>
|
|
* After the factory is instantiated, its method
|
|
* {@link ObjectFactory#getObjectInstance(Object, Name, Context, Hashtable)}
|
|
* is called to create and return the object instance.
|
|
*
|
|
* @param scheme the url scheme that must be supported by the given context
|
|
* @param environment the properties for creating the factory and context
|
|
* (may be null)
|
|
* @return the created context
|
|
* @throws NamingException if thrown by the factory when creating the
|
|
* context.
|
|
*/
|
|
public static Context getURLContext (String scheme,
|
|
Hashtable<?, ?> environment)
|
|
throws NamingException
|
|
{
|
|
return getURLContext (null, null, null, scheme, environment);
|
|
}
|
|
|
|
/**
|
|
* Sets the initial object factory builder.
|
|
*
|
|
* @param builder the builder to set
|
|
*
|
|
* @throws SecurityException if the builder cannot be installed due
|
|
* security restrictions.
|
|
* @throws NamingException if the builder cannot be installed due other
|
|
* reasons
|
|
* @throws IllegalStateException if setting the builder repeatedly
|
|
*/
|
|
public static void setObjectFactoryBuilder (ObjectFactoryBuilder builder)
|
|
throws NamingException
|
|
{
|
|
SecurityManager sm = System.getSecurityManager ();
|
|
if (sm != null)
|
|
sm.checkSetFactory ();
|
|
// Once the builder is installed it cannot be replaced.
|
|
if (ofb != null)
|
|
throw new IllegalStateException ("object factory builder already installed");
|
|
if (builder != null)
|
|
ofb = builder;
|
|
}
|
|
|
|
static StringTokenizer getPlusPath (String property, Hashtable env,
|
|
Context nameCtx)
|
|
throws NamingException
|
|
{
|
|
String path = (String) env.get (property);
|
|
if (nameCtx == null)
|
|
nameCtx = getInitialContext (env);
|
|
String path2 = (String) nameCtx.getEnvironment ().get (property);
|
|
if (path == null)
|
|
path = path2;
|
|
else if (path2 != null)
|
|
path += ":" + path2;
|
|
return new StringTokenizer (path != null ? path : "", ":");
|
|
}
|
|
|
|
/**
|
|
* <p>Creates an object for the specified name context, environment and
|
|
* referencing context object.</p>
|
|
* <p>
|
|
* If the builder factory is set by
|
|
* {@link #setObjectFactoryBuilder(ObjectFactoryBuilder)}, the call is
|
|
* delegated to that factory. Otherwise, the object is created using the
|
|
* following rules:
|
|
* <ul>
|
|
* <li>If the referencing object (refInfo) contains the factory class name,
|
|
* the object is created by this factory. If the creation fails,
|
|
* the parameter refInfo is returned as the method return value.</li>
|
|
* <li>If the referencing object has no factory class name, and the addresses
|
|
* are StringRefAddrs having the address type "URL", the object is
|
|
* created by the URL context factory. The used factory corresponds the
|
|
* the naming schema of the each URL. If the attempt to create
|
|
* the object this way is not successful, the subsequent rule is
|
|
* tried.</li>
|
|
* <li> If the refInfo is not an instance of Reference or Referencable
|
|
* (for example, null), the object is created by the factories,
|
|
* specified in the Context.OBJECT_FACTORIES property of the
|
|
* environment and the provider resource file, associated with the
|
|
* nameCtx. The value of this property is the colon separated list
|
|
* of the possible factories. If none of the factories can be
|
|
* loaded, the refInfo is returned.
|
|
* </ul>
|
|
* </p>
|
|
* <p>The object factory must be public and have the public parameterless
|
|
* constructor.</p>
|
|
*
|
|
* @param refInfo the referencing object, for which the new object must be
|
|
* created (can be null). If not null, it is usually an instance of
|
|
* the {@link Reference} or {@link Referenceable}.
|
|
* @param name the name of the object. The name is relative to
|
|
* the nameCtx naming context. The value of this parameter can be
|
|
* null if the name is not specified.
|
|
* @param nameCtx the naming context, in which scope the name of the new
|
|
* object is specified. If this parameter is null, the name is
|
|
* specified in the scope of the initial context.
|
|
* @param environment contains additional information for creating the object.
|
|
* This paramter can be null if there is no need to provide any
|
|
* additional information.
|
|
*
|
|
* @return the created object. If the creation fails, in some cases
|
|
* the parameter refInfo may be returned.
|
|
*
|
|
* @throws NamingException if the attempt to name the new object has failed
|
|
* @throws Exception if the object factory throws it. The object factory
|
|
* only throws an exception if it does not want other factories
|
|
* to be used to create the object.
|
|
*/
|
|
public static Object getObjectInstance (Object refInfo,
|
|
Name name,
|
|
Context nameCtx,
|
|
Hashtable<?, ?> environment)
|
|
throws Exception
|
|
{
|
|
ObjectFactory factory = null;
|
|
|
|
if (ofb != null)
|
|
factory = ofb.createObjectFactory (refInfo, environment);
|
|
else
|
|
{
|
|
// First see if we have a Reference or a Referenceable. If so
|
|
// we do some special processing.
|
|
Object ref2 = refInfo;
|
|
if (refInfo instanceof Referenceable)
|
|
ref2 = ((Referenceable) refInfo).getReference ();
|
|
if (ref2 instanceof Reference)
|
|
{
|
|
Reference ref = (Reference) ref2;
|
|
|
|
// If we have a factory class name then we use that.
|
|
String fClass = ref.getFactoryClassName ();
|
|
if (fClass != null)
|
|
{
|
|
// Exceptions here are passed to the caller.
|
|
Class k = Class.forName (fClass,
|
|
true,
|
|
Thread.currentThread().getContextClassLoader());
|
|
factory = (ObjectFactory) k.newInstance ();
|
|
}
|
|
else
|
|
{
|
|
// There's no factory class name. If the address is a
|
|
// StringRefAddr with address type `URL', then we try
|
|
// the URL's context factory.
|
|
Enumeration e = ref.getAll ();
|
|
while (e.hasMoreElements ())
|
|
{
|
|
RefAddr ra = (RefAddr) e.nextElement ();
|
|
if (ra instanceof StringRefAddr
|
|
&& "URL".equals (ra.getType ()))
|
|
{
|
|
factory
|
|
= (ObjectFactory) getURLContext (refInfo,
|
|
name,
|
|
nameCtx,
|
|
(String) ra.getContent (),
|
|
environment);
|
|
Object obj = factory.getObjectInstance (refInfo,
|
|
name,
|
|
nameCtx,
|
|
environment);
|
|
if (obj != null)
|
|
return obj;
|
|
}
|
|
}
|
|
|
|
// Have to try the next step.
|
|
factory = null;
|
|
}
|
|
}
|
|
|
|
// Now look at OBJECT_FACTORIES to find the factory.
|
|
if (factory == null)
|
|
{
|
|
StringTokenizer tokens = getPlusPath (Context.OBJECT_FACTORIES,
|
|
environment, nameCtx);
|
|
|
|
while (tokens.hasMoreTokens ())
|
|
{
|
|
String klassName = tokens.nextToken ();
|
|
Class k = Class.forName (klassName,
|
|
true,
|
|
Thread.currentThread().getContextClassLoader());
|
|
factory = (ObjectFactory) k.newInstance ();
|
|
Object obj = factory.getObjectInstance (refInfo, name,
|
|
nameCtx, environment);
|
|
if (obj != null)
|
|
return obj;
|
|
}
|
|
|
|
// Failure.
|
|
return refInfo;
|
|
}
|
|
}
|
|
|
|
if (factory == null)
|
|
return refInfo;
|
|
Object obj = factory.getObjectInstance (refInfo, name,
|
|
nameCtx, environment);
|
|
return obj == null ? refInfo : obj;
|
|
}
|
|
|
|
/**
|
|
* Sets the initial context factory builder.
|
|
*
|
|
* @param builder the builder to set
|
|
*
|
|
* @throws SecurityException if the builder cannot be installed due
|
|
* security restrictions.
|
|
* @throws NamingException if the builder cannot be installed due other
|
|
* reasons
|
|
* @throws IllegalStateException if setting the builder repeatedly
|
|
*
|
|
* @see #hasInitialContextFactoryBuilder()
|
|
*/
|
|
public static void setInitialContextFactoryBuilder
|
|
(InitialContextFactoryBuilder builder)
|
|
throws NamingException
|
|
{
|
|
SecurityManager sm = System.getSecurityManager ();
|
|
if (sm != null)
|
|
sm.checkSetFactory ();
|
|
// Once the builder is installed it cannot be replaced.
|
|
if (icfb != null)
|
|
throw new IllegalStateException ("ctx factory builder already installed");
|
|
if (builder != null)
|
|
icfb = builder;
|
|
}
|
|
|
|
/**
|
|
* Creates a context in which the context operation must be continued.
|
|
* This method is used by operations on names that span multiple namespaces.
|
|
*
|
|
* @param cpe the exception that triggered this continuation. This method
|
|
* obtains the environment ({@link CannotProceedException#getEnvironment()}
|
|
* and sets the environment property {@link #CPE} = cpe.
|
|
*
|
|
* @return a non null context for continuing the operation
|
|
*
|
|
* @throws NamingException if the naming problems have occured
|
|
*/
|
|
public static Context getContinuationContext (CannotProceedException cpe)
|
|
throws NamingException
|
|
{
|
|
Hashtable env = cpe.getEnvironment ();
|
|
if (env != null)
|
|
env.put (CPE, cpe);
|
|
|
|
// TODO: Check if this implementation matches the API specification
|
|
try
|
|
{
|
|
Object obj = getObjectInstance (cpe.getResolvedObj(),
|
|
cpe.getAltName (),
|
|
cpe.getAltNameCtx (),
|
|
env);
|
|
if (obj != null)
|
|
return (Context) obj;
|
|
}
|
|
catch (Exception _)
|
|
{
|
|
}
|
|
|
|
// fix stack trace for re-thrown exception (message confusing otherwise)
|
|
cpe.fillInStackTrace();
|
|
|
|
throw cpe;
|
|
}
|
|
|
|
/**
|
|
* Get the object state for binding.
|
|
*
|
|
* @param obj the object, for that the binding state must be retrieved. Cannot
|
|
* be null.
|
|
* @param name the name of this object, related to the nameCtx. Can be null if
|
|
* not specified.
|
|
* @param nameCtx the naming context, to that the object name is related. Can
|
|
* be null if the name is related to the initial default context.
|
|
* @param environment the properties for creating the object state. Can be
|
|
* null if no properties are provided.
|
|
* @return the object state for binding, may be null if no changes are
|
|
* returned by the factory
|
|
* @throws NamingException
|
|
*/
|
|
public static Object getStateToBind (Object obj, Name name,
|
|
Context nameCtx, Hashtable<?, ?> environment)
|
|
throws NamingException
|
|
{
|
|
StringTokenizer tokens = getPlusPath (Context.STATE_FACTORIES,
|
|
environment, nameCtx);
|
|
while (tokens.hasMoreTokens ())
|
|
{
|
|
String klassName = tokens.nextToken ();
|
|
try
|
|
{
|
|
Class k = Class.forName (klassName,
|
|
true,
|
|
Thread.currentThread().getContextClassLoader());
|
|
StateFactory factory = (StateFactory) k.newInstance ();
|
|
Object o = factory.getStateToBind (obj, name, nameCtx,
|
|
environment);
|
|
if (o != null)
|
|
return o;
|
|
}
|
|
catch (ClassNotFoundException _1)
|
|
{
|
|
// Ignore it.
|
|
}
|
|
catch (ClassCastException _2)
|
|
{
|
|
// This means that the class we found was not an
|
|
// ObjectFactory or that the factory returned something
|
|
// which was not a Context.
|
|
}
|
|
catch (InstantiationException _3)
|
|
{
|
|
// If we couldn't instantiate the factory we might get
|
|
// this.
|
|
}
|
|
catch (IllegalAccessException _4)
|
|
{
|
|
// Another possibility when instantiating.
|
|
}
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
}
|