svn commit: r512551 - in /maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings: DefaultMavenSettingsBuilder.java MavenSettingsBuilder.java SettingsBuilderAdvice.java

[jvanzyl]

Author: jvanzyl
Date: Tue Feb 27 17:29:52 2007
New Revision: 512551

URL: http://svn.apache.org/viewvc?view=rev&rev=512551
Log:
o simplifying settings handling and pushing responsibility to the client code

Removed:
    
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsBuilderAdvice.java
Modified:
    
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
    
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java

Modified: 
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?view=diff&rev=512551&r1=512550&r2=512551
==============================================================================
--- 
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 (original)
+++ 
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
 Tue Feb 27 17:29:52 2007
@@ -41,7 +41,6 @@
     extends AbstractLogEnabled
     implements MavenSettingsBuilder
 {
-
     private SettingsValidator validator;
 
     /**
@@ -50,25 +49,6 @@
     public Settings buildSettings( File userSettingsFile, File 
globalSettingsFile )
         throws IOException, XmlPullParserException
     {
-        return buildSettings( userSettingsFile, globalSettingsFile, new 
SettingsBuilderAdvice() );
-    }
-
-    /**
-     * @since 2.1
-     */
-    public Settings buildSettings( File userSettingsFile, File 
globalSettingsFile, SettingsBuilderAdvice advice )
-        throws IOException, XmlPullParserException
-    {
-        if ( advice.isDefaultUserLocationEnabled() && userSettingsFile == null 
)
-        {
-            userSettingsFile = DEFAULT_USER_SETTINGS_FILE;
-        }
-
-        if ( advice.isDefaultGlobalLocationEnabled() && globalSettingsFile == 
null )
-        {
-            globalSettingsFile = DEFAULT_GLOBAL_SETTINGS_FILE;
-        }
-
         if ( globalSettingsFile == null && userSettingsFile == null )
         {
             getLogger().debug(
@@ -105,24 +85,6 @@
         return userSettings;
     }
 
-    /**
-     * @deprecated
-     */
-    public Settings buildSettings()
-        throws IOException, XmlPullParserException
-    {
-        return buildSettings( DEFAULT_USER_SETTINGS_FILE );
-    }
-
-    /**
-     * @deprecated
-     */
-    public Settings buildSettings( File userSettingsFile )
-        throws IOException, XmlPullParserException
-    {
-        return buildSettings( userSettingsFile, null );
-    }
-
     private Settings readSettings( File settingsFile )
         throws IOException, XmlPullParserException
     {
@@ -142,6 +104,7 @@
             try
             {
                 reader = new FileReader( settingsFile );
+
                 StringWriter sWriter = new StringWriter();
 
                 IOUtil.copy( reader, sWriter );
@@ -151,6 +114,7 @@
                 try
                 {
                     RegexBasedInterpolator interpolator = new 
RegexBasedInterpolator();
+
                     interpolator.addValueSource( new EnvarBasedValueSource() );
 
                     rawInput = interpolator.interpolate( rawInput, "settings" 
);
@@ -220,6 +184,5 @@
         {
             throw new IOException( "Failed to validate Settings file at " + 
location + "\n" + validationResult.render( "\n" ) );
         }
-
     }
 }

Modified: 
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java?view=diff&rev=512551&r1=512550&r2=512551
==============================================================================
--- 
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
 (original)
+++ 
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
 Tue Feb 27 17:29:52 2007
@@ -29,33 +29,9 @@
 {
     String ROLE = MavenSettingsBuilder.class.getName();
 
-    File DEFAULT_USER_SETTINGS_FILE = new File( System.getProperty( 
"user.home" ), ".m2/settings.xml" );
-
-    File DEFAULT_GLOBAL_SETTINGS_FILE = new File( System
-        .getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), 
"conf/settings.xml" );
-
-    /**
-     * @deprecated
-     */
-    Settings buildSettings()
-        throws IOException, XmlPullParserException;
-
-    /**
-     * @deprecated
-     */
-    Settings buildSettings( File userSettingsFile )
-        throws IOException, XmlPullParserException;
-
     /**
      * @since 2.1
      */
     Settings buildSettings( File userSettingsFile, File globalSettingsFile )
         throws IOException, XmlPullParserException;
-
-    /**
-     * @since 2.1
-     */
-    Settings buildSettings( File userSettingsPath, File globalSettingsPath, 
SettingsBuilderAdvice advice )
-        throws IOException, XmlPullParserException;
-    
 }