mcconnell 2003/12/07 00:36:07
Modified:
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultSystemContext.java
merlin/kernel/bootstrap/src/java Merlin.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernelContext.java
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
DefaultEmbeddedKernel.java
Log:
Update to sync with repo changes.
Revision Changes Path
1.4 +3 -5
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
Index: DefaultSystemContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSystemContext.java 3 Dec 2003 19:04:53 -0000 1.3
+++ DefaultSystemContext.java 7 Dec 2003 08:36:07 -0000 1.4
@@ -114,10 +114,8 @@
{
String dpml = "http://dpml.net";;
String ibiblio = "http://www.ibiblio.org/maven";;
- CacheManager manager = new DefaultCacheManager( root, null );
- return new DefaultRepository(
- manager,
- new String[]{ dpml, ibiblio } );
+ CacheManager manager = new DefaultCacheManager( root, null, new String[]{
dpml, ibiblio } );
+ return manager.createRepository();
}
private static LoggingManager createLoggingManager( File base, int priority )
throws Exception
1.5 +2 -2 avalon/merlin/kernel/bootstrap/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/java/Merlin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Merlin.java 3 Dec 2003 19:04:53 -0000 1.4
+++ Merlin.java 7 Dec 2003 08:36:07 -0000 1.5
@@ -159,8 +159,8 @@
}
String[] remote = getRemoteURLs( remotePath );
- CacheManager cache = new DefaultCacheManager( base, null );
- repository = new DefaultRepository( cache, remote );
+ CacheManager cache = new DefaultCacheManager( base, null, remote );
+ repository = cache.createRepository();
//
// get the set of URLs for the bootstrap classloader from the
1.6 +3 -3
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
Index: DefaultKernelContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultKernelContext.java 3 Dec 2003 19:04:53 -0000 1.5
+++ DefaultKernelContext.java 7 Dec 2003 08:36:07 -0000 1.6
@@ -549,8 +549,8 @@
}
// nasty hack to - but this is going to be replaced anyway
- m_cacheManager = new DefaultCacheManager( base, proxy );
- return new DefaultRepository( m_cacheManager, list );
+ m_cacheManager = new DefaultCacheManager( base, proxy, list );
+ return m_cacheManager.createRepository();
}
//--------------------------------------------------------------
1.8 +2 -2
avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java
Index: DefaultEmbeddedKernel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultEmbeddedKernel.java 5 Dec 2003 15:13:04 -0000 1.7
+++ DefaultEmbeddedKernel.java 7 Dec 2003 08:36:07 -0000 1.8
@@ -445,9 +445,9 @@
{
File repo = getSystemRepositoryDirectory();
ProxyContext proxy = createProxyContext();
- CacheManager manager = new DefaultCacheManager( repo, proxy );
String[] hosts = createHostsSequence();
- return new DefaultRepository( manager, hosts );
+ CacheManager manager = new DefaultCacheManager( repo, proxy, hosts );
+ return manager.createRepository();
}
catch( Throwable e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
