svn commit: r524186 - /incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java

[xa...@apache.org]

Author: xavier
Date: Fri Mar 30 10:22:21 2007
New Revision: 524186

URL: http://svn.apache.org/viewvc?view=rev&rev=524186
Log:
deprecate -conf option in favor of -settings on command line (IVY-438)

Modified:
    incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java

Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java?view=diff&rev=524186&r1=524185&r2=524186
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/Main.java Fri Mar 30 10:22:21 2007
@@ -65,7 +65,7 @@
 /**
  * class used to launch ivy as a standalone tool
  * arguments are :
- * -conf <conffile> : indicates the path to the ivy configuration file
+ * -settings <settingsfile> : indicates the path to the ivy settings file
  *                  ivysettings.xml is assumed if not given
  * -cache <cachedir> : indicates the path to the cache directory
  *                   cache is assumed if not given
@@ -80,10 +80,14 @@
  */
 public class Main {
     private static Options getOptions() {
-        Option conf = OptionBuilder.withArgName( "conffile" )
-            .hasArg()
-            .withDescription(  "use given file for configuration" )
-            .create( "conf" );
+        Option settings = OptionBuilder.withArgName( "settingsfile" )
+	        .hasArg()
+	        .withDescription(  "use given file for settings" )
+	        .create( "settings" );
+        Option conf = OptionBuilder.withArgName( "settingsfile" )
+	        .hasArg()
+	        .withDescription(  "DEPRECATED - use given file for settings" )
+	        .create( "conf" );
         Option cache = OptionBuilder.withArgName( "cachedir" )
             .hasArg()
             .withDescription(  "use given directory for cache" )
@@ -165,6 +169,7 @@
         options.addOption("m2compatible", false, "use maven2 compatibility");
         options.addOption("?", false, "display this help");
         options.addOption(conf);
+        options.addOption(settings);
         options.addOption(confs);
         options.addOption(cache);
         options.addOption(ivyfile);
@@ -225,11 +230,17 @@
                     line.getOptionValue("username", null), 
                     line.getOptionValue("passwd", null));
             
-            String confPath = line.getOptionValue("conf", "");
-            if ("".equals(confPath)) {
+            String settingsPath = line.getOptionValue("settings", "");
+            if ("".equals(settingsPath)) {
+            	settingsPath = line.getOptionValue("conf", "");
+            	if (!"".equals(settingsPath)) {
+            		Message.deprecated("-conf is deprecated, use -settings instead");
+            	}
+            }
+            if ("".equals(settingsPath)) {
                 ivy.configureDefault();
             } else {
-                File conffile = new File(confPath);
+                File conffile = new File(settingsPath);
                 if (!conffile.exists()) {
                     error(options, "ivy configuration file not found: "+conffile);
                 } else if (conffile.isDirectory()) {