mcconnell 2003/11/19 21:41:00
Modified: repository/impl/src/java/org/apache/avalon/repository/impl
DefaultRepositoryFactory.java defaults.properties
repository/impl/src/test/org/apache/avalon/repository/impl
ArtifactDatabaseImplTest.java
LocalRepositoryTestCase.java
repository/main/src/java/org/apache/avalon/repository
InitialRepositoryFactory.java
repository/test/src/test/org/apache/avalon/repository
InitialRepositoryFactoryTest.java
Log:
Tweaking defaults and improving cache assignment.
Revision Changes Path
1.10 +7 -5
avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepositoryFactory.java
Index: DefaultRepositoryFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepositoryFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultRepositoryFactory.java 20 Nov 2003 04:17:55 -0000 1.9
+++ DefaultRepositoryFactory.java 20 Nov 2003 05:41:00 -0000 1.10
@@ -162,15 +162,17 @@
} ;
Defaults l_defaults = new Defaults( s_singles, s_multiple, l_finders ) ;
- Defaults.macroExpand( l_defaults, null ) ;
+ Defaults.macroExpand( l_defaults, new Properties[]{ System.getProperties()
} ) ;
//
// Here we start to populate the empty repository configuration using
// the values stored in the defaults.
//
-
- context.setCacheDir( l_defaults.getProperty( CACHE_DIR ) ) ;
-
+
+ final String home = System.getProperty( "user.home" );
+ final String cache = l_defaults.getProperty( CACHE_DIR );
+ context.setCacheDir( home + File.separator + cache ) ;
+
try
{
context.setRemoteRepositoryUrls(
1.5 +1 -1
avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/defaults.properties
Index: defaults.properties
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/defaults.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- defaults.properties 20 Nov 2003 04:17:55 -0000 1.4
+++ defaults.properties 20 Nov 2003 05:41:00 -0000 1.5
@@ -1,5 +1,5 @@
# Not used at the moment but can be used for defaults discovery
#
-cache.dir=.merlin
+cache.dir=.avalon
remote.repository.url.0=http://dpml.net
remote.repository.url.1=http://ibiblio.org/maven
1.3 +2 -10
avalon-sandbox/repository/impl/src/test/org/apache/avalon/repository/impl/ArtifactDatabaseImplTest.java
Index: ArtifactDatabaseImplTest.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/impl/src/test/org/apache/avalon/repository/impl/ArtifactDatabaseImplTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactDatabaseImplTest.java 11 Nov 2003 03:15:30 -0000 1.2
+++ ArtifactDatabaseImplTest.java 20 Nov 2003 05:41:00 -0000 1.3
@@ -80,15 +80,7 @@
{
super.setUp();
m_adb = new ArtifactDatabaseImpl( new
- String [] { "http://ibiblio.org/maven"; } ) ;
- }
-
- /*
- * @see TestCase#tearDown()
- */
- protected void tearDown() throws Exception
- {
- super.tearDown();
+ String [] { "http://dpml.net/","http://ibiblio.org/maven"; } ) ;
}
/**
1.2 +2 -2
avalon-sandbox/repository/impl/src/test/org/apache/avalon/repository/impl/LocalRepositoryTestCase.java
Index: LocalRepositoryTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/impl/src/test/org/apache/avalon/repository/impl/LocalRepositoryTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalRepositoryTestCase.java 11 Nov 2003 01:22:27 -0000 1.1
+++ LocalRepositoryTestCase.java 20 Nov 2003 05:41:00 -0000 1.2
@@ -79,13 +79,13 @@
{
File base = new File( System.getProperty("basedir") );
File target = new File( base, "target" );
- File source = new File( target, "test-classes/repository" );
+ File source = new File( target, "test-classes/.repository" );
source.mkdirs();
m_repository = new DefaultFileRepository( source );
}
public void testInstall() throws Exception
{
- assertTrue( true );
+ // placeholder
}
}
1.8 +14 -8
avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/InitialRepositoryFactory.java
Index: InitialRepositoryFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/InitialRepositoryFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InitialRepositoryFactory.java 20 Nov 2003 04:19:07 -0000 1.7
+++ InitialRepositoryFactory.java 20 Nov 2003 05:41:00 -0000 1.8
@@ -216,13 +216,12 @@
// Create the temporary directory to pull down files into
//
- String l_userHome = System.getProperty( "user.home" ) ;
- File l_tmpDir = new File( l_userHome, ".bootstrap" ) ;
- if ( ! l_tmpDir.exists() )
+ File cache = setupDefaultCache();
+ if ( ! cache.exists() )
{
- l_tmpDir.mkdirs() ;
+ cache.mkdirs() ;
}
-
+
//
// Build the url to access the properties of the implementation artifact
// which is default mechanism dependent.
@@ -250,7 +249,7 @@
l_spec = ( String ) l_list.next() ;
l_dep = MavenArtifactFactory.createJarArtifact( l_spec ) ;
l_urlList.add( LOADER.getResource(
- l_dep, m_repositories, l_tmpDir, true ) ) ;
+ l_dep, m_repositories, cache, true ) ) ;
}
//
@@ -259,7 +258,7 @@
l_urlList.add(
LOADER.getResource(
- implementation, m_repositories, l_tmpDir, true ) );
+ implementation, m_repositories, cache, true ) );
}
catch ( NamingException e )
{
@@ -309,6 +308,13 @@
throw new RepositoryException( "Could not find the factory class: "
+ DEFAULT_FACTORY, e ) ;
}
+ }
+
+ private static File setupDefaultCache()
+ {
+ final File home = new File( System.getProperty( "user.home" ) );
+ final File avalon = new File( home, ".avalon" );
+ return new File( avalon, ".cache" );
}
// ------------------------------------------------------------------------
1.5 +7 -11
avalon-sandbox/repository/test/src/test/org/apache/avalon/repository/InitialRepositoryFactoryTest.java
Index: InitialRepositoryFactoryTest.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/test/src/test/org/apache/avalon/repository/InitialRepositoryFactoryTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InitialRepositoryFactoryTest.java 20 Nov 2003 04:21:17 -0000 1.4
+++ InitialRepositoryFactoryTest.java 20 Nov 2003 05:41:00 -0000 1.5
@@ -91,7 +91,7 @@
assertNotNull( defaults );
DefaultRepositoryContext context = new DefaultRepositoryContext( defaults );
- context.setCacheDir( getCacheDir() );
+ //context.setCacheDir( getCacheDir() );
String[] repositories = getWorkingRepositorySet();
context.setRemoteRepositoryUrls( repositories ) ;
@@ -105,21 +105,17 @@
public void testClassloaderCreation() throws Exception
{
//
- // create the initial repo factory
+ // create the initial repo factory and
+ // get a context object and customize it
+ // to suite our usage scenario
//
String[] bootstrap = getBootstrapRepositorySet();
RepositoryFactory factory =
new InitialRepositoryFactory( bootstrap );
-
- //
- // get a context object and customize it to suite
- // our repository usage scenario
- //
-
RepositoryContext defaults = factory.getDefaultContext();
DefaultRepositoryContext context = new DefaultRepositoryContext( defaults );
- context.setCacheDir( getCacheDir() );
+ System.out.println( "## CACHE: " + context.getCacheDir() );
String[] repositories = getWorkingRepositorySet();
context.setRemoteRepositoryUrls( repositories ) ;
@@ -132,7 +128,7 @@
//
// create an artifact that contains a bunch of
- // dependencies (about 30 in this example) spead
+ // dependencies (about 30 in this example) spread
// across a classloader chain (api/spi/impl)
//
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
