You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/21 18:26:58 UTC

svn commit: r164081 - in /maven/components/trunk/maven-core/src/main/java/org/apache/maven: MavenConstants.java project/DefaultMavenProjectBuilder.java settings/DefaultMavenSettingsBuilder.java

Author: brett
Date: Thu Apr 21 09:26:57 2005
New Revision: 164081

URL: http://svn.apache.org/viewcvs?rev=164081&view=rev
Log:
disperse constants only used in one place

Removed:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/MavenConstants.java
Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=164081&r1=164080&r2=164081&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Apr 21 09:26:57 2005
@@ -16,10 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.MavenConstants;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.MavenMetadataSource;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -99,6 +97,8 @@
 
     private final Map modelCache = new HashMap();
 
+    public static final String MAVEN_MODEL_VERSION = "4.0.0";
+
     public void initialize()
     {
         modelReader = new MavenXpp3Reader();
@@ -554,7 +554,7 @@
     private Model getSuperModel()
         throws ProjectBuildingException
     {
-        URL url = DefaultMavenProjectBuilder.class.getResource( "pom-" + MavenConstants.MAVEN_MODEL_VERSION + ".xml" );
+        URL url = DefaultMavenProjectBuilder.class.getResource( "pom-" + MAVEN_MODEL_VERSION + ".xml" );
 
         return readModel( url );
     }

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=164081&r1=164080&r2=164081&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Thu Apr 21 09:26:57 2005
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import org.apache.maven.MavenConstants;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -96,8 +95,7 @@
 
         if ( settings.getActiveProfile() == null )
         {
-            File mavenUserConfigurationDirectory = new File( userHome,
-                                                             MavenConstants.MAVEN_USER_CONFIGURATION_DIRECTORY );
+            File mavenUserConfigurationDirectory = new File( userHome, ".m2" );
             if ( !mavenUserConfigurationDirectory.exists() )
             {
                 if ( !mavenUserConfigurationDirectory.mkdirs() )
@@ -106,7 +104,7 @@
                 }
             }
 
-            String localRepository = new File( mavenUserConfigurationDirectory, MavenConstants.MAVEN_REPOSITORY ).getAbsolutePath();
+            String localRepository = new File( mavenUserConfigurationDirectory, "repository" ).getAbsolutePath();
 
             settings.initializeActiveProfile( localRepository );
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org