cvs commit: maven-components/maven-core/src/main/java/org/apache/maven MavenConstants.java

[brett]

brett       2005/04/08 00:55:05

  Modified:    maven-core/src/main/java/org/apache/maven/cli MavenCli.java
               maven-core/src/main/java/org/apache/maven
                        MavenConstants.java
  Log:
  remove some unused constants
  
  Revision  Changes    Path
  1.30      +2 -20     
maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
  
  Index: MavenCli.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- MavenCli.java     7 Apr 2005 03:09:07 -0000       1.29
  +++ MavenCli.java     8 Apr 2005 07:55:05 -0000       1.30
  @@ -51,14 +51,11 @@
   import org.codehaus.plexus.util.FileUtils;
   
   import java.io.File;
  -import java.io.FileInputStream;
  -import java.io.IOException;
   import java.io.InputStreamReader;
   import java.net.URL;
   import java.util.Collections;
   import java.util.Enumeration;
   import java.util.List;
  -import java.util.Properties;
   
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
  @@ -368,21 +365,6 @@
           return mavenUserConfigurationDirectory;
       }
   
  -    protected static Properties getMavenProperties( File mavenHomeLocal )
  -    {
  -        Properties mavenProperties = new Properties();
  -        File mavenPropertiesFile = new File( mavenHomeLocal, 
MavenConstants.MAVEN_PROPERTIES );
  -        try
  -        {
  -            mavenProperties.load( new FileInputStream( mavenPropertiesFile ) 
);
  -        }
  -        catch ( IOException e )
  -        {
  -            // do nothing
  -        }
  -        return mavenProperties;
  -    }
  -
       protected static ArtifactRepository getLocalRepository( MavenSettings 
settings,
                                                               
ArtifactRepositoryFactory repoFactory,
                                                               
ArtifactRepositoryLayout repositoryLayout )
  @@ -398,7 +380,7 @@
   
           if ( localRepository == null )
           {
  -            String userConfigurationDirectory = System.getProperty( 
"user.home" ) + "/.m2";
  +            File userConfigurationDirectory = 
getUserConfigurationDirectory();
               localRepository =
                   new File( userConfigurationDirectory, 
MavenConstants.MAVEN_REPOSITORY ).getAbsolutePath();
           }
  
  
  
  1.8       +0 -10     
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MavenConstants.java       4 Apr 2005 03:48:01 -0000       1.7
  +++ MavenConstants.java       8 Apr 2005 07:55:05 -0000       1.8
  @@ -19,8 +19,6 @@
   
   public class MavenConstants
   {
  -    public static final String MAVEN_VERSION = "2.0-alpha-1-SNAPSHOT";
  -
       public static final String MAVEN_MODEL_VERSION = "4.0.0";
   
       // ----------------------------------------------------------------------
  @@ -29,13 +27,5 @@
   
       public static final String MAVEN_USER_CONFIGURATION_DIRECTORY = ".m2";
   
  -    public static final String MAVEN_PROPERTIES = "maven.properties";
  -
       public static final String MAVEN_REPOSITORY = "repository";
  -
  -    // ----------------------------------------------------------------------
  -    // maven.properties
  -    // ----------------------------------------------------------------------
  -
  -    public static final String MAVEN_ONLINE = "maven.online";
   }