You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rs...@apache.org on 2002/08/15 20:22:44 UTC

cvs commit: jakarta-commons/discovery/src/java/org/apache/commons/discovery/strategy DefaultLoadStrategy.java

rsitze      2002/08/15 11:22:44

  Modified:    discovery/src/java/org/apache/commons/discovery/load
                        Loaders.java
               discovery/src/java/org/apache/commons/discovery/base
                        ImplClass.java Environment.java
               discovery/src/java/org/apache/commons/discovery/strategy
                        DefaultLoadStrategy.java
  Log:
  switch for searching using app+lib or lib-only loaders.
  
  Revision  Changes    Path
  1.6       +17 -15    jakarta-commons/discovery/src/java/org/apache/commons/discovery/load/Loaders.java
  
  Index: Loaders.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/load/Loaders.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Loaders.java	15 Aug 2002 17:45:46 -0000	1.5
  +++ Loaders.java	15 Aug 2002 18:22:44 -0000	1.6
  @@ -77,16 +77,16 @@
    */
   public class Loaders {
       private final Environment env;
  -    private final Class      spiClass;
  +    private final Class       spiClass;
       
       /**
  -     * System ClassLoaders only
  -     * 
  -     * This is NOT the same as spiContext.getClassLoaders(),
  -     * which includes the thread context class loader.
  +     * Library ClassLoaders only (sans App loaders)
        */
  -    private final ClassLoader[] systemLoaders;
  +    private final ClassLoader[] libLoaders;
       
  +    /**
  +     * Application + Library ClassLoaders only
  +     */
       private final ClassLoader[] appLoaders;
   
   
  @@ -94,12 +94,12 @@
       {
           this.env = env;
           this.spiClass = spi.getSPClass();
  -        this.systemLoaders = createSystemLoaders();
  +        this.libLoaders = createLibLoaders();
           this.appLoaders = createAppLoaders();
       }
       
  -    public ClassLoader[] getSystemLoaders() {
  -        return systemLoaders;
  +    public ClassLoader[] getLibLoaders() {
  +        return libLoaders;
       }
       
       public ClassLoader[] getAppLoaders() {
  @@ -115,18 +115,20 @@
        *
        * @param serviceImplName Fully qualified name of the implementation class
        * 
  -     * @param systemOnly Use only 'system' class loaders
  -     *                  (do not try thread context class loader).
  +     * @param libOnly Use library loaders, a subset of the application's
  +     *                class loaders.  Library loaders do not include
  +     *                the thread context class loader or the calling class'
  +     *                class loader.
        *
        * @exception DiscoveryException if a suitable instance cannot be created,
        *                             or if the class created is not an instance
        *                             of <code>spi</code>
        */
  -    public Class loadClass(String className, boolean systemOnly)
  +    public Class loadClass(String className, boolean libOnly)
           throws DiscoveryException
       {
           Class clazz = ClassLoaderUtils.loadClass(className,
  -                           systemOnly ? systemLoaders : appLoaders);
  +                           libOnly ? libLoaders : appLoaders);
               
           if (clazz != null  &&  !spiClass.isAssignableFrom(clazz)) {
               throw new DiscoveryException("Class " + className +
  @@ -173,11 +175,11 @@
       }
       
       /**
  -     * List of 'system' class loaders to the SPI.
  +     * List of 'library' class loaders to the SPI.
        * The last should always return a non-null loader, so we
        * always (?!) have a list of at least one classloader.
        */
  -    private final ClassLoader[] createSystemLoaders() {
  +    private final ClassLoader[] createLibLoaders() {
           return ClassLoaderUtils.compactUniq(
                   new ClassLoader[] {spiClass.getClassLoader(),
                                      env.getRootDiscoveryClass().getClassLoader(),
  
  
  
  1.2       +6 -5      jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/ImplClass.java
  
  Index: ImplClass.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/ImplClass.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ImplClass.java	14 Aug 2002 21:46:21 -0000	1.1
  +++ ImplClass.java	15 Aug 2002 18:22:44 -0000	1.2
  @@ -172,13 +172,14 @@
        * 
        * @param loaders
        * 
  -     * @param systemOnly Use system loaders, as opposed to application
  -     *                   class loaders.  System loaders do not include
  -     *                   the thread context class loader.
  +     * @param libOnly Use library loaders, a subset of the application's
  +     *                class loaders.  Library loaders do not include
  +     *                the thread context class loader or the calling class'
  +     *                class loader.
        */    
  -    public Class loadImplClass(Loaders loaders, boolean systemOnly) {
  +    public Class loadImplClass(Loaders loaders, boolean libOnly) {
           if (implClass == null) {
  -            implClass = loaders.loadClass(getImplName(), systemOnly);
  +            implClass = loaders.loadClass(getImplName(), libOnly);
           }
   
           return implClass;
  
  
  
  1.3       +12 -0     jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/Environment.java
  
  Index: Environment.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/base/Environment.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Environment.java	15 Aug 2002 17:45:46 -0000	1.2
  +++ Environment.java	15 Aug 2002 18:22:44 -0000	1.3
  @@ -93,6 +93,8 @@
       private final Class rootDiscoveryClass;
       private final Class callingClass;
       
  +    private boolean searchLibOnly;
  +    
       public Environment(Class rootDiscoveryClass) {
           this(defaultGroupContext, rootDiscoveryClass, defaultRootDiscoveryClass);
       }
  @@ -122,6 +124,8 @@
                rootDiscoveryClass != defaultRootDiscoveryClass)
               ? rootDiscoveryClass
               : callingClass;
  +            
  +        this.searchLibOnly = false;
       }
       
       public ClassLoader getThreadContextClassLoader() {
  @@ -141,5 +145,13 @@
        */    
       public Class getCallingClass() {
           return callingClass;
  +    }
  +    
  +    public void setSearchLibOnly(boolean searchLibOnly) {
  +        this.searchLibOnly = searchLibOnly;
  +    }
  +    
  +    public boolean getSearchLibOnly() {
  +        return searchLibOnly;
       }
   }
  
  
  
  1.4       +1 -1      jakarta-commons/discovery/src/java/org/apache/commons/discovery/strategy/DefaultLoadStrategy.java
  
  Index: DefaultLoadStrategy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/discovery/src/java/org/apache/commons/discovery/strategy/DefaultLoadStrategy.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultLoadStrategy.java	14 Aug 2002 21:46:21 -0000	1.3
  +++ DefaultLoadStrategy.java	15 Aug 2002 18:22:44 -0000	1.4
  @@ -169,7 +169,7 @@
   
           if (className != null) {
               implClass = spi.createImplClass(className);
  -            implClass.loadImplClass(loaders, false);
  +            implClass.loadImplClass(loaders, env.getSearchLibOnly());
           } else {
               // All else fails: try the fallback implementation class,
               // but limit loaders to 'system' loaders, in an
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>