You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ev...@apache.org on 2007/01/18 18:20:51 UTC
svn commit: r497504 - in
/maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings:
DefaultMavenSettingsBuilder.java MavenSettingsBuilder.java
Author: evenisse
Date: Thu Jan 18 09:20:48 2007
New Revision: 497504
URL: http://svn.apache.org/viewvc?view=rev&rev=497504
Log:
Allow to reload user settings.
Modified:
maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
Modified: maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?view=diff&rev=497504&r1=497503&r2=497504
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Thu Jan 18 09:20:48 2007
@@ -144,7 +144,13 @@
public Settings buildSettings( File userSettingsFile )
throws IOException, XmlPullParserException
{
- if ( loadedSettings == null )
+ return buildSettings( userSettingsFile, true );
+ }
+
+ public Settings buildSettings( File userSettingsFile, boolean useCachedSettings )
+ throws IOException, XmlPullParserException
+ {
+ if ( !useCachedSettings || loadedSettings == null )
{
Settings globalSettings = readSettings( globalSettingsFile );
Settings userSettings = readSettings( userSettingsFile );
Modified: maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java?view=diff&rev=497504&r1=497503&r2=497504
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java Thu Jan 18 09:20:48 2007
@@ -41,4 +41,7 @@
Settings buildSettings( File userSettingsFile )
throws IOException, XmlPullParserException;
+
+ public Settings buildSettings( File userSettingsFile, boolean useCachedSettings )
+ throws IOException, XmlPullParserException;
}