akarasulu 2003/11/12 12:38:27
Modified: kernel/unit project.xml
kernel/unit/src/java/org/apache/avalon/merlin/unit
DefaultEmbeddedKernel.java
Log:
Started using the new repository api.
Revision Changes Path
1.2 +2 -2 avalon-sandbox/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/unit/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 12 Nov 2003 07:55:11 -0000 1.1
+++ project.xml 12 Nov 2003 20:38:27 -0000 1.2
@@ -2,7 +2,7 @@
<project>
- <extend>${basedir}/../../project.xml</extend>
+ <extend>${basedir}/../project.xml</extend>
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit</name>
@@ -21,7 +21,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 -3
avalon-sandbox/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java
Index: DefaultEmbeddedKernel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultEmbeddedKernel.java 12 Nov 2003 07:55:11 -0000 1.1
+++ DefaultEmbeddedKernel.java 12 Nov 2003 20:38:27 -0000 1.2
@@ -65,10 +65,11 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.merlin.kernel.Kernel;
import org.apache.avalon.merlin.kernel.KernelException;
+import org.apache.avalon.repository.DefaultAuthenticator;
+import org.apache.avalon.repository.InitialRepositoryFactory;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.repository.ProxyContext;
-import org.apache.avalon.repository.impl.DefaultFileRepository;
-import org.apache.avalon.repository.impl.DefaultAuthenticator;
+import org.apache.avalon.repository.RepositoryContext;
/**
* Embedded kernel implementation.
@@ -445,7 +446,14 @@
File repo = getSystemRepositoryDirectory();
ProxyContext proxy = createProxyContext();
URL[] hosts = createHostsSequence();
- return new DefaultFileRepository( repo, proxy, hosts );
+
+ InitialRepositoryFactory l_factory = new InitialRepositoryFactory();
+ RepositoryContext l_repoCtx = l_factory.getDefaultContext() ;
+ l_repoCtx.setCacheDir( repo.getAbsolutePath() ) ;
+ l_repoCtx.setRemoteRepositoryUrls( hosts ) ;
+ l_repoCtx.setProxyContext( proxy ) ;
+ Repository l_repo = l_factory.create( l_repoCtx ) ;
+ return l_repo ;
}
catch( Throwable e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
