svn commit: rev 21150 - in avalon/trunk/runtime: activation activation/api activation/impl composition composition/api composition/impl composition/spi merlin/cli/src/test/org/apache/avalon/merlin/cli/test
| Newsgroups | gmane.comp.jakarta.avalon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcconnell
Date: Sat Jun 12 20:53:47 2004
New Revision: 21150
Removed:
avalon/trunk/runtime/activation/api/.cvsignore
avalon/trunk/runtime/activation/impl/.cvsignore
Modified:
avalon/trunk/runtime/activation/ (props changed)
avalon/trunk/runtime/activation/api/ (props changed)
avalon/trunk/runtime/activation/impl/ (props changed)
avalon/trunk/runtime/composition/ (props changed)
avalon/trunk/runtime/composition/api/ (props changed)
avalon/trunk/runtime/composition/impl/ (props changed)
avalon/trunk/runtime/composition/spi/ (props changed)
avalon/trunk/runtime/merlin/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java
Log:
update some svn ignore properties
Modified: avalon/trunk/runtime/merlin/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java
==============================================================================
--- avalon/trunk/runtime/merlin/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java (original)
+++ avalon/trunk/runtime/merlin/cli/src/test/org/apache/avalon/merlin/cli/test/MerlinCLITestCase.java Sat Jun 12 20:53:47 2004
@@ -53,8 +53,7 @@
public void testMain() throws Exception
{
- String system =
- getMavenRepositoryDirectory().toString();
+ String system = getCacheDirectory().toString();
try
{
@@ -74,6 +73,19 @@
System.out.println( error );
throw new Exception( error );
}
+ }
+
+ private File getCacheDirectory()
+ {
+ String cache = System.getProperty( "project.repository.cache.path" );
+ if( null != cache )
+ {
+ return new File( cache );
+ }
+ else
+ {
+ return getMavenRepositoryDirectory();
+ }
}
private static File getMavenRepositoryDirectory()