You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2004/03/20 05:22:48 UTC
cvs commit: maven-components/maven-project/src/main/resources/org/apache/maven defaults.properties
jvanzyl 2004/03/19 20:22:48
Modified: maven-project/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java
MavenProjectBuilder.java
Added: maven-project/src/main/resources/org/apache/maven
defaults.properties
Removed: maven-project/src/main/resources defaults.properties
Log:
o not using driver.properties anymore
o move defaults.properties into a unique space
Revision Changes Path
1.3 +0 -4 maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultMavenProjectBuilder.java 19 Mar 2004 17:22:08 -0000 1.2
+++ DefaultMavenProjectBuilder.java 20 Mar 2004 04:22:47 -0000 1.3
@@ -371,9 +371,6 @@
Properties projectProperties = loadProperties( projectPropertiesFile );
- Properties driverProperties = loadProperties(
- DefaultMavenProjectBuilder.class.getClassLoader().getResourceAsStream( DRIVER_PROPERTIES ) );
-
Properties defaultProperties = loadProperties(
DefaultMavenProjectBuilder.class.getClassLoader().getResourceAsStream( DEFAULTS_PROPERTIES ) );
@@ -384,7 +381,6 @@
projectBuildProperties,
projectProperties,
defaultProperties,
- driverProperties
} );
// Set the basedir value in the context.
1.2 +1 -4 maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Index: MavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenProjectBuilder.java 19 Mar 2004 17:11:06 -0000 1.1
+++ MavenProjectBuilder.java 20 Mar 2004 04:22:47 -0000 1.2
@@ -5,12 +5,9 @@
public interface MavenProjectBuilder
{
- /** Role name. */
static String ROLE = MavenProjectBuilder.class.getName();
- static String DRIVER_PROPERTIES = "driver.properties";
-
- static String DEFAULTS_PROPERTIES = "defaults.properties";
+ static String DEFAULTS_PROPERTIES = "org/apache/maven/defaults.properties";
MavenProject build( File project )
throws Exception;
1.1 maven-components/maven-project/src/main/resources/org/apache/maven/defaults.properties
Index: defaults.properties
===================================================================
# -------------------------------------------------------------------
# D R I V E R P R O P E R T I E S
# -------------------------------------------------------------------
maven.home.local = ${user.home}/.maven
maven.src.dir = ${basedir}/src
maven.conf.dir = ${basedir}/conf
maven.build.dir = ${basedir}/target
maven.build.src = ${maven.build.dir}/src
maven.build.dest = ${maven.build.dir}/classes
maven.test.dest = ${maven.build.dir}/test-classes
# -------------------------------------------------------------------
# M A V E N L O C A L R E P O
# -------------------------------------------------------------------
maven.repo.local = ${maven.home.local}/repository
# -------------------------------------------------------------------
# M A V E N P L U G - I N D I R E C T O R Y
# -------------------------------------------------------------------
maven.plugin.dir = ${maven.home}/plugins
maven.plugin.unpacked.dir = ${maven.home.local}/plugins
# -------------------------------------------------------------------
# M A V E N R E M O T E R E P O S
# -------------------------------------------------------------------
maven.repo.remote = http://www.ibiblio.org/maven
maven.repo.central = login.ibiblio.org
maven.repo.central.directory = /public/html/maven
maven.repo.remote.enabled = true
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org