You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/09/25 15:22:07 UTC
svn commit: r818847 [2/2] - in /felix/trunk/karaf:
features/command/src/main/java/org/apache/felix/karaf/features/command/
shell/admin/src/main/java/org/apache/felix/karaf/shell/admin/internal/commands/
shell/commands/src/main/java/org/apache/felix/kar...
Modified: felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java?rev=818847&r1=818846&r2=818847&view=diff
==============================================================================
--- felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java (original)
+++ felix/trunk/karaf/shell/packages/src/main/java/org/apache/felix/karaf/shell/packages/ImportsCommand.java Fri Sep 25 13:22:04 2009
@@ -32,7 +32,7 @@
@Command(scope = "packages", name = "imports", description = "Display imported packages")
public class ImportsCommand extends PackageCommandSupport {
- @Argument(required = false, multiValued = true, description = "bundle ids")
+ @Argument(index = 0, name = "ids", description = "The IDs of bundles to check", required = false, multiValued = true)
List<Long> ids;
protected void doExecute(PackageAdmin admin) throws Exception {
Modified: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java?rev=818847&r1=818846&r2=818847&view=diff
==============================================================================
--- felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java (original)
+++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshAction.java Fri Sep 25 13:22:04 2009
@@ -41,22 +41,22 @@
*
* @version $Rev: 721244 $ $Date: 2008-11-27 18:19:56 +0100 (Thu, 27 Nov 2008) $
*/
-@Command(scope = "ssh", name = "ssh", description = "Connect to a remote SSH server")
+@Command(scope = "ssh", name = "ssh", description = "Connects to a remote SSH server")
public class SshAction
extends OsgiCommandSupport implements BlueprintContainerAware
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Option(name="-l", aliases={"--username"}, description = "Username")
+ @Option(name="-l", aliases={"--username"}, description = "The user name for remote login", required = false, multiValued = false)
private String username;
- @Option(name="-P", aliases={"--password"}, description = "Password")
+ @Option(name="-P", aliases={"--password"}, description = "The password for remote login", required = false, multiValued = false)
private String password;
- @Argument(required=true, description = "Host")
+ @Argument(index = 0, name = "hostname", description = "The host name to connect to via SSH", required = true, multiValued = false)
private String hostname;
- @Option(name="-p", aliases={"--port"}, description = "Port")
+ @Option(name="-p", aliases={"--port"}, description = "The port to use for SSH connection", required = false, multiValued = false)
private int port = 22;
private BlueprintContainer container;
Modified: felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java?rev=818847&r1=818846&r2=818847&view=diff
==============================================================================
--- felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java (original)
+++ felix/trunk/karaf/shell/ssh/src/main/java/org/apache/felix/karaf/shell/ssh/SshServerAction.java Fri Sep 25 13:22:04 2009
@@ -33,15 +33,15 @@
*
* @version $Rev: 720411 $ $Date: 2008-11-25 05:32:43 +0100 (Tue, 25 Nov 2008) $
*/
-@Command(scope = "ssh", name = "sshd", description = "Create an SSH server")
+@Command(scope = "ssh", name = "sshd", description = "Creates a SSH server")
public class SshServerAction extends OsgiCommandSupport implements BlueprintContainerAware
{
private final Logger log = LoggerFactory.getLogger(getClass());
- @Option(name="-p", aliases={ "--port" }, description = "Port")
+ @Option(name="-p", aliases={ "--port" }, description = "The port to setup the SSH server (Default: 8101)", required = false, multiValued = false)
private int port = 8101;
- @Option(name="-b", aliases={ "--background"}, description = "Background")
+ @Option(name="-b", aliases={ "--background"}, description = "The service will run in the background (Default: true)", required = false, multiValued = false)
private boolean background = true;
private BlueprintContainer container;
Modified: felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java?rev=818847&r1=818846&r2=818847&view=diff
==============================================================================
--- felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java (original)
+++ felix/trunk/karaf/shell/wrapper/src/main/java/org/apache/felix/karaf/shell/wrapper/InstallCommand.java Fri Sep 25 13:22:04 2009
@@ -36,20 +36,19 @@
*
* @version $Rev: 603634 $ $Date: 2007-12-12 16:07:16 +0100 (Wed, 12 Dec 2007) $
*/
-@Command(scope = "wrapper", name = "install", description = "Install Karaf as a system service in the OS.")
+@Command(scope = "wrapper", name = "install", description = "Install the container as a system service in the OS.")
public class InstallCommand extends OsgiCommandSupport
{
-
- @Option(name="-n", aliases={"--name"}, description="The service name that will be used when installing the service.")
+ @Option(name="-n", aliases={"--name"}, description="The service name that will be used when installing the service. (Default: karaf)", required = false, multiValued = false)
private String name="karaf";
- @Option(name="-d", aliases={"--display"}, description="The display name of the service.")
+ @Option(name="-d", aliases={"--display"}, description="The display name of the service.", required = false, multiValued = false)
private String displayName;
- @Option(name="-D", aliases={"--description"}, description="The description of the service.")
+ @Option(name="-D", aliases={"--description"}, description="The description of the service.", required = false, multiValued = false)
private String description="";
- @Option(name="-s", aliases={"--start-type"}, description="Mode in which the service is installed. AUTO_START or DEMAND_START")
+ @Option(name="-s", aliases={"--start-type"}, description="Mode in which the service is installed. AUTO_START or DEMAND_START (Default: AUTO_START)", required = false, multiValued = false)
private String startType="AUTO_START";
protected Object doExecute() throws Exception {