procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libjava/classpath/ChangeLog.gcj:

Browse source 
2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.

From-SVN: r125302
This commit is contained in:
Matthias Klose 2007-06-03 23:18:43 +00:00
parent af333b9a7f
commit e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
Download patch file Download diff file Expand all files Collapse all files

274
libjava/classpath/java/util/ServiceLoader.java Normal file
View file

@ -0,0 +1,274 @@
/* ServiceLoader.java -- Allows loading of plug-in services.
Copyright (C) 2006, 2007 Free Software Foundation
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package java.util;
import gnu.classpath.ServiceFactory;
/**
* <p>
* Facilities for loading service providers. A service is
* defined by a set of interfaces or abstract classes, and
* a service provider gives a concrete implementation of this.
* Service providers may be installed as part of the runtime
* environment using JAR files in the extension directories,
* or may be simply supplied on the classpath.
* </p>
* <p>
* In terms of loading a service, the service is defined by
* a single interface or abstract class which the provider
* implements. This may not constitute the entire service,
* but is simply a mechanism by which a provider of the
* service can be loaded and its capabilities determined.
* The variety of possible services means that no more
* requirements are made of the service provider other than
* that it must have an accessible zero argument constructor
* in order to allow an instance to be created.
* </p>
* <p>
* Service providers are listed in a file named after the
* service type in the directory <code>META-INF/services</code>.
* The file contains a list of classes, and must be encoded
* using UTF-8. Whitespace is ignored. Comments can be
* included by using a <code>'#'</code> prefix; anything occurring
* on the same line after this symbol is ignored. Duplicate classes
* are ignored.
* </p>
* <p>
* The classes are loaded using the same classloader that was
* queried in order to locate the configuration file. As a result,
* the providers do not need to reside in the same JAR file as the
* resource; they merely have to be accessible to this classloader,
* which may differ from the one that loaded the file itself.
* </p>
* <p>
* Providers are located and instantiated lazily, as calls to the
* {@link #iterator()} are made. Providers are cached, and those in
* the cache are returned first. The cache may be cleared by calling
* {@link #reload()}. Service loaders always execute in the security
* context of the caller, so ideally calls should be made from a trusted
* source.
* </p>
* <p>
* Note that this class is not thread-safe, and that strange errors may
* occur as the result of the use of remote URLs occurring on the classpath,
* which lead to erroneous web pages.
* </p>
*
* @author Andrew John Hughes (gnu_andrew@member.fsf.org)
* @since 1.6
*/
public final class ServiceLoader<S>
implements Iterable<S>
{
/**
* The class of the service provider.
*/
private Class<S> spi;
/**
* The class loader for the service provider.
*/
private ClassLoader loader;
/**
* The cache of service providers.
*/
private List<S> cache;
/**
* The {@link gnu.classpath.ServiceFactory} iterator
* from which providers are obtained.
*/
private Iterator<S> serviceIt;
/**
* Constructs a new {@link ServiceLoader} with
* the specified provider and class loader.
*
* @param spi the service to load.
* @param loader the class loader to use.
*/
private ServiceLoader(Class<S> spi, ClassLoader loader)
{
this.spi = spi;
this.loader = loader;
cache = new ArrayList<S>();
}
/**
* Lazily loads the available providers. The iterator first returns
* providers from the cache, in instantiation order, followed by any
* remaining providers, which are added to the cache after loading.
* The actual loading and parsing of the configuration file takes
* place in the {@link Iterator#hasNext()} and {@link Iterator#next()}
* methods, which means that they may result in a
* {@link ServiceConfigurationError} being thrown. If such an error
* does occur, subsequent invocations will attempt to recover.
* The {@link remove()} method is not supported and instead throws
* an {@link UnsupportedOperationException}.
*
* @return an iterator that lazily loads service providers.
*/
public Iterator<S> iterator()
{
return new Iterator<S>()
{
/**
* The cache iterator.
*/
private Iterator<S> cacheIt = cache.iterator();
public boolean hasNext()
{
if (cacheIt.hasNext())
return true;
if (serviceIt == null)
serviceIt =
ServiceFactory.lookupProviders(spi, loader, true);
return serviceIt.hasNext();
}
public S next()
{
if (cacheIt.hasNext())
return cacheIt.next();
if (serviceIt == null)
serviceIt =
ServiceFactory.lookupProviders(spi, loader, true);
S nextService = serviceIt.next();
cache.add(nextService);
return nextService;
}
public void remove()
{
throw new UnsupportedOperationException();
}
};
}
/**
* Creates a new service loader for the given service,
* using the context class loader of the current thread.
* This is equivalent to calling <code>ServiceLoader.load(service,
* Thread.currentThread().getContextClassLoader())</code>.
*
* @param service the interface or abstract class that represents
* the service.
* @return a new {@link ServiceLoader} instance.
*/
public static <S> ServiceLoader<S> load(Class<S> service)
{
return load(service,
Thread.currentThread().getContextClassLoader());
}
/**
* Creates a new service loader for the given service,
* using the specified class loader. The class loader is
* used to access the configuration file and the service
* provider instances themselves. If the loader is
* <code>null</code>, the system class loader (or, if
* this is also <code>null</code>, the bootstrap class
* loader).
*
* @param service the interface or abstract class that represents
* the service.
* @param loader the class loader used to load the configuration
* file and service providers.
* @return a new {@link ServiceLoader} instance.
*/
public static <S> ServiceLoader<S> load(Class<S> service,
ClassLoader loader)
{
if (loader == null)
loader = ClassLoader.getSystemClassLoader();
return new ServiceLoader(service, loader);
}
/**
* Creates a new service loader for the given service,
* using the extension class loader. If the extension
* class loader can not be found, the system class loader
* is used (or, if this is <code>null</code>, the
* bootstrap class loader). The primary use of this method
* is to only obtain installed services, ignoring any which
* may appear on the classpath. This is equivalent to calling
* <code>load(service, extClassLoader)</code> where
* <code>extClassLoader</code> is the extension class loader
* (or <code>null</code> if this is unavailable).
*
* @param service the interface or abstract class that represents
* the service.
* @return a new {@link ServiceLoader} instance.
*/
public static <S> ServiceLoader<S> loadInstalled(Class<S> service)
{
/* We expect the extension class loader to be the parent
* of the system class loader, as in
* ClassLoader.getDefaultSystemClassLoader() */
return load(service,
ClassLoader.getSystemClassLoader().getParent());
}
/**
* Clears the cache of the provider, so that all providers
* are again read from the configuration file and instantiated.
*/
public void reload()
{
cache.clear();
}
/**
* Returns a textual representation of this
* {@link ServiceLoader}.
*
* @return a textual representation of the
* service loader.
*/
public String toString()
{
return getClass().getName() +
"[spi=" + spi +
",loader=" + loader +
"]";
}
}