mcconnell 2003/10/17 15:05:48
Modified: merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
AbstractMerlinTestCase.java
Log:
Add internal notes concerning the resolution of the maven repo.
Revision Changes Path
1.11 +14 -1
avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
Index: AbstractMerlinTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractMerlinTestCase.java 17 Oct 2003 20:25:06 -0000 1.10
+++ AbstractMerlinTestCase.java 17 Oct 2003 22:05:48 -0000 1.11
@@ -389,6 +389,11 @@
*/
private File getMavenRepositoryDirectory()
{
+ //
+ // get the ${maven.home.local} system property - this may
+ // be null in which case to fallback to ${maven.home}
+ //
+
final String system = System.getProperty( "maven.home.local" );
if( system != null )
{
@@ -396,6 +401,11 @@
}
else
{
+ //
+ // try to establish the repository relative to
+ // ${maven.home}/repository
+ //
+
final String home = System.getProperty( "maven.home" );
if( home != null )
{
@@ -403,8 +413,11 @@
}
else
{
+ // probaly unrealistic - but if we get here then there is a lot
+ // of stuff missing - return the total fallback maven repository
+
File user = new File( System.getProperty( "user.dir" ) );
- return new File( user, ".merlin/system" );
+ return new File( user, ".maven/repository" );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
