svn commit: r512890 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

[jvanzyl]

Author: jvanzyl
Date: Wed Feb 28 10:21:05 2007
New Revision: 512890

URL: http://svn.apache.org/viewvc?view=rev&rev=512890
Log:
MNG-2835 Make sure the global settings are obeyed when they are the only 
settings provided

Modified:
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=512890&r1=512889&r2=512890
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 Wed Feb 28 10:21:05 2007
@@ -119,6 +119,9 @@
 
     public static final File DEFAULT_USER_SETTINGS_FILE = new File( 
userMavenConfigurationHome, "settings.xml" );
 
+    public static final File DEFAULT_GLOBAL_SETTINGS_FILE = new File( System
+        .getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), 
"conf/settings.xml" );
+
     // 
----------------------------------------------------------------------------
     //
     // 
----------------------------------------------------------------------------
@@ -613,13 +616,10 @@
 
             try
             {
-                if ( configuration.getUserSettingsFile() == null )
-                {
-                    configuration.setUserSettingsFile( 
DEFAULT_USER_SETTINGS_FILE );
-                }
-
                 settings = settingsBuilder.buildSettings( 
configuration.getUserSettingsFile(),
                                                           
configuration.getGlobalSettingsFile() );
+
+                System.out.println( "settings.getLocalRepository() = " + 
settings.getLocalRepository() );
             }
             catch ( Exception e )
             {
@@ -721,32 +721,30 @@
     {
         ConfigurationValidationResult result = new 
DefaultConfigurationValidationResult();
 
-        if ( configuration.getUserSettingsFile() == null )
-        {
-            configuration.setUserSettingsFile( 
MavenEmbedder.DEFAULT_USER_SETTINGS_FILE );
-        }
-
         Reader fileReader;
 
         // User settings
 
-        try
+        if ( configuration.getUserSettingsFile() != null )
         {
-            fileReader = new FileReader( configuration.getUserSettingsFile() );
+            try
+            {
+                fileReader = new FileReader( 
configuration.getUserSettingsFile() );
 
-            new SettingsXpp3Reader().read( fileReader );
-        }
-        catch ( FileNotFoundException e )
-        {
-            result.setUserSettingsFilePresent( false );
-        }
-        catch ( IOException e )
-        {
-            result.setUserSettingsFileParses( false );
-        }
-        catch ( XmlPullParserException e )
-        {
-            result.setUserSettingsFileParses( false );
+                new SettingsXpp3Reader().read( fileReader );
+            }
+            catch ( FileNotFoundException e )
+            {
+                result.setUserSettingsFilePresent( false );
+            }
+            catch ( IOException e )
+            {
+                result.setUserSettingsFileParses( false );
+            }
+            catch ( XmlPullParserException e )
+            {
+                result.setUserSettingsFileParses( false );
+            }
         }
 
         // Global settings