You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by ev...@apache.org on 2004/07/27 14:40:11 UTC
cvs commit: maven-components/maven-mboot/src/main Bootstrapper.java
evenisse 2004/07/27 05:40:11
Modified: maven-core-it-verifier/src/main/java/org/apache/maven/it
Verifier.java
maven-core/src/main/java/org/apache/maven MavenCli.java
MavenConstants.java
maven-core/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java MavenProject.java
maven-mboot/src/main Bootstrapper.java
Log:
Use maven.properties in all code instead of build.properties.
Revision Changes Path
1.8 +3 -3 maven-components/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java
Index: Verifier.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core-it-verifier/src/main/java/org/apache/maven/it/Verifier.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Verifier.java 19 Jun 2004 13:36:02 -0000 1.7
+++ Verifier.java 27 Jul 2004 12:40:10 -0000 1.8
@@ -35,11 +35,11 @@
try
{
- mavenProperties.load( new FileInputStream( new File( System.getProperty( "user.home" ), "build.properties" ) ) );
+ mavenProperties.load( new FileInputStream( new File( System.getProperty( "user.home" ), "maven.properties" ) ) );
}
catch ( IOException e )
{
- throw new VerificationException( "Can't find the build.properties file! Verification can't proceed!" );
+ throw new VerificationException( "Can't find the maven.properties file! Verification can't proceed!" );
}
mavenRepoLocal = mavenProperties.getProperty( "maven.repo.local" );
1.10 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java
Index: MavenCli.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenCli.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MavenCli.java 3 Jul 2004 02:34:43 -0000 1.9
+++ MavenCli.java 27 Jul 2004 12:40:11 -0000 1.10
@@ -159,13 +159,13 @@
{
Properties p = new Properties();
- p.load( new FileInputStream( new File( System.getProperty( "user.home" ), "build.properties" ) ) );
+ p.load( new FileInputStream( new File( System.getProperty( "user.home" ), MavenConstants.MAVEN_PROPERTIES ) ) );
String localRepository = p.getProperty( MavenConstants.MAVEN_REPO_LOCAL );
if ( localRepository == null )
{
- throw new Exception( "Missing 'maven.repo.local' from ~/build.properties." );
+ throw new Exception( "Missing 'maven.repo.local' from ~/" + MavenConstants.MAVEN_PROPERTIES + "." );
}
return localRepository;
1.4 +2 -0 maven-components/maven-core/src/main/java/org/apache/maven/MavenConstants.java
Index: MavenConstants.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/MavenConstants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MavenConstants.java 2 Jul 2004 02:23:30 -0000 1.3
+++ MavenConstants.java 27 Jul 2004 12:40:11 -0000 1.4
@@ -22,6 +22,8 @@
public static final int POM_VERSION = 3;
+ public static final String MAVEN_PROPERTIES = "maven.properties";
+
public static final String DEBUG_ON = "maven.debugOn";
public static final String WORK_OFFLINE = "maven.workOffline";
1.12 +3 -4 maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultMavenProjectBuilder.java 27 Jul 2004 02:53:19 -0000 1.11
+++ DefaultMavenProjectBuilder.java 27 Jul 2004 12:40:11 -0000 1.12
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.apache.maven.MavenConstants;
import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.artifact.factory.MavenArtifactFactory;
import org.apache.maven.model.Dependency;
@@ -54,8 +55,6 @@
extends AbstractLogEnabled
implements MavenProjectBuilder, Initializable
{
- public static final String MAVEN_PROPERTIES = "maven.properties";
-
private MavenArtifactFactory artifactory;
private ModelInheritanceAssembler modelInheritanceAssembler;
@@ -259,7 +258,7 @@
Properties systemProperties = System.getProperties();
- f = new File( System.getProperty( "user.home" ), MAVEN_PROPERTIES );
+ f = new File( System.getProperty( "user.home" ), MavenConstants.MAVEN_PROPERTIES );
Properties mavenProperties = PropertyUtils.loadProperties( f );
@@ -268,7 +267,7 @@
if ( descriptorDirectory != null )
{
- f = new File( descriptorDirectory, MAVEN_PROPERTIES );
+ f = new File( descriptorDirectory, MavenConstants.MAVEN_PROPERTIES );
userOverridesMavenProperties = PropertyUtils.loadProperties( f );
}
1.20 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Index: MavenProject.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/MavenProject.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MavenProject.java 30 Jun 2004 22:03:37 -0000 1.19
+++ MavenProject.java 27 Jul 2004 12:40:11 -0000 1.20
@@ -590,7 +590,7 @@
* where maven local repository is. There should be only one local repository and it
* should be shared between all projects. Probably we can have a component like
* MavenEnvinromnent which will contain all behavioral settings shared between projects.
- * This component can read on the startup ${user.home}/build.properties file
+ * This component can read on the startup ${user.home}/maven.properties file
* <p/>
* <p/>
* there
1.23 +1 -1 maven-components/maven-mboot/src/main/Bootstrapper.java
Index: Bootstrapper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/main/Bootstrapper.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Bootstrapper.java 9 Jun 2004 03:10:50 -0000 1.22
+++ Bootstrapper.java 27 Jul 2004 12:40:11 -0000 1.23
@@ -45,7 +45,7 @@
public void execute( String[] args )
throws Exception
{
- properties = loadProperties( new File( System.getProperty( "user.home" ), "build.properties" ) );
+ properties = loadProperties( new File( System.getProperty( "user.home" ), "maven.properties" ) );
downloader = new ArtifactDownloader( properties );
Re: cvs commit: maven-components/maven-mboot/src/main
Bootstrapper.java
Posted by Jason van Zyl <jv...@maven.org>.
On Tue, 2004-07-27 at 08:40, evenisse@apache.org wrote:
> evenisse 2004/07/27 05:40:11
>
> Modified: maven-core-it-verifier/src/main/java/org/apache/maven/it
> Verifier.java
> maven-core/src/main/java/org/apache/maven MavenCli.java
> MavenConstants.java
> maven-core/src/main/java/org/apache/maven/project
> DefaultMavenProjectBuilder.java MavenProject.java
> maven-mboot/src/main Bootstrapper.java
> Log:
> Use maven.properties in all code instead of build.properties.
Awesome, thanks!
--
jvz.
Jason van Zyl
jason@maven.org
http://maven.apache.org
happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...
-- Thoreau