Author: jbonofre
Date: Mon Jun 18 17:02:54 2012
New Revision: 1351417
URL: http://svn.apache.org/viewvc?rev=1351417&view=rev
Log:
[KARAF-1562] Improve jaas:* commands messages
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
Mon Jun 18 17:02:54 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 on a JAAS Realm")
public class CancelCommand extends JaasCommandSupport {
@Override
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListPendingCommand.java
Mon Jun 18 17:02:54 2012
@@ -23,7 +23,7 @@ import org.apache.karaf.jaas.boot.ProxyL
import org.apache.karaf.jaas.config.JaasRealm;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "pending", description = "Lists the
modification on the active realm/module.")
+@Command(scope = "jaas", name = "pending", description = "List the
modification on the selected 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 pending modification");
}
} else {
- System.err.println("No JAAS Realm / Module has been selected.");
+ System.err.println("No JAAS Realm/Login Module has been selected");
}
return null;
}
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListRealmsCommand.java
Mon Jun 18 17:02:54 2012
@@ -23,7 +23,7 @@ import org.apache.karaf.jaas.boot.ProxyL
import org.apache.karaf.jaas.config.JaasRealm;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "realms", description = "Lists the existing
JAAS realms.")
+@Command(scope = "jaas", name = "realms", description = "List JAAS Realms")
public class ListRealmsCommand extends JaasCommandSupport {
private static final String REALM_LIST_FORMAT = "%5s %-20s %-80s";
@@ -48,7 +48,7 @@ public class ListRealmsCommand extends J
System.out.println(String.format(REALM_LIST_FORMAT,
index++, realmName, moduleClass));
}
} else {
- System.out.println(String.format(REALM_LIST_FORMAT,
realmName, "No module found for realm."));
+ System.out.println(String.format(REALM_LIST_FORMAT,
realmName, "No JAAS Login Module found for JAAS Realm"));
}
}
} else {
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ListUsersCommand.java
Mon Jun 18 17:02:54 2012
@@ -24,7 +24,7 @@ import org.apache.karaf.jaas.modules.Bac
import org.apache.karaf.jaas.modules.RolePrincipal;
import org.apache.karaf.jaas.modules.UserPrincipal;
-@Command(scope = "jaas", name = "users", description = "Lists the users of the
active realm/module.")
+@Command(scope = "jaas", name = "users", description = "List the users of the
selected JAAS Realm/Login Module")
public class ListUsersCommand extends JaasCommandSupport {
private static final String OUTPUT_FORMAT = "%-20s %-20s";
@@ -42,7 +42,7 @@ public class ListUsersCommand extends Ja
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 registered)");
return null;
}
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/ManageRealmCommand.java
Mon Jun 18 17:02:54 2012
@@ -24,7 +24,7 @@ import javax.security.auth.login.AppConf
import java.util.LinkedList;
import java.util.Queue;
-@Command(scope = "jaas", name = "manage", description = "Manage user and roles
of a JAAS Realm")
+@Command(scope = "jaas", name = "manage", description = "Manage users and
roles of a JAAS Realm")
public class ManageRealmCommand extends JaasCommandSupport {
@Option(name = "--realm", description = "Realm Name", required = false,
multiValued = false)
@@ -49,9 +49,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 being 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 JAAS Login Module is being edited.
Cancel/update first, or use the --force option.");
} else {
JaasRealm realm = findRealmByNameOrIndex(realmName, index);
@@ -71,10 +71,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 JAAS 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/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleAddCommand.java
Mon Jun 18 17:02:54 2012
@@ -19,7 +19,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "roleadd", description = "Add a role to a
user.")
+@Command(scope = "jaas", name = "roleadd", 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/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/RoleDeleteCommand.java
Mon Jun 18 17:02:54 2012
@@ -19,7 +19,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "roledel", description = "Delete a role from a
user.")
+@Command(scope = "jaas", name = "roledel", 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/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UpdateCommand.java
Mon Jun 18 17:02:54 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 = "Update the selected
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,18 +51,19 @@ 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 pending modification");
return null;
}
- //Loop throught the commands and execute them.
+ // loop in the commands and execute them.
while (!commands.isEmpty()) {
Object obj = commands.remove();
if (obj instanceof JaasCommandSupport) {
((JaasCommandSupport) obj).doExecute(engine);
}
}
- //Cleanup the session
+
+ // cleanup the session
session.put(JAAS_REALM, null);
session.put(JAAS_ENTRY, null);
session.put(JAAS_CMDS, new LinkedList<JaasCommandSupport>());
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserAddCommand.java
Mon Jun 18 17:02:54 2012
@@ -19,7 +19,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "useradd", description = "Add a user.")
+@Command(scope = "jaas", name = "useradd", description = "Add a user")
public class UserAddCommand extends JaasCommandSupport {
@Argument(index = 0, name = "username", description = "User Name",
required = true, multiValued = false)
Modified:
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java?rev=1351417&r1=1351416&r2=1351417&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
(original)
+++
karaf/branches/karaf-2.3.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/UserDeleteCommand.java
Mon Jun 18 17:02:54 2012
@@ -19,7 +19,7 @@ import org.apache.felix.gogo.commands.Ar
import org.apache.felix.gogo.commands.Command;
import org.apache.karaf.jaas.modules.BackingEngine;
-@Command(scope = "jaas", name = "userdel", description = "Delete a user.")
+@Command(scope = "jaas", name = "userdel", description = "Delete a user")
public class UserDeleteCommand extends JaasCommandSupport {
@Argument(index = 0, name = "username", description = "User Name",
required = true, multiValued = false)
