evenisse 2004/02/15 00:17:09
Modified: maven-core/src/java/org/apache/maven MavenBooter.java
plexus.xml
maven-core/src/test/org/apache/maven
MavenPlexusComponentTestBase.java
Log:
Unified property names (maven.local.home <--> maven.home.local)
Revision Changes Path
1.3 +15 -2
maven-components/maven-core/src/java/org/apache/maven/MavenBooter.java
Index: MavenBooter.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/MavenBooter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenBooter.java 15 Feb 2004 07:33:39 -0000 1.2
+++ MavenBooter.java 15 Feb 2004 08:17:09 -0000 1.3
@@ -63,7 +63,20 @@
embedder.addContextValue( "maven.home", System.getProperty("maven.home") );
- embedder.addContextValue( "maven.local.home",
System.getProperty("maven.local.home") );
+ if ( System.getProperty("maven.home.local")!=null )
+ {
+ embedder.addContextValue( "maven.home.local",
System.getProperty("maven.home.local") );
+ }
+ else
+ {
+ String homeLocal = System.getProperty("user.home")+"/.maven";
+ File f = new File(homeLocal);
+ if (!f.exists())
+ {
+ f.mkdirs();
+ }
+ embedder.addContextValue( "maven.home.local", homeLocal );
+ }
try
{
1.3 +1 -1 maven-components/maven-core/src/java/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/plexus.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plexus.xml 12 Feb 2004 01:59:00 -0000 1.2
+++ plexus.xml 15 Feb 2004 08:17:09 -0000 1.3
@@ -76,7 +76,7 @@
</requirements>
<configuration>
<maven-home>${maven.home}</maven-home>
- <maven-local-home>${maven.local.home}</maven-local-home>
+ <maven-local-home>${maven.home.local}</maven-local-home>
</configuration>
</component>
1.2 +3 -3
maven-components/maven-core/src/test/org/apache/maven/MavenPlexusComponentTestBase.java
Index: MavenPlexusComponentTestBase.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/org/apache/maven/MavenPlexusComponentTestBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenPlexusComponentTestBase.java 6 Feb 2004 23:27:46 -0000 1.1
+++ MavenPlexusComponentTestBase.java 15 Feb 2004 08:17:09 -0000 1.2
@@ -34,7 +34,7 @@
// mocks for standard conditions of execution. Which means setting up some
values like:
//
// maven.home
- // maven.local.home
+ // maven.home.local
//
// And using the same plexus configuration for testing that will be used during
the
// normal execution of maven by users.
@@ -50,7 +50,7 @@
getContainer().addContextValue( "maven.home", new File( basedir,
"target/maven.home" ).getPath() );
- getContainer().addContextValue( "maven.local.home", new File( basedir,
"target/maven.local.home" ).getPath() );
+ getContainer().addContextValue( "maven.home.local", new File( basedir,
"target/maven.home.local" ).getPath() );
}
public InputStream getCustomConfiguration()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
