[maven] 01/01: [MNG-5438] added -ssec param to set settings-security.xml location

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch MNG-5438
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 375879a7da4ade0cbd383b466cffba98a632279a
Author: SHaselbauer <sa...@akquinet.de>
AuthorDate: Thu Feb 21 19:17:23 2013 +0100

    [MNG-5438] added -ssec param to set settings-security.xml location
    
    Added -ssec as cli param, so that you have the same
     flexibility to place your settings-security.xml as you have
     to point to a custom settings.xml file
---
 maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 8 ++++++--
 maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java   | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index 50fc667..aa56039 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -69,6 +69,8 @@ public class CLIManager
 
     public static final char ALTERNATE_USER_SETTINGS = 's';
 
+    public static final String ALTERNATE_USER_SETTINGS_SECURITY = "ssec";
+
     public static final String ALTERNATE_GLOBAL_SETTINGS = "gs";
 
     public static final char ALTERNATE_USER_TOOLCHAINS = 't';
@@ -138,8 +140,10 @@ public class CLIManager
                 .desc( "Fail the build if checksums don't match" ).build() );
         options.addOption( Option.builder( Character.toString( CHECKSUM_WARNING_POLICY ) ).longOpt( "lax-checksums" )
                 .desc( "Warn if checksums don't match" ).build() );
-        options.addOption( Option.builder( Character.toString( ALTERNATE_USER_SETTINGS ) ).longOpt( "settings" ).hasArg().
-                desc( "Alternate path for the user settings file" ).build() );
+        options.addOption( Option.builder( Character.toString( ALTERNATE_USER_SETTINGS ) ).longOpt( "settings" ).hasArg()
+                .desc( "Alternate path for the user settings file" ).build() );
+        options.addOption( Option.builder( ALTERNATE_USER_SETTINGS_SECURITY ).longOpt( "settings-security" ).hasArg()
+                .desc( "Alternate path for the user settings security file" ).build( ) );
         options.addOption( Option.builder( ALTERNATE_GLOBAL_SETTINGS ).longOpt( "global-settings" ).hasArg()
                 .desc( "Alternate path for the global settings file" ).build() );
         options.addOption( Option.builder( Character.toString( ALTERNATE_USER_TOOLCHAINS ) ).longOpt( "toolchains" ).hasArg()
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 4d142ee..66d2f34 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -684,6 +684,13 @@ public class MavenCli
 
         dispatcher = (DefaultSecDispatcher) container.lookup( SecDispatcher.class, "maven" );
 
+        if ( cliRequest.commandLine.hasOption( CLIManager.ALTERNATE_USER_SETTINGS_SECURITY ) )
+        {
+            String altSettingsSecurityFile = cliRequest.commandLine.getOptionValue(
+                    CLIManager.ALTERNATE_USER_SETTINGS_SECURITY );
+            dispatcher.setConfigurationFile( altSettingsSecurityFile );
+        }
+
         return container;
     }