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

[kenney]

Author: kenney
Date: Fri Dec 22 09:07:40 2006
New Revision: 489693

URL: http://svn.apache.org/viewvc?view=rev&rev=489693
Log:
Re-added 2 dropped methods that were never deprecated: buildSettings() and 
buildSettings( file ). maven-plugin-testing-tools uses the maven 2.0.x api's, 
but fails with NoSuchMethodError in 2.1-snapshot

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=489693&r1=489692&r2=489693
==============================================================================
--- 
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
 Fri Dec 22 09:07:40 2006
@@ -19,7 +19,6 @@
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.interpolation.EnvarBasedValueSource;
 import org.codehaus.plexus.util.interpolation.RegexBasedInterpolator;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -44,6 +43,9 @@
     // MavenProfilesBuilder Implementation
     // ----------------------------------------------------------------------
 
+    /**
+     * @since 2.1
+     */
     public Settings buildSettings( File userSettingsFile, File 
globalSettingsFile )
         throws IOException, XmlPullParserException
     {
@@ -69,6 +71,25 @@
 
         return userSettings;
     }
+
+    /**
+     * @deprecated
+     */
+    public Settings buildSettings()
+        throws IOException, XmlPullParserException
+    {
+        return buildSettings( new File( new File( System.getProperty( 
"user.home" ) ), ".m2/settings.xml" ) );
+    }
+
+    /**
+     * @deprecated
+     */
+    public Settings buildSettings( File userSettingsFile )
+        throws IOException, XmlPullParserException
+    {
+        return buildSettings( userSettingsFile, null );
+    }
+
 
     private Settings readSettings( File settingsFile )
         throws IOException, XmlPullParserException

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=489693&r1=489692&r2=489693
==============================================================================
--- 
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
 Fri Dec 22 09:07:40 2006
@@ -28,7 +28,22 @@
 public interface MavenSettingsBuilder
 {
     String ROLE = MavenSettingsBuilder.class.getName();
-    
+
+    /**
+     * @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;
 }