You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/02/15 17:05:11 UTC
svn commit: r744684 - in
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli:
CLIManager.java MavenCli.java
Author: bentmann
Date: Sun Feb 15 16:05:10 2009
New Revision: 744684
URL: http://svn.apache.org/viewvc?rev=744684&view=rev
Log:
[MNG-3914] Add CLI option to control location of global settings from command line
o Merged from r726563 to provide a smooth migration path to 3.x
This is not beautiful but effective until somebody wants to change the existing API of the MavenSettingsBuilder
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java?rev=744684&r1=744683&r2=744684&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java Sun Feb 15 16:05:10 2009
@@ -58,6 +58,8 @@
public static final char ALTERNATE_USER_SETTINGS = 's';
+ public static final String ALTERNATE_GLOBAL_SETTINGS = "gs";
+
public static final String FAIL_FAST = "ff";
public static final String FAIL_AT_END = "fae";
@@ -159,6 +161,11 @@
.hasArg()
.create( ALTERNATE_USER_SETTINGS ) );
+ options.addOption( OptionBuilder.withLongOpt( "global-settings" )
+ .withDescription( "Alternate path for the global settings file" )
+ .hasArg()
+ .create( ALTERNATE_GLOBAL_SETTINGS ) );
+
options.addOption( OptionBuilder.withLongOpt( "fail-fast" )
.withDescription( "Stop at first failure in reactorized builds" )
.create( FAIL_FAST ) );
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=744684&r1=744683&r2=744684&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Sun Feb 15 16:05:10 2009
@@ -309,6 +309,12 @@
userSettingsPath = commandLine.getOptionValue( CLIManager.ALTERNATE_USER_SETTINGS );
}
+ if ( commandLine.hasOption( CLIManager.ALTERNATE_GLOBAL_SETTINGS ) )
+ {
+ String globalSettingsPath = commandLine.getOptionValue( CLIManager.ALTERNATE_GLOBAL_SETTINGS );
+ System.setProperty( MavenSettingsBuilder.ALT_GLOBAL_SETTINGS_XML_LOCATION, globalSettingsPath );
+ }
+
Settings settings = null;
MavenSettingsBuilder settingsBuilder = (MavenSettingsBuilder) embedder.lookup( MavenSettingsBuilder.ROLE );