Author: jbonofre
Date: Mon Jun 18 16:10:27 2012
New Revision: 1351398
URL: http://svn.apache.org/viewvc?rev=1351398&view=rev
Log:
[KARAF-1562] Improve messages display by jaas:commands when the backing engine
service is not there
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
Mon Jun 18 16:10:27 2012
@@ -20,7 +20,7 @@ import org.apache.karaf.jaas.modules.Bac
import java.util.LinkedList;
-@Command(scope = "jaas", name = "cancel", description = "Cancel the
modification of a JAAS realm.")
+@Command(scope = "jaas", name = "cancel", description = "Cancel the
modification of a JAAS realm")
public class CancelCommand extends JaasCommandSupport {
@Override
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
Mon Jun 18 16:10:27 2012
@@ -23,7 +23,7 @@ import org.apache.karaf.jaas.modules.Bac
import javax.security.auth.login.AppConfigurationEntry;
import java.util.Queue;
-@Command(scope = "jaas", name = "pending-list", description = "Lists the
modification on the active realm/module.")
+@Command(scope = "jaas", name = "pending-list", description = "List the
pending modification on the active JAAS Realm/Login Module")
public class ListPendingCommand extends JaasCommandSupport {
@Override
@@ -34,17 +34,17 @@ public class ListPendingCommand extends
if (realm != null && entry != null) {
String moduleClass = (String)
entry.getOptions().get(ProxyLoginModule.PROPERTY_MODULE);
- System.out.println(String.format("Jaas Realm:%s Jaas Module:%s",
realm.getName(), moduleClass));
+ System.out.println(String.format("JAAS Realm %s/JAAS Login Module
%s", realm.getName(), moduleClass));
if (commandQueue != null && !commandQueue.isEmpty()) {
for (JaasCommandSupport command : commandQueue) {
System.out.println(command);
}
} else {
- System.err.println("No JAAS command in queue.");
+ System.err.println("No JAAS modification command in queue");
}
} else {
- System.err.println("No JAAS Realm / Module has been selected.");
+ System.err.println("No JAAS Realm/Login Module selected");
}
return null;
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
Mon Jun 18 16:10:27 2012
@@ -20,29 +20,28 @@ import org.apache.karaf.jaas.boot.princi
import org.apache.karaf.jaas.boot.principal.UserPrincipal;
import org.apache.karaf.jaas.config.JaasRealm;
import org.apache.karaf.jaas.modules.BackingEngine;
+import org.apache.karaf.shell.table.ShellTable;
import javax.security.auth.login.AppConfigurationEntry;
import java.util.List;
-@Command(scope = "jaas", name = "user-list", description = "Lists the users of
the active realm/module.")
+@Command(scope = "jaas", name = "user-list", description = "List the users of
the selected JAAS realm/login module")
public class ListUsersCommand extends JaasCommandSupport {
- private static final String OUTPUT_FORMAT = "%-20s %-20s";
-
@Override
protected Object doExecute() throws Exception {
JaasRealm realm = (JaasRealm) session.get(JAAS_REALM);
AppConfigurationEntry entry = (AppConfigurationEntry)
session.get(JAAS_ENTRY);
if (realm == null || entry == null) {
- System.err.println("No JAAS Realm / Module has been selected.");
+ System.err.println("No JAAS Realm/Login Module has been selected");
return null;
}
BackingEngine engine = backingEngineService.get(entry);
if (engine == null) {
- System.err.println(String.format("Failed to resolve backing engine
for realm:%s and moudle:%s", realm.getName(), entry.getLoginModuleName()));
+ System.err.println("Can't get the list of users (no backing engine
service found)");
return null;
}
@@ -52,7 +51,10 @@ public class ListUsersCommand extends Ja
@Override
protected Object doExecute(BackingEngine engine) throws Exception {
List<UserPrincipal> users = engine.listUsers();
- System.out.println(String.format(OUTPUT_FORMAT, "User Name", "Role"));
+
+ ShellTable table = new ShellTable();
+ table.column("User Name");
+ table.column("Role");
for (UserPrincipal user : users) {
String userName = user.getName();
@@ -61,13 +63,16 @@ public class ListUsersCommand extends Ja
if (roles != null && roles.size() >= 1) {
for (RolePrincipal role : roles) {
String roleName = role.getName();
- System.out.println(String.format(OUTPUT_FORMAT, userName,
roleName));
+ table.addRow().addContent(userName, roleName);
}
} else {
- System.out.println(String.format(OUTPUT_FORMAT, userName, ""));
+ table.addRow().addContent(userName, "");
}
}
+
+ table.print(System.out);
+
return null;
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
Mon Jun 18 16:10:27 2012
@@ -25,13 +25,13 @@ import javax.security.auth.login.AppConf
import java.util.LinkedList;
import java.util.Queue;
-@Command(scope = "jaas", name = "realm-manage", description = "Manage user and
roles of a JAAS Realm")
+@Command(scope = "jaas", name = "realm-manage", description = "Manage users
and roles of a JAAS Realm")
public class ManageRealmCommand extends JaasCommandSupport {
@Argument(index = 0, name = "realm", description = "JAAS Realm", required
= true, multiValued = false)
String realmName;
- @Argument(index = 1, name = "module", description = "JAAS Realm Module
Class Name", required = false, multiValued = false)
+ @Argument(index = 1, name = "module", description = "JAAS Login Module
Class Name", required = false, multiValued = false)
String moduleName;
@Option(name = "-f", aliases = { "--force" }, description = "Force the
management of this realm, even if another one was under management", required =
false, multiValued = false)
@@ -43,9 +43,9 @@ public class ManageRealmCommand extends
AppConfigurationEntry oldEntry = (AppConfigurationEntry)
this.session.get(JAAS_ENTRY);
if (oldRealm != null && !oldRealm.getName().equals(realmName) &&
!force) {
- System.err.println("Another realm is being edited. Cancel/update
first, or use the --force option.");
+ System.err.println("Another JAAS Realm is edited. Cancel/update
first, or use the --force option.");
} else if (oldEntry != null &&
!oldEntry.getLoginModuleName().equals(moduleName) && !force) {
- System.err.println("Another module is being edited. Cancel/update
first, or use the --force option.");
+ System.err.println("Another JASS Login Module is edited.
Cancel/update first, or use the --force option.");
} else {
JaasRealm realm = findRealm(realmName);
@@ -65,10 +65,10 @@ public class ManageRealmCommand extends
this.session.put(JAAS_ENTRY, entry);
this.session.put(JAAS_CMDS, commands);
} else {
- System.err.println(String.format("Could not find module %s
in realm %s", moduleName, realmName));
+ System.err.println(String.format("Could not find JAAS
Login Module %s in Realm %s", moduleName, realmName));
}
} else {
- System.err.println(String.format("Could not find realm %s",
realmName));
+ System.err.println(String.format("Could not find JAAS Realm
%s", realmName));
}
}
return null;
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
Mon Jun 18 16:10:27 2012
@@ -19,7 +19,7 @@ import org.apache.karaf.shell.commands.A
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "role-add", description = "Add a role to a
user.")
+@Command(scope = "jaas", name = "role-add", description = "Add a role to a
user")
public class RoleAddCommand extends JaasCommandSupport {
@Argument(index = 0, name = "username", description = "User Name",
required = true, multiValued = false)
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
Mon Jun 18 16:10:27 2012
@@ -19,7 +19,7 @@ import org.apache.karaf.shell.commands.A
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "role-delete", description = "Delete a role
from a user.")
+@Command(scope = "jaas", name = "role-delete", description = "Delete a role
from a user")
public class RoleDeleteCommand extends JaasCommandSupport {
@Argument(index = 0, name = "username", description = "User Name",
required = true, multiValued = false)
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
Mon Jun 18 16:10:27 2012
@@ -23,7 +23,7 @@ import javax.security.auth.login.AppConf
import java.util.LinkedList;
import java.util.Queue;
-@Command(scope = "jaas", name = "update", description = "Update JAAS realm.")
+@Command(scope = "jaas", name = "update", description = "Apply pending
modification on the edited JAAS Realm")
public class UpdateCommand extends JaasCommandSupport {
@Override
@@ -32,14 +32,14 @@ public class UpdateCommand extends JaasC
AppConfigurationEntry entry = (AppConfigurationEntry)
session.get(JAAS_ENTRY);
if (realm == null || entry == null) {
- System.err.println("No JAAS Realm / Module has been selected.");
+ System.err.println("No JAAS Realm/Login Module selected");
return null;
}
BackingEngine engine = backingEngineService.get(entry);
if (engine == null) {
- System.err.println(String.format("Failed to resolve backing engine
for realm:%s and moudle:%s", realm.getName(), entry.getLoginModuleName()));
+ System.err.println("Can't update the JAAS realm (no backing engine
service registered)");
return null;
}
@@ -51,7 +51,7 @@ public class UpdateCommand extends JaasC
Queue<? extends JaasCommandSupport> commands = (Queue<? extends
JaasCommandSupport>) session.get(JAAS_CMDS);
if (commands == null || commands.isEmpty()) {
- System.err.println("No JAAS command in queue.");
+ System.err.println("No JAAS pending modification");
return null;
}
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
Mon Jun 18 16:10:27 2012
@@ -19,7 +19,7 @@ import org.apache.karaf.shell.commands.A
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "user-add", description = "Add a user.")
+@Command(scope = "jaas", name = "user-add", description = "Add a user")
public class UserAddCommand extends JaasCommandSupport {
@Argument(index = 0, name = "username", description = "User Name",
required = true, multiValued = false)
@@ -28,7 +28,6 @@ public class UserAddCommand extends Jaas
@Argument(index = 1, name = "password", description = "Password", required
= true, multiValued = false)
private String password;
-
/**
* Execute the RoleAddCommand in the given Excecution Context.
*
Modified:
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java?rev=1351398&r1=1351397&r2=1351398&view=diff
==============================================================================
---
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
(original)
+++
karaf/trunk/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
Mon Jun 18 16:10:27 2012
@@ -19,7 +19,7 @@ import org.apache.karaf.shell.commands.A
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "user-delete", description = "Delete a user.")
+@Command(scope = "jaas", name = "user-delete", description = "Delete a usergit
s")
public class UserDeleteCommand extends JaasCommandSupport {
@Argument(index = 0, name = "username", description = "User Name",
required = true, multiValued = false)
