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/repository/test/src/test/org/apache/avalon/repository/main DefaultInitialContextTest.java
Date Tue, 02 Dec 2003 23:03:31 GMT
mcconnell    2003/12/02 15:03:31

  Modified:    repository/impl project.xml
               repository/impl/src/java/org/apache/avalon/repository/impl
                        DefaultFactory.java RepositoryCriteria.java
               repository/main project.xml
               repository/main/src/java/org/apache/avalon/repository/main
                        AbstractBuilder.java DefaultBuilder.java
                        DefaultInitialContext.java
               repository/spi project.xml
               repository/spi/src/java/org/apache/avalon/repository
                        Builder.java InitialContext.java
               repository/test/src/test/org/apache/avalon/repository/main
                        DefaultInitialContextTest.java
  Removed:     repository/spi/src/java/org/apache/avalon/repository/criteria
                        Criteria.java Factory.java Parameter.java
                        ValidationException.java package.html
  Log:
  Move factory and criteria out of repository and into util.
  
  Revision  Changes    Path
  1.9       +10 -0     avalon-sandbox/repository/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/impl/project.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- project.xml	30 Nov 2003 05:49:32 -0000	1.8
  +++ project.xml	2 Dec 2003 23:03:30 -0000	1.9
  @@ -48,6 +48,16 @@
         <id>excalibur-i18n</id>
         <version>1.1</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>
     </dependencies>
   
   </project>
  
  
  
  1.18      +2 -4      avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DefaultFactory.java	2 Dec 2003 07:33:22 -0000	1.17
  +++ DefaultFactory.java	2 Dec 2003 23:03:30 -0000	1.18
  @@ -66,15 +66,13 @@
   import org.apache.avalon.util.defaults.DefaultsFinder ;
   import org.apache.avalon.util.defaults.SimpleDefaultsFinder ;
   import org.apache.avalon.util.defaults.SystemDefaultsFinder ;
  +import org.apache.avalon.util.factory.Factory ;
   
   import org.apache.avalon.repository.Repository ;
   import org.apache.avalon.repository.InitialContext ;
   import org.apache.avalon.repository.CacheManager ;
   import org.apache.avalon.repository.RepositoryException ;
   import org.apache.avalon.repository.RepositoryRuntimeException;
  -import org.apache.avalon.repository.criteria.Factory ;
  -import org.apache.avalon.repository.criteria.Criteria ;
  -import org.apache.avalon.repository.criteria.Parameter ;
   import org.apache.avalon.repository.util.RepositoryUtils ;
   
   import org.apache.avalon.excalibur.i18n.ResourceManager;
  
  
  
  1.6       +3 -4      avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/RepositoryCriteria.java
  
  Index: RepositoryCriteria.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/RepositoryCriteria.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RepositoryCriteria.java	2 Dec 2003 07:33:22 -0000	1.5
  +++ RepositoryCriteria.java	2 Dec 2003 23:03:30 -0000	1.6
  @@ -61,14 +61,13 @@
   
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.InitialContext;
  -import org.apache.avalon.repository.criteria.Criteria;
  -import org.apache.avalon.repository.criteria.Parameter;
  -import org.apache.avalon.repository.criteria.ValidationException;
   
   import org.apache.avalon.util.defaults.Defaults;
   import org.apache.avalon.util.defaults.DefaultsFinder;
   import org.apache.avalon.util.defaults.SimpleDefaultsFinder;
   import org.apache.avalon.util.defaults.SystemDefaultsFinder;
  +import org.apache.avalon.util.factory.impl.Criteria ;
  +import org.apache.avalon.util.factory.impl.Parameter ;
   
   
   /**
  
  
  
  1.4       +10 -0     avalon-sandbox/repository/main/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/main/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	26 Nov 2003 17:05:47 -0000	1.3
  +++ project.xml	2 Dec 2003 23:03:30 -0000	1.4
  @@ -45,6 +45,16 @@
         <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>
     </dependencies>
   
   </project>
  
  
  
  1.4       +3 -2      avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/AbstractBuilder.java
  
  Index: AbstractBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/AbstractBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractBuilder.java	2 Dec 2003 07:56:15 -0000	1.3
  +++ AbstractBuilder.java	2 Dec 2003 23:03:30 -0000	1.4
  @@ -60,11 +60,12 @@
   
   import javax.naming.directory.Attributes;
   
  +import org.apache.avalon.util.factory.Factory;
  +
   import org.apache.avalon.repository.Artifact;
   import org.apache.avalon.repository.InitialContext;
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.RepositoryRuntimeException;
  -import org.apache.avalon.repository.criteria.Factory;
   
   
   /**
  
  
  
  1.5       +2 -2      avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java
  
  Index: DefaultBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultBuilder.java	2 Dec 2003 07:56:15 -0000	1.4
  +++ DefaultBuilder.java	2 Dec 2003 23:03:30 -0000	1.5
  @@ -69,9 +69,9 @@
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.RepositoryRuntimeException;
   import org.apache.avalon.repository.meta.FactoryDescriptor;
  -import org.apache.avalon.repository.criteria.Factory;
   import org.apache.avalon.util.env.Env;
   import org.apache.avalon.util.exception.ExceptionHelper;
  +import org.apache.avalon.util.factory.Factory;
   
   
   /**
  
  
  
  1.5       +2 -3      avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java
  
  Index: DefaultInitialContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultInitialContext.java	2 Dec 2003 07:56:15 -0000	1.4
  +++ DefaultInitialContext.java	2 Dec 2003 23:03:30 -0000	1.5
  @@ -79,8 +79,6 @@
   import org.apache.avalon.repository.Repository;
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.RepositoryRuntimeException;
  -import org.apache.avalon.repository.criteria.Factory;
  -import org.apache.avalon.repository.criteria.Criteria;
   import org.apache.avalon.repository.meta.FactoryDescriptor;
   import org.apache.avalon.repository.util.LOADER;
   import org.apache.avalon.repository.util.RepositoryUtils;
  @@ -88,6 +86,7 @@
   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.util.factory.Factory;
   
   
   /**
  
  
  
  1.6       +5 -0      avalon-sandbox/repository/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/spi/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	17 Nov 2003 08:19:50 -0000	1.5
  +++ project.xml	2 Dec 2003 23:03:30 -0000	1.6
  @@ -20,6 +20,11 @@
         <artifactId>avalon-repository-api</artifactId>
         <version>1.2-dev</version>
       </dependency>
  +    <dependency>
  +      <groupId>avalon-util</groupId>
  +      <artifactId>avalon-util-factory-api</artifactId>
  +      <version>1.0-dev</version>
  +    </dependency>
     </dependencies>
   
   </project>
  
  
  
  1.2       +2 -2      avalon-sandbox/repository/spi/src/java/org/apache/avalon/repository/Builder.java
  
  Index: Builder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/spi/src/java/org/apache/avalon/repository/Builder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Builder.java	30 Nov 2003 05:49:32 -0000	1.1
  +++ Builder.java	2 Dec 2003 23:03:31 -0000	1.2
  @@ -50,7 +50,7 @@
   
   package org.apache.avalon.repository;
   
  -import org.apache.avalon.repository.criteria.Factory;
  +import org.apache.avalon.util.factory.Factory;
   
   
   /**
  
  
  
  1.2       +2 -2      avalon-sandbox/repository/spi/src/java/org/apache/avalon/repository/InitialContext.java
  
  Index: InitialContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/spi/src/java/org/apache/avalon/repository/InitialContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InitialContext.java	30 Nov 2003 05:49:32 -0000	1.1
  +++ InitialContext.java	2 Dec 2003 23:03:31 -0000	1.2
  @@ -53,7 +53,7 @@
   import java.net.URL;
   import java.io.File;
   
  -import org.apache.avalon.repository.criteria.Factory;
  +import org.apache.avalon.util.factory.Factory;
   
   
   /**
  
  
  
  1.2       +2 -3      avalon-sandbox/repository/test/src/test/org/apache/avalon/repository/main/DefaultInitialContextTest.java
  
  Index: DefaultInitialContextTest.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/test/src/test/org/apache/avalon/repository/main/DefaultInitialContextTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultInitialContextTest.java	30 Nov 2003 05:49:32 -0000	1.1
  +++ DefaultInitialContextTest.java	2 Dec 2003 23:03:31 -0000	1.2
  @@ -61,11 +61,10 @@
   import org.apache.avalon.repository.Repository ;
   import org.apache.avalon.repository.CacheManager ;
   import org.apache.avalon.repository.RepositoryException ;
  -import org.apache.avalon.repository.criteria.Criteria ;
  -import org.apache.avalon.repository.criteria.Factory ;
   
   import org.apache.avalon.util.env.Env;
   import org.apache.avalon.util.exception.ExceptionHelper;
  +import org.apache.avalon.util.factory.Factory;
   
   /**
    * 
  
  
  

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


Mime
View raw message