You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/02/14 13:44:22 UTC
[12/15] git commit: [KARAF-2756] Use @Completer for jndi commands
[KARAF-2756] Use @Completer for jndi commands
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/7d80946e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/7d80946e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/7d80946e
Branch: refs/heads/master
Commit: 7d80946ed022b28c88db7d3d7edffcc49140d369
Parents: 680ad58
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Fri Feb 14 13:19:45 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Feb 14 13:43:58 2014 +0100
----------------------------------------------------------------------
.../apache/karaf/jndi/command/AliasCommand.java | 5 +++
.../apache/karaf/jndi/command/BindCommand.java | 5 +++
.../karaf/jndi/command/ContextsCommand.java | 3 ++
.../karaf/jndi/command/CreateCommand.java | 3 ++
.../karaf/jndi/command/DeleteCommand.java | 3 ++
.../apache/karaf/jndi/command/NamesCommand.java | 3 ++
.../karaf/jndi/command/UnbindCommand.java | 3 ++
.../OSGI-INF/blueprint/jndi-command.xml | 34 +++-----------------
8 files changed, 30 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/java/org/apache/karaf/jndi/command/AliasCommand.java
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/java/org/apache/karaf/jndi/command/AliasCommand.java b/jndi/command/src/main/java/org/apache/karaf/jndi/command/AliasCommand.java
index f5243a5..86a126e 100644
--- a/jndi/command/src/main/java/org/apache/karaf/jndi/command/AliasCommand.java
+++ b/jndi/command/src/main/java/org/apache/karaf/jndi/command/AliasCommand.java
@@ -16,16 +16,21 @@
*/
package org.apache.karaf.jndi.command;
+import org.apache.karaf.jndi.command.completers.ContextsCompleter;
+import org.apache.karaf.jndi.command.completers.NamesCompleter;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Completer;
@Command(scope = "jndi", name = "alias", description = "Create a JNDI alias on a given name.")
public class AliasCommand extends JndiCommandSupport {
@Argument(index = 0, name = "name", description = "The JNDI name", required = true, multiValued = false)
+ @Completer(NamesCompleter.class)
String name;
@Argument(index = 1, name = "alias", description = "The JNDI alias", required = true, multiValued = false)
+ @Completer(ContextsCompleter.class)
String alias;
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/java/org/apache/karaf/jndi/command/BindCommand.java
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/java/org/apache/karaf/jndi/command/BindCommand.java b/jndi/command/src/main/java/org/apache/karaf/jndi/command/BindCommand.java
index 87b0213..a0560d3 100644
--- a/jndi/command/src/main/java/org/apache/karaf/jndi/command/BindCommand.java
+++ b/jndi/command/src/main/java/org/apache/karaf/jndi/command/BindCommand.java
@@ -16,16 +16,21 @@
*/
package org.apache.karaf.jndi.command;
+import org.apache.karaf.jndi.command.completers.ContextsCompleter;
+import org.apache.karaf.jndi.command.completers.ServicesIdCompleter;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Completer;
@Command(scope = "jndi", name = "bind", description = "Bind an OSGi service in the JNDI context")
public class BindCommand extends JndiCommandSupport {
@Argument(index = 0, name = "service", description = "The ID of the OSGi service to bind", required = true, multiValued = false)
+ @Completer(ServicesIdCompleter.class)
Long serviceId;
@Argument(index = 1, name = "name", description = "The JNDI name to bind the OSGi service", required = true, multiValued = false)
+ @Completer(ContextsCompleter.class)
String name;
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/java/org/apache/karaf/jndi/command/ContextsCommand.java
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/java/org/apache/karaf/jndi/command/ContextsCommand.java b/jndi/command/src/main/java/org/apache/karaf/jndi/command/ContextsCommand.java
index b766c25..b50f3c3 100644
--- a/jndi/command/src/main/java/org/apache/karaf/jndi/command/ContextsCommand.java
+++ b/jndi/command/src/main/java/org/apache/karaf/jndi/command/ContextsCommand.java
@@ -16,8 +16,10 @@
*/
package org.apache.karaf.jndi.command;
+import org.apache.karaf.jndi.command.completers.ContextsCompleter;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Completer;
import org.apache.karaf.shell.table.ShellTable;
import java.util.List;
@@ -26,6 +28,7 @@ import java.util.List;
public class ContextsCommand extends JndiCommandSupport {
@Argument(index = 0, name = "context", description = "The base JNDI context", required = false, multiValued = false)
+ @Completer(ContextsCompleter.class)
String context;
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/java/org/apache/karaf/jndi/command/CreateCommand.java
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/java/org/apache/karaf/jndi/command/CreateCommand.java b/jndi/command/src/main/java/org/apache/karaf/jndi/command/CreateCommand.java
index 1338cb6..dfaa108 100644
--- a/jndi/command/src/main/java/org/apache/karaf/jndi/command/CreateCommand.java
+++ b/jndi/command/src/main/java/org/apache/karaf/jndi/command/CreateCommand.java
@@ -16,13 +16,16 @@
*/
package org.apache.karaf.jndi.command;
+import org.apache.karaf.jndi.command.completers.ContextsCompleter;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Completer;
@Command(scope = "jndi", name = "create", description = "Create a new JNDI sub-context.")
public class CreateCommand extends JndiCommandSupport {
@Argument(index = 0, name = "context", description = "The JNDI sub-context name", required = true, multiValued = false)
+ @Completer(ContextsCompleter.class)
String context;
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/java/org/apache/karaf/jndi/command/DeleteCommand.java
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/java/org/apache/karaf/jndi/command/DeleteCommand.java b/jndi/command/src/main/java/org/apache/karaf/jndi/command/DeleteCommand.java
index 4ab41d6..0370859 100644
--- a/jndi/command/src/main/java/org/apache/karaf/jndi/command/DeleteCommand.java
+++ b/jndi/command/src/main/java/org/apache/karaf/jndi/command/DeleteCommand.java
@@ -16,13 +16,16 @@
*/
package org.apache.karaf.jndi.command;
+import org.apache.karaf.jndi.command.completers.ContextsCompleter;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Completer;
@Command(scope = "jndi", name = "delete", description = "Delete a JNDI sub-context.")
public class DeleteCommand extends JndiCommandSupport {
@Argument(index = 0, name = "context", description = "The JNDI sub-context name", required = true, multiValued = false)
+ @Completer(ContextsCompleter.class)
String context;
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java b/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java
index 165a5be..661dbbf 100644
--- a/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java
+++ b/jndi/command/src/main/java/org/apache/karaf/jndi/command/NamesCommand.java
@@ -16,8 +16,10 @@
*/
package org.apache.karaf.jndi.command;
+import org.apache.karaf.jndi.command.completers.ContextsCompleter;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Completer;
import org.apache.karaf.shell.table.ShellTable;
import java.util.Map;
@@ -26,6 +28,7 @@ import java.util.Map;
public class NamesCommand extends JndiCommandSupport {
@Argument(index = 0, name = "context", description = "The JNDI context to display the names", required = false, multiValued = false)
+ @Completer(ContextsCompleter.class)
String context;
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/java/org/apache/karaf/jndi/command/UnbindCommand.java
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/java/org/apache/karaf/jndi/command/UnbindCommand.java b/jndi/command/src/main/java/org/apache/karaf/jndi/command/UnbindCommand.java
index acac41f..10b9740 100644
--- a/jndi/command/src/main/java/org/apache/karaf/jndi/command/UnbindCommand.java
+++ b/jndi/command/src/main/java/org/apache/karaf/jndi/command/UnbindCommand.java
@@ -16,13 +16,16 @@
*/
package org.apache.karaf.jndi.command;
+import org.apache.karaf.jndi.command.completers.NamesCompleter;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Completer;
@Command(scope = "jndi", name = "unbind", description = "Unbind a JNDI name.")
public class UnbindCommand extends JndiCommandSupport {
@Argument(index = 0, name = "name", description = "The JNDI name to unbind", required = true, multiValued = false)
+ @Completer(NamesCompleter.class)
String name;
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/7d80946e/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml
----------------------------------------------------------------------
diff --git a/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml b/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml
index cccba60..d9b9f14 100644
--- a/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml
+++ b/jndi/command/src/main/resources/OSGI-INF/blueprint/jndi-command.xml
@@ -24,76 +24,52 @@
<action class="org.apache.karaf.jndi.command.AliasCommand">
<property name="jndiService" ref="jndiService" />
</action>
- <completers>
- <ref component-id="namesCompleter" />
- <ref component-id="contextsCompleter" />
- <null />
- </completers>
</command>
<command>
<action class="org.apache.karaf.jndi.command.ContextsCommand">
<property name="jndiService" ref="jndiService" />
</action>
- <completers>
- <ref component-id="contextsCompleter" />
- <null />
- </completers>
</command>
<command>
<action class="org.apache.karaf.jndi.command.NamesCommand">
<property name="jndiService" ref="jndiService" />
</action>
- <completers>
- <ref component-id="contextsCompleter" />
- <null />
- </completers>
</command>
<command>
<action class="org.apache.karaf.jndi.command.CreateCommand">
<property name="jndiService" ref="jndiService"/>
</action>
- <completers>
- <ref component-id="contextsCompleter" />
- <null />
- </completers>
</command>
<command>
<action class="org.apache.karaf.jndi.command.DeleteCommand">
<property name="jndiService" ref="jndiService"/>
</action>
- <completers>
- <ref component-id="contextsCompleter" />
- <null />
- </completers>
</command>
<command>
<action class="org.apache.karaf.jndi.command.BindCommand">
<property name="jndiService" ref="jndiService"/>
</action>
- <completers>
- <ref component-id="servicesIdCompleter" />
- <ref component-id="contextsCompleter" />
- <null />
- </completers>
</command>
<command>
<action class="org.apache.karaf.jndi.command.UnbindCommand">
<property name="jndiService" ref="jndiService" />
</action>
- <completers>
- <ref component-id="namesCompleter" />
- </completers>
</command>
</command-bundle>
<bean id="namesCompleter" class="org.apache.karaf.jndi.command.completers.NamesCompleter">
<property name="jndiService" ref="jndiService" />
</bean>
+ <service ref="namesCompleter" auto-export="all-classes"/>
+
<bean id="contextsCompleter" class="org.apache.karaf.jndi.command.completers.ContextsCompleter">
<property name="jndiService" ref="jndiService" />
</bean>
+ <service ref="contextsCompleter" auto-export="all-classes"/>
+
<bean id="servicesIdCompleter" class="org.apache.karaf.jndi.command.completers.ServicesIdCompleter">
<property name="bundleContext" ref="blueprintBundleContext" />
</bean>
+ <service ref="servicesIdCompleter" auto-export="all-classes"/>
</blueprint>
\ No newline at end of file