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/main/src/java/org/apache/avalon/repository/main AbstractBuilder.java DefaultBuilder.java DefaultInitialContext.java
Date Tue, 02 Dec 2003 07:56:15 GMT
mcconnell    2003/12/01 23:56:15

  Modified:    repository/api/src/java/org/apache/avalon/repository
                        Artifact.java
               repository/impl/src/java/org/apache/avalon/repository/impl
                        DefaultCacheManager.java DefaultRepository.java
               repository/main/src/java/org/apache/avalon/repository/main
                        AbstractBuilder.java DefaultBuilder.java
                        DefaultInitialContext.java
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.8       +2 -2      avalon-sandbox/repository/api/src/java/org/apache/avalon/repository/Artifact.java
  
  Index: Artifact.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/api/src/java/org/apache/avalon/repository/Artifact.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Artifact.java	30 Nov 2003 05:49:31 -0000	1.7
  +++ Artifact.java	2 Dec 2003 07:56:15 -0000	1.8
  @@ -240,7 +240,7 @@
       }
   
       /**
  -     * Gets the artifact specification for this ArtifactDescriptor
  +     * Gets the artifact specification for this Artifact
        * in the form <group>[:<name>][;<version>].
        * 
        * @return the artifact specification
  
  
  
  1.3       +1 -3      avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultCacheManager.java
  
  Index: DefaultCacheManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultCacheManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultCacheManager.java	30 Nov 2003 08:11:36 -0000	1.2
  +++ DefaultCacheManager.java	2 Dec 2003 07:56:15 -0000	1.3
  @@ -74,8 +74,6 @@
   import org.apache.avalon.repository.CacheManager;
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.RepositoryRuntimeException;
  -import org.apache.avalon.repository.meta.RelationalDescriptor;
  -import org.apache.avalon.repository.meta.MetaException;
   import org.apache.avalon.repository.util.LOADER;
   import org.apache.avalon.repository.util.RepositoryUtils;
   
  
  
  
  1.3       +7 -7      avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepository.java
  
  Index: DefaultRepository.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepository.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultRepository.java	30 Nov 2003 08:11:36 -0000	1.2
  +++ DefaultRepository.java	2 Dec 2003 07:56:15 -0000	1.3
  @@ -73,7 +73,7 @@
   import org.apache.avalon.repository.Repository;
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.RepositoryRuntimeException;
  -import org.apache.avalon.repository.meta.RelationalDescriptor;
  +import org.apache.avalon.repository.meta.FactoryDescriptor;
   import org.apache.avalon.repository.meta.MetaException;
   import org.apache.avalon.repository.util.LOADER;
   import org.apache.avalon.repository.util.RepositoryUtils;
  @@ -219,10 +219,10 @@
             throw new NullPointerException( "artifact" );
   
           Attributes attributes = getAttributes( artifact );
  -        RelationalDescriptor relational = null;
  +        FactoryDescriptor relational = null;
           try
           {
  -            relational = new RelationalDescriptor( attributes );
  +            relational = new FactoryDescriptor( attributes );
           }
           catch( MetaException me )
           {
  @@ -235,19 +235,19 @@
           URL[] apis = 
             getURLs( 
               relational.getDependencies( 
  -              RelationalDescriptor.API_KEY ) );
  +              FactoryDescriptor.API_KEY ) );
           ClassLoader api = buildClassLoader( apis, parent );
   
           URL[] spis = 
             getURLs( 
               relational.getDependencies( 
  -              RelationalDescriptor.SPI_KEY ) );
  +              FactoryDescriptor.SPI_KEY ) );
           ClassLoader spi = buildClassLoader( spis, api );
   
           URL[] imps = 
             getURLs( artifact, 
               relational.getDependencies( 
  -              RelationalDescriptor.IMP_KEY ) );
  +              FactoryDescriptor.IMP_KEY ) );
   
           return buildClassLoader( imps, spi );
       }
  
  
  
  1.3       +1 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractBuilder.java	30 Nov 2003 08:11:36 -0000	1.2
  +++ AbstractBuilder.java	2 Dec 2003 07:56:15 -0000	1.3
  @@ -64,7 +64,6 @@
   import org.apache.avalon.repository.InitialContext;
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.RepositoryRuntimeException;
  -import org.apache.avalon.repository.meta.RelationalDescriptor ;
   import org.apache.avalon.repository.criteria.Factory;
   
   
  
  
  
  1.4       +3 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultBuilder.java	30 Nov 2003 08:11:36 -0000	1.3
  +++ DefaultBuilder.java	2 Dec 2003 07:56:15 -0000	1.4
  @@ -68,7 +68,7 @@
   import org.apache.avalon.repository.Repository;
   import org.apache.avalon.repository.RepositoryException;
   import org.apache.avalon.repository.RepositoryRuntimeException;
  -import org.apache.avalon.repository.meta.RelationalDescriptor;
  +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;
  @@ -163,7 +163,7 @@
           }
   
           Attributes attributes = m_repository.getAttributes( artifact );
  -        RelationalDescriptor descriptor = new RelationalDescriptor( attributes );
  +        FactoryDescriptor descriptor = new FactoryDescriptor( attributes );
           String classname = descriptor.getFactory();
           if( null == classname ) 
           {
  
  
  
  1.4       +3 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultInitialContext.java	2 Dec 2003 07:34:13 -0000	1.3
  +++ DefaultInitialContext.java	2 Dec 2003 07:56:15 -0000	1.4
  @@ -81,7 +81,7 @@
   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.RelationalDescriptor;
  +import org.apache.avalon.repository.meta.FactoryDescriptor;
   import org.apache.avalon.repository.util.LOADER;
   import org.apache.avalon.repository.util.RepositoryUtils;
   
  @@ -195,7 +195,7 @@
   
           Attributes attributes = 
             RepositoryUtils.getAttributes( m_hosts, implementation );
  -        RelationalDescriptor descriptor = new RelationalDescriptor( attributes );
  +        FactoryDescriptor descriptor = new FactoryDescriptor( attributes );
           String factory = descriptor.getFactory();
           if( null == factory ) 
           {
  
  
  

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


Mime
View raw message