avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/kernel/test/src/test/org/apache/avalon/merlin MerlinEmbeddedTest.java
Date Tue, 02 Dec 2003 23:20:02 GMT
mcconnell    2003/12/02 15:20:02

  Modified:    kernel/impl project.xml
               kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultCriteria.java DefaultFactory.java
               kernel/test/src/test/org/apache/avalon/merlin
                        MerlinEmbeddedTest.java
  Log:
  Synchronize with repo and util.
  
  Revision  Changes    Path
  1.12      +10 -8     avalon-sandbox/kernel/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/impl/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml	30 Nov 2003 05:55:30 -0000	1.11
  +++ project.xml	2 Dec 2003 23:20:02 -0000	1.12
  @@ -42,14 +42,6 @@
           <avalon.classloader>api</avalon.classloader>
         </properties>
       </dependency>
  -    <dependency>
  -      <groupId>merlin</groupId>
  -      <artifactId>merlin-spi</artifactId>
  -      <version>3.2.2-dev</version>
  -      <properties>
  -        <avalon.classloader>spi</avalon.classloader>
  -      </properties>
  -    </dependency>
   
       <!-- avalon dependecies -->
   
  @@ -176,6 +168,16 @@
       <dependency>
         <groupId>avalon-util</groupId>
         <artifactId>avalon-util-exception</artifactId>
  +      <version>1.0-dev</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-factory-api</artifactId>
  +      <version>1.0-dev</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-factory-impl</artifactId>
         <version>1.0-dev</version>
       </dependency>
   
  
  
  
  1.3       +8 -13     avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
  
  Index: DefaultCriteria.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultCriteria.java	2 Dec 2003 08:00:39 -0000	1.2
  +++ DefaultCriteria.java	2 Dec 2003 23:20:02 -0000	1.3
  @@ -64,11 +64,6 @@
   import org.apache.avalon.merlin.KernelCriteria;
   import org.apache.avalon.merlin.KernelRuntimeException;
   
  -import org.apache.avalon.repository.RepositoryException;
  -import org.apache.avalon.repository.criteria.Criteria;
  -import org.apache.avalon.repository.criteria.ValidationException;
  -import org.apache.avalon.repository.criteria.Parameter;
  -
   import org.apache.avalon.util.defaults.Defaults;
   import org.apache.avalon.util.defaults.DefaultsFinder;
   import org.apache.avalon.util.defaults.SimpleDefaultsFinder;
  @@ -76,9 +71,9 @@
   import org.apache.avalon.util.env.Env;
   import org.apache.avalon.util.env.EnvAccessException;
   import org.apache.avalon.util.exception.ExceptionHelper;
  -
  -import org.apache.avalon.repository.criteria.Parameter;
  -
  +import org.apache.avalon.util.factory.FactoryException;
  +import org.apache.avalon.util.factory.impl.Criteria;
  +import org.apache.avalon.util.factory.impl.Parameter;
   
   
   /**
  @@ -502,7 +497,7 @@
       * the default context value establishment.
       *
       * @return the static default properties
  -    * @exception RepositoryException if a error occurs while attempt to 
  +    * @exception KernelRuntimeException if a error occurs while attempt to 
       *    load the property resource
       */
       private Properties getStaticProperties( String path ) throws KernelRuntimeException
  @@ -537,7 +532,7 @@
            }
   
            public Object resolve( Object value ) 
  -           throws ValidationException
  +           throws FactoryException
            {
                if( value == null ) return null;
                if( value instanceof URL[] )
  @@ -563,7 +558,7 @@
                              "Unable to transform the token: ["
                              + v
                              + " due to an unexpected error.";
  -                         throw new ValidationException( error, e );
  +                         throw new FactoryException( error, e );
                        }
                    }
                    return list.toArray( new URL[0] );
  @@ -574,7 +569,7 @@
                      "Don't know how to transform an instance of [" 
                      + value.getClass().getName() 
                      + " to a URL[].";
  -                 throw new ValidationException( error );
  +                 throw new FactoryException( error );
                }
            }
       }
  
  
  
  1.3       +5 -4      avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultFactory.java	2 Dec 2003 08:00:39 -0000	1.2
  +++ DefaultFactory.java	2 Dec 2003 23:20:02 -0000	1.3
  @@ -52,10 +52,11 @@
   
   import org.apache.avalon.repository.Repository;
   import org.apache.avalon.repository.InitialContext;
  -import org.apache.avalon.repository.criteria.Parameter;
  -import org.apache.avalon.repository.criteria.Criteria;
  -import org.apache.avalon.repository.criteria.ValidationException;
  -import org.apache.avalon.repository.criteria.Factory;
  +
  +import org.apache.avalon.util.factory.Factory;
  +import org.apache.avalon.util.factory.FactoryException;
  +import org.apache.avalon.util.factory.impl.Criteria;
  +import org.apache.avalon.util.factory.impl.Parameter;
   
   import org.apache.excalibur.configuration.ConfigurationUtil;
   
  
  
  
  1.9       +4 -2      avalon-sandbox/kernel/test/src/test/org/apache/avalon/merlin/MerlinEmbeddedTest.java
  
  Index: MerlinEmbeddedTest.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/test/src/test/org/apache/avalon/merlin/MerlinEmbeddedTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MerlinEmbeddedTest.java	30 Nov 2003 07:06:36 -0000	1.8
  +++ MerlinEmbeddedTest.java	2 Dec 2003 23:20:02 -0000	1.9
  @@ -59,11 +59,13 @@
   import org.apache.avalon.repository.Builder;
   import org.apache.avalon.repository.InitialContext;
   import org.apache.avalon.repository.RepositoryException;
  -import org.apache.avalon.repository.criteria.Factory;
   import org.apache.avalon.repository.main.DefaultInitialContext;
   import org.apache.avalon.repository.main.DefaultBuilder;
   import org.apache.avalon.util.env.Env;
   import org.apache.avalon.util.exception.ExceptionHelper;
  +
  +import org.apache.avalon.util.factory.Factory;
  +
   
   /**
    * Test case that usages the repository builder to deploy the 
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message