Author: jbonofre
Date: Fri Sep 21 14:07:31 2012
New Revision: 1388506
URL: http://svn.apache.org/viewvc?rev=1388506&view=rev
Log:
[KARAF-1833] For migration purpose, reintroduce the client -p option
Modified:
karaf/branches/karaf-2.3.x/client/src/main/java/org/apache/karaf/client/Main.java
Modified:
karaf/branches/karaf-2.3.x/client/src/main/java/org/apache/karaf/client/Main.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/client/src/main/java/org/apache/karaf/client/Main.java?rev=1388506&r1=1388505&r2=1388506&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/client/src/main/java/org/apache/karaf/client/Main.java
(original)
+++
karaf/branches/karaf-2.3.x/client/src/main/java/org/apache/karaf/client/Main.java
Fri Sep 21 14:07:31 2012
@@ -47,6 +47,7 @@ public class Main {
String host = "localhost";
int port = 8101;
String user = "karaf";
+ String password = null;
StringBuilder sb = new StringBuilder();
int level = 1;
int retryAttempts = 0;
@@ -64,6 +65,8 @@ public class Main {
level++;
} else if (args[i].equals("-r")) {
retryAttempts = Integer.parseInt(args[++i]);
+ } else if (args[i].equals("-p")) {
+ password = args[++i];
} else if (args[i].equals("-d")) {
retryDelay = Integer.parseInt(args[++i]);
} else if (args[i].equals("--help")) {
@@ -71,6 +74,8 @@ public class Main {
System.out.println(" -a [port] specify the port to
connect to");
System.out.println(" -h [host] specify the host to
connect to");
System.out.println(" -u [user] specify the user
name");
+ System.out.println(" -p [password] specify the password
(optional, if not provided, the password is prompted)");
+ System.out.println(" NB: this option is
deprecated and will be removed in next Karaf version");
System.out.println(" --help shows this help
message");
System.out.println(" -v raise verbosity");
System.out.println(" -r [attempts] retry connection
establishment (up to attempts times)");
@@ -116,7 +121,9 @@ public class Main {
}
} while (session == null);
if (!session.authAgent(user).await().isSuccess()) {
- String password = readLine("Password: ");
+ if (password == null) {
+ password = readLine("Password: ");
+ }
if (!session.authPassword(user, password).await().isSuccess())
{
throw new Exception("Authentication failure");
}
