svn commit: r168297 - /maven/components/trunk/maven-mboot2/src/main/java/MBoot.java

[brett]

Author: brett
Date: Thu May  5 00:45:42 2005
New Revision: 168297

URL: http://svn.apache.org/viewcvs?rev=168297&view=rev
Log:
always read settings.xml, even if maven.repo.local is given

Modified:
    maven/components/trunk/maven-mboot2/src/main/java/MBoot.java

Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=168297&r1=168296&r2=168297&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Thu May  5 
00:45:42 2005
@@ -142,32 +142,24 @@
 
         SettingsReader userModelReader = new SettingsReader();
 
-        if ( mavenRepoLocal == null )
-        {
-            try
-            {
-                String userHome = System.getProperty( "user.home" );
+        String userHome = System.getProperty( "user.home" );
 
-                File settingsXml = new File( userHome, ".m2/settings.xml" );
+        File settingsXml = new File( userHome, ".m2/settings.xml" );
 
-                if ( settingsXml.exists() )
-                {
-                    userModelReader.parse( settingsXml );
+        if ( settingsXml.exists() )
+        {
+            userModelReader.parse( settingsXml );
 
-                    Profile activeProfile = userModelReader.getActiveProfile();
+            Profile activeProfile = userModelReader.getActiveProfile();
 
-                    mavenRepoLocal = new File( activeProfile.getLocalRepo() 
).getAbsolutePath();
-                }
-            }
-            catch ( Exception e )
+            if ( mavenRepoLocal == null )
             {
-                e.printStackTrace();
+                mavenRepoLocal = new File( activeProfile.getLocalRepo() 
).getAbsolutePath();
             }
         }
 
         if ( mavenRepoLocal == null )
         {
-            String userHome = System.getProperty( "user.home" );
             String m2LocalRepoPath = "/.m2/repository";
 
             File repoDir = new File( userHome, m2LocalRepoPath );



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]