avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject cvs commit: avalon-sandbox/kernel/plugin/src/java/org/apache/avalon/merlin/tools MerlinBean.java
Date Wed, 12 Nov 2003 20:32:48 GMT
akarasulu    2003/11/12 12:32:48

  Modified:    kernel/plugin project.xml
               kernel/plugin/src/java/org/apache/avalon/merlin/tools
                        MerlinBean.java
  Log:
  Removed build time dependency on the implementation.  
  Leaving the runtime jar dependency for now but this 
  should not be needed soon either.
  
  Revision  Changes    Path
  1.2       +2 -2      avalon-sandbox/kernel/plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/plugin/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	12 Nov 2003 07:48:31 -0000	1.1
  +++ project.xml	12 Nov 2003 20:32:47 -0000	1.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project>
  -  <extend>${basedir}/../../project.xml</extend>
  +  <extend>${basedir}/../project.xml</extend>
     <pomVersion>3</pomVersion>
     <id>merlin-plugin</id>
     <name>Merlin Plugin</name>
  @@ -99,7 +99,7 @@
   
       <dependency>
         <groupId>avalon-repository</groupId>
  -      <artifactId>avalon-repository-spi</artifactId>
  +      <artifactId>avalon-repository-api</artifactId>
         <version>1.1-dev</version>
       </dependency>
       <dependency>
  
  
  
  1.2       +11 -2     avalon-sandbox/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java
  
  Index: MerlinBean.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/plugin/src/java/org/apache/avalon/merlin/tools/MerlinBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MerlinBean.java	12 Nov 2003 07:48:31 -0000	1.1
  +++ MerlinBean.java	12 Nov 2003 20:32:48 -0000	1.2
  @@ -52,8 +52,9 @@
   import java.io.File;
   import java.net.URL;
   
  +import org.apache.avalon.repository.InitialRepositoryFactory;
   import org.apache.avalon.repository.Repository;
  -import org.apache.avalon.repository.impl.DefaultFileRepository;
  +import org.apache.avalon.repository.RepositoryContext;
   import org.apache.avalon.composition.util.ExceptionHelper;
   import org.apache.avalon.merlin.kernel.Kernel;
   import org.apache.avalon.merlin.kernel.KernelException;
  @@ -324,7 +325,15 @@
   
           try
           {
  -            Repository repository = new DefaultFileRepository( m_repository );
  +            InitialRepositoryFactory l_factory = 
  +                new InitialRepositoryFactory() ;
  +            RepositoryContext l_repoCtx = l_factory.getDefaultContext() ;
  +            l_repoCtx.setCacheDir( m_repository.getAbsolutePath() ) ;
  +            
  +            // @todo add the right line here didn't know which arg to use.
  +            // l_repoCtx.setRemoteRepositoryUrls( new URL[]{ getTarget() } ) ;
  +            Repository repository = l_factory.create( l_repoCtx ) ;
  +            
               context = 
                 new DefaultKernelContext( 
                   repository, 
  
  
  

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


Mime
View raw message