commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmi...@apache.org
Subject cvs commit: jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard StandardReflectedClazzTest.java StandardReflectedInstanceFactoryTest.java StandardReflectedListPropertyTest.java StandardReflectedOperationTest.java
Date Tue, 07 Jan 2003 00:43:51 GMT
dmitri      2003/01/06 16:43:51

  Modified:    clazz/src/java/org/apache/commons/clazz Clazz.java
                        ClazzLoaderFactory.java
               clazz/src/java/org/apache/commons/clazz/common
                        ExtendedClazzLoaderFactory.java
                        StandardClazzLoaderFactory.java
               clazz/src/test/org/apache/commons/clazz/bean
                        BeanClazzLoaderTest.java BeanClazzTest.java
               clazz/src/test/org/apache/commons/clazz/reflect
                        ReflectedClazzTestSupport.java
               clazz/src/test/org/apache/commons/clazz/reflect/extended
                        ExtendedReflectedClazzTest.java
                        ExtendedReflectedInstanceFactoryTest.java
                        ExtendedReflectedListPropertyTest.java
                        ExtendedReflectedOperationTest.java
                        ReflectedMappedPropertyTest.java
               clazz/src/test/org/apache/commons/clazz/reflect/standard
                        StandardReflectedClazzTest.java
                        StandardReflectedInstanceFactoryTest.java
                        StandardReflectedListPropertyTest.java
                        StandardReflectedOperationTest.java
  Added:       clazz/src/java/org/apache/commons/clazz/common
                        ClazzLoaderFactorySupport.java
  Log:
  Improved class loader detection
  
  Revision  Changes    Path
  1.7       +60 -62    jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/Clazz.java
  
  Index: Clazz.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/Clazz.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Clazz.java	5 Jan 2003 23:11:40 -0000	1.6
  +++ Clazz.java	7 Jan 2003 00:43:50 -0000	1.7
  @@ -79,29 +79,23 @@
       private String name;
       private List listeners;
   
  -    public static final String DEFAULT_CLAZZ_LOADER_FACTORY =
  -        "org.apache.commons.clazz.DefaultClazzLoaderFactory";
  +    public static final String STANDARD_CLAZZ_MODEL =
  +        "org.apache.commons.clazz.StandardClazzModel";
           
  -    public static final String STANDARD_CLAZZ_LOADER_FACTORY =
  -        "org.apache.commons.clazz.StandardClazzLoaderFactory";
  -        
  -    public static final String EXTENDED_CLAZZ_LOADER_FACTORY =
  -        "org.apache.commons.clazz.ExtendedClazzLoaderFactory";
  +    public static final String EXTENDED_CLAZZ_MODEL =
  +        "org.apache.commons.clazz.ExtendedClazzModel";
           
  +    private static String defaultClazzModelKey = EXTENDED_CLAZZ_MODEL;
       private static ClazzLoader defaultClazzLoader;
       private static Map clazzLoaderFactories = new HashMap();
       
       static {
           setClazzLoaderFactory(
  -            STANDARD_CLAZZ_LOADER_FACTORY,
  +            STANDARD_CLAZZ_MODEL,
               StandardClazzLoaderFactory.FACTORY);
           
           setClazzLoaderFactory(
  -            EXTENDED_CLAZZ_LOADER_FACTORY,
  -            ExtendedClazzLoaderFactory.FACTORY);
  -            
  -        setClazzLoaderFactory(
  -            DEFAULT_CLAZZ_LOADER_FACTORY,
  +            EXTENDED_CLAZZ_MODEL,
               ExtendedClazzLoaderFactory.FACTORY);
       }
           
  @@ -109,88 +103,92 @@
        * Register a clazz loader factory for the specified key, which represents
        * the type of model the corresponding clazz loaders implement.
        * 
  -     * @param key is the type of the model
  +     * @param modelKey is the type of the model
        * @param clazzLoader
        */
       public static void setClazzLoaderFactory(
  -            String key, ClazzLoaderFactory clazzLoaderFactory)
  +            String modelKey, ClazzLoaderFactory clazzLoaderFactory)
       {
  -        clazzLoaderFactories.put(key, clazzLoaderFactory);
  +        clazzLoaderFactories.put(modelKey, clazzLoaderFactory);
       }
       
       /**
  -     * Register the default clazz loader factory.
  +     * Returns a ClazzLoaderFactory registered for the supplied model key. We
  +     * can have multiple clazz loader factories implementing different models
  +     * (e.g. Standard JavaBeans, Extended JavaBeans etc).
        * 
  -     * @param clazzLoaderFactory
  +     * @param key is the type of the model we need
  +     * @return ClazzLoaderFactory
        */
  -    public static void setDefaultClazzLoaderFactory(
  -            ClazzLoaderFactory clazzLoaderFactory) 
  -    {
  -        clazzLoaderFactories.put(
  -            DEFAULT_CLAZZ_LOADER_FACTORY,
  -            clazzLoaderFactory);
  +    public static ClazzLoaderFactory getClazzLoaderFactory(String modelKey) {
  +        return (ClazzLoaderFactory) clazzLoaderFactories.get(modelKey);
       }
  -
  +    
       /**
  -     * Returns the default clazz loader factory.
  +     * Select the default clazz model by its key.
  +     * 
  +     * @param defaultClazzModelKey
        */
  -    public static ClazzLoaderFactory getDefaultClazzLoaderFactory() {
  -        return (ClazzLoaderFactory) clazzLoaderFactories.get(
  -            DEFAULT_CLAZZ_LOADER_FACTORY);
  +    public static void setDefaultClazzModel(String defaultClazzModelKey) {
  +        Clazz.defaultClazzModelKey = defaultClazzModelKey;
       }
  -    
  +
       /**
  -     * Sets the default ClazzLoader.
  -     * 
  -     * @param defaultClazzLoader The defaultClazzLoader to set
  +     * Returns the key of the default clazz model.
        */
  -    public static void setDefaultClazzLoader(ClazzLoader defaultClazzLoader) {
  -        Clazz.defaultClazzLoader = defaultClazzLoader;
  +    public static String getDefaultClazzModel() {
  +        return defaultClazzModelKey;
       }
  -    
  +
       /**
  -     * Returns the default ClazzLoader.
  +     * Returns a clazz loader for the specified model.  The context Class
  +     * needs to be provided in order for the ClazzLoaderFactories to be able to
  +     * determine the ClassLoader to use for reflection.
        * 
  +     * @param modelKey
  +     * @param context
        * @return ClazzLoader
        */
  -    public static ClazzLoader getDefaultClazzLoader() {
  -        if (defaultClazzLoader == null) {
  -            defaultClazzLoader =
  -                getDefaultClazzLoaderFactory().createClazzLoader(
  -                    Clazz.class.getClassLoader());
  +    public static ClazzLoader getClazzLoader(String modelKey, Class context) {
  +        if (context == null) {
  +            context = Clazz.class;
           }
  -        return defaultClazzLoader;
  +        return getClazzLoaderFactory(modelKey).getClazzLoader(
  +            context.getClassLoader());
       }
   
       /**
  -     * Returns a ClazzLoaderFactory registered for the supplied key. We can have
  -     * multiple clazz loader factories implementing different models (e.g.
  -     * Standard JavaBeans, Extended JavaBeans etc).
  -     * 
  -     * @param key is the type of the model we need
  -     * @return ClazzLoaderFactory
  -     */
  -    public static ClazzLoaderFactory getClazzLoaderFactory(String key){
  -        return (ClazzLoaderFactory)clazzLoaderFactories.get(key);
  +     * Returns the ClazzLoader for the default clazz model.
  +     */    
  +    public static ClazzLoader getDefaultClazzLoader(Class context) {
  +        return getClazzLoader(getDefaultClazzModel(), context);
       }
       
       /**
  -     * Uses the default clazz loader to obtain the Clazz for the supplied
  -     * object.
  +     * Uses the clazz loader for the specified model to obtain the Clazz for the
  +     * supplied object.
        */
  -    public static Clazz getClazz(Object instance){
  -        if (instance == null){
  +    public static Clazz getClazz(Object instance, String modelKey) {
  +        if (instance == null) {
               throw new NullPointerException();
           }
  -        
  -        Clazz clazz = getDefaultClazzLoader().getClazz(instance);
  -        if (clazz == null){
  +
  +        Clazz clazz =
  +            getClazzLoader(modelKey, instance.getClass()).getClazz(instance);
  +        if (clazz == null) {
               throw new ClazzNotFoundException(instance.getClass().getName());
           }
           return clazz;
  -    }    
  -    
  +    }
       
  +    /**
  +     * Uses the default clazz loader to obtain the Clazz for the supplied
  +     * object.
  +     */
  +    public static Clazz getClazz(Object instance){
  +        return getClazz(instance, getDefaultClazzModel());
  +    }    
  +        
       /**
        * Keep the constructor protected or private, we want Clazzes to 
        * be created by their ClazzLoaders only.
  
  
  
  1.2       +4 -4      jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/ClazzLoaderFactory.java
  
  Index: ClazzLoaderFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/ClazzLoaderFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClazzLoaderFactory.java	5 Jan 2003 23:11:40 -0000	1.1
  +++ ClazzLoaderFactory.java	7 Jan 2003 00:43:50 -0000	1.2
  @@ -62,9 +62,9 @@
   public interface ClazzLoaderFactory {
   
       /**
  -     * Allocate and configure a clazz loader that uses the supplied class loader
  -     * for reflection.
  +     * Allocate, configure and cache a clazz loader that uses the supplied class
  +     * loader for reflection.
        */
  -    ClazzLoader createClazzLoader(ClassLoader contextClassLoader);
  +    ClazzLoader getClazzLoader(ClassLoader contextClassLoader);
       
   }
  
  
  
  1.2       +11 -13    jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/common/ExtendedClazzLoaderFactory.java
  
  Index: ExtendedClazzLoaderFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/common/ExtendedClazzLoaderFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExtendedClazzLoaderFactory.java	5 Jan 2003 23:11:40 -0000	1.1
  +++ ExtendedClazzLoaderFactory.java	7 Jan 2003 00:43:50 -0000	1.2
  @@ -65,7 +65,7 @@
    * @author <a href="mailto:dmitri@apache.org">Dmitri Plotnikov</a>
    * @version $Id$
    */
  -public class ExtendedClazzLoaderFactory implements ClazzLoaderFactory {
  +public class ExtendedClazzLoaderFactory extends ClazzLoaderFactorySupport {
   
       public static final ClazzLoaderFactory FACTORY =
           new ExtendedClazzLoaderFactory();
  @@ -76,31 +76,29 @@
       protected ExtendedClazzLoaderFactory() {
       }
   
  -    /**
  -     * @see org.apache.commons.clazz.ClazzLoaderFactory#createClazzLoader(java.lang.ClassLoader)
  -     */
  -    public ClazzLoader createClazzLoader(ClassLoader contextClassLoader) {
  +    public ClazzLoader createClazzLoader(ClassLoader contextClassLoader)
  +    {
           GroupClazzLoader loader = new CachingGroupClazzLoader(null);
   
           // First build a general reflection-based ClazzLoader
  -        GroupClazzLoader reflectedGroup = new ReflectedGroupClazzLoader(loader);
  +        GroupClazzLoader reflectedGroup =
  +            new ReflectedGroupClazzLoader(loader);
   
           ClazzLoader reflectedLoader =
               new ExtendedReflectedClazzLoader(loader, contextClassLoader);
  -            
  +
           reflectedGroup.addClazzLoader(reflectedLoader);
   
           loader.addClazzLoader(reflectedGroup);
   
  -
           // Now build a dynamic clazz loader
  -        
  +
           GroupClazzLoader beanGroup = new BeanGroupClazzLoader(loader);
  -        
  +
           ClazzLoader beanLoader = new BeanClazzLoader(beanGroup);
  -        
  +
           beanGroup.addClazzLoader(beanLoader);
  -        
  +
           loader.addClazzLoader(beanGroup);
           
           return loader;
  
  
  
  1.2       +2 -5      jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/common/StandardClazzLoaderFactory.java
  
  Index: StandardClazzLoaderFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/common/StandardClazzLoaderFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StandardClazzLoaderFactory.java	5 Jan 2003 23:11:40 -0000	1.1
  +++ StandardClazzLoaderFactory.java	7 Jan 2003 00:43:50 -0000	1.2
  @@ -65,7 +65,7 @@
    * @author <a href="mailto:dmitri@apache.org">Dmitri Plotnikov</a>
    * @version $Id$
    */
  -public class StandardClazzLoaderFactory implements ClazzLoaderFactory {
  +public class StandardClazzLoaderFactory extends ClazzLoaderFactorySupport {
   
       public static final ClazzLoaderFactory FACTORY =
           new StandardClazzLoaderFactory();
  @@ -76,9 +76,6 @@
       protected StandardClazzLoaderFactory() {
       }
   
  -    /**
  -     * @see org.apache.commons.clazz.ClazzLoaderFactory#createClazzLoader(java.lang.ClassLoader)
  -     */
       public ClazzLoader createClazzLoader(ClassLoader contextClassLoader) {
           GroupClazzLoader loader = new CachingGroupClazzLoader(null);
   
  
  
  
  1.1                  jakarta-commons-sandbox/clazz/src/java/org/apache/commons/clazz/common/ClazzLoaderFactorySupport.java
  
  Index: ClazzLoaderFactorySupport.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  package org.apache.commons.clazz.common;
  
  import org.apache.commons.clazz.ClazzLoader;
  import org.apache.commons.clazz.ClazzLoaderFactory;
  import org.apache.commons.collections.ReferenceMap;
  
  /**
   * 
   * @author <a href="mailto:dmitri@apache.org">Dmitri Plotnikov</a>
   * @version $Id: ClazzLoaderFactorySupport.java,v 1.1 2003/01/07 00:43:50 dmitri Exp $
   */
  public abstract class ClazzLoaderFactorySupport implements ClazzLoaderFactory {
  
      private ReferenceMap clazzLoaders =
          new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.HARD);
      
      /**
       * Constructor for ClazzLoaderFactorySupport.
       */
      protected ClazzLoaderFactorySupport() {
      }
  
      /**
       * @see org.apache.commons.clazz.ClazzLoaderFactory#getClazzLoader(java.lang.ClassLoader)
       */
      public synchronized ClazzLoader getClazzLoader(
              ClassLoader contextClassLoader) 
      {
          ClazzLoader loader = (ClazzLoader) clazzLoaders.get(contextClassLoader);
          if (loader == null) {
              loader = createClazzLoader(contextClassLoader);
              clazzLoaders.put(contextClassLoader, loader);
          }  
          return loader;
      }
  
      protected abstract ClazzLoader createClazzLoader(
              ClassLoader contextClassLoader);
  }
  
  
  
  1.3       +6 -4      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/bean/BeanClazzLoaderTest.java
  
  Index: BeanClazzLoaderTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/bean/BeanClazzLoaderTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BeanClazzLoaderTest.java	14 Dec 2002 02:38:43 -0000	1.2
  +++ BeanClazzLoaderTest.java	7 Jan 2003 00:43:50 -0000	1.3
  @@ -84,9 +84,10 @@
   
       private Clazz defineClazz(){
           BeanClazz clazz =
  -            (BeanClazz) Clazz.getDefaultClazzLoader().defineClazz(
  +            (BeanClazz) Clazz.getDefaultClazzLoader(getClass()).defineClazz(
                   BeanClazzTest.TEST_CLAZZ_NAME,
  -                BeanClazz.class, null);
  +                BeanClazz.class,
  +                null);
           assertNotNull(clazz);
           ClazzProperty prop1 =
               new BeanClazzProperty(clazz, "integerProperty", "int");
  @@ -106,7 +107,8 @@
       public void testGetClazz() {
           defineClazz();
           Clazz clazz =
  -            Clazz.getDefaultClazzLoader().getClazzForName(BeanClazzTest.TEST_CLAZZ_NAME);
  +            Clazz.getDefaultClazzLoader(getClass()).getClazzForName(
  +                BeanClazzTest.TEST_CLAZZ_NAME);
           assertNotNull(clazz);
       }
   
  
  
  
  1.4       +10 -8     jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/bean/BeanClazzTest.java
  
  Index: BeanClazzTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/bean/BeanClazzTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BeanClazzTest.java	16 Dec 2002 23:17:41 -0000	1.3
  +++ BeanClazzTest.java	7 Jan 2003 00:43:50 -0000	1.4
  @@ -103,19 +103,21 @@
       }
   
       public void setUp(){
  -        superClazz =         
  -            (BeanClazz) Clazz.getDefaultClazzLoader().defineClazz(
  +        superClazz =
  +            (BeanClazz) Clazz.getDefaultClazzLoader(getClass()).defineClazz(
                   TEST_SUPERCLAZZ_NAME,
  -                BeanClazz.class, null);
  +                BeanClazz.class,
  +                null);
           superClazz.addDeclaredProperty(
               new BeanClazzProperty(superClazz, "baseProperty"));
  -                
  +
           clazz =
  -            (BeanClazz) Clazz.getDefaultClazzLoader().defineClazz(
  +            (BeanClazz) Clazz.getDefaultClazzLoader(getClass()).defineClazz(
                   TEST_CLAZZ_NAME,
  -                BeanClazz.class, null);                
  +                BeanClazz.class,
  +                null);
           clazz.setSuperclazz(superClazz);
  -        
  +
           clazz.addDeclaredProperty(
               new BeanClazzProperty(clazz, "objectProperty"));
           clazz.addDeclaredProperty(
  
  
  
  1.5       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/ReflectedClazzTestSupport.java
  
  Index: ReflectedClazzTestSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/ReflectedClazzTestSupport.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ReflectedClazzTestSupport.java	5 Jan 2003 23:11:40 -0000	1.4
  +++ ReflectedClazzTestSupport.java	7 Jan 2003 00:43:50 -0000	1.5
  @@ -92,7 +92,7 @@
       protected ClazzLoader getClazzLoader(){
           return Clazz
               .getClazzLoaderFactory(getModelKey())
  -            .createClazzLoader(getClass().getClassLoader());
  +            .getClazzLoader(getClass().getClassLoader());
           
       }
   
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedClazzTest.java
  
  Index: ExtendedReflectedClazzTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedClazzTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExtendedReflectedClazzTest.java	5 Jan 2003 23:11:40 -0000	1.3
  +++ ExtendedReflectedClazzTest.java	7 Jan 2003 00:43:50 -0000	1.4
  @@ -90,7 +90,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.EXTENDED_CLAZZ_LOADER_FACTORY;
  +        return Clazz.EXTENDED_CLAZZ_MODEL;
       }
       
       public void testGetSuperClazz() {
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedInstanceFactoryTest.java
  
  Index: ExtendedReflectedInstanceFactoryTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedInstanceFactoryTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExtendedReflectedInstanceFactoryTest.java	5 Jan 2003 23:11:40 -0000	1.2
  +++ ExtendedReflectedInstanceFactoryTest.java	7 Jan 2003 00:43:51 -0000	1.3
  @@ -73,7 +73,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.EXTENDED_CLAZZ_LOADER_FACTORY;
  +        return Clazz.EXTENDED_CLAZZ_MODEL;
       }
       
   }
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedListPropertyTest.java
  
  Index: ExtendedReflectedListPropertyTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedListPropertyTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExtendedReflectedListPropertyTest.java	5 Jan 2003 23:11:40 -0000	1.3
  +++ ExtendedReflectedListPropertyTest.java	7 Jan 2003 00:43:51 -0000	1.4
  @@ -87,7 +87,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.EXTENDED_CLAZZ_LOADER_FACTORY;
  +        return Clazz.EXTENDED_CLAZZ_MODEL;
       }
       
       /**
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedOperationTest.java
  
  Index: ExtendedReflectedOperationTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ExtendedReflectedOperationTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExtendedReflectedOperationTest.java	5 Jan 2003 23:11:40 -0000	1.2
  +++ ExtendedReflectedOperationTest.java	7 Jan 2003 00:43:51 -0000	1.3
  @@ -73,7 +73,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.EXTENDED_CLAZZ_LOADER_FACTORY;
  +        return Clazz.EXTENDED_CLAZZ_MODEL;
       }
       
   }
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ReflectedMappedPropertyTest.java
  
  Index: ReflectedMappedPropertyTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/extended/ReflectedMappedPropertyTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ReflectedMappedPropertyTest.java	5 Jan 2003 23:11:40 -0000	1.3
  +++ ReflectedMappedPropertyTest.java	7 Jan 2003 00:43:51 -0000	1.4
  @@ -103,7 +103,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.EXTENDED_CLAZZ_LOADER_FACTORY;
  +        return Clazz.EXTENDED_CLAZZ_MODEL;
       }
       
   
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedClazzTest.java
  
  Index: StandardReflectedClazzTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedClazzTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StandardReflectedClazzTest.java	5 Jan 2003 23:11:41 -0000	1.3
  +++ StandardReflectedClazzTest.java	7 Jan 2003 00:43:51 -0000	1.4
  @@ -89,7 +89,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.STANDARD_CLAZZ_LOADER_FACTORY;
  +        return Clazz.STANDARD_CLAZZ_MODEL;
       }
           
       public void testGetSuperClazz() {
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedInstanceFactoryTest.java
  
  Index: StandardReflectedInstanceFactoryTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedInstanceFactoryTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StandardReflectedInstanceFactoryTest.java	5 Jan 2003 23:11:41 -0000	1.2
  +++ StandardReflectedInstanceFactoryTest.java	7 Jan 2003 00:43:51 -0000	1.3
  @@ -73,7 +73,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.STANDARD_CLAZZ_LOADER_FACTORY;
  +        return Clazz.STANDARD_CLAZZ_MODEL;
       }
           
   }
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedListPropertyTest.java
  
  Index: StandardReflectedListPropertyTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedListPropertyTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StandardReflectedListPropertyTest.java	5 Jan 2003 23:11:41 -0000	1.3
  +++ StandardReflectedListPropertyTest.java	7 Jan 2003 00:43:51 -0000	1.4
  @@ -86,7 +86,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.STANDARD_CLAZZ_LOADER_FACTORY;
  +        return Clazz.STANDARD_CLAZZ_MODEL;
       }
           
       
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedOperationTest.java
  
  Index: StandardReflectedOperationTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/clazz/src/test/org/apache/commons/clazz/reflect/standard/StandardReflectedOperationTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StandardReflectedOperationTest.java	5 Jan 2003 23:11:41 -0000	1.2
  +++ StandardReflectedOperationTest.java	7 Jan 2003 00:43:51 -0000	1.3
  @@ -73,7 +73,7 @@
       }
   
       protected String getModelKey(){
  -        return Clazz.STANDARD_CLAZZ_LOADER_FACTORY;
  +        return Clazz.STANDARD_CLAZZ_MODEL;
       }
           
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message