You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/11/25 11:00:39 UTC

svn commit: r1206105 - in /karaf/trunk/shell: config/ config/src/main/java/org/apache/karaf/shell/config/completers/ config/src/main/resources/OSGI-INF/blueprint/ console/src/main/java/org/apache/karaf/shell/console/jline/

Author: iocanel
Date: Fri Nov 25 10:00:37 2011
New Revision: 1206105

URL: http://svn.apache.org/viewvc?rev=1206105&view=rev
Log:
[KARAF-977] Added a CommandSessionHolder for providing thread local access to command session. Added implementation to the ConfigurationPropertyCompleter.

Added:
    karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/CommandSessionHolder.java
Modified:
    karaf/trunk/shell/config/pom.xml
    karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationPropertyCompleter.java
    karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
    karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java

Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1206105&r1=1206104&r2=1206105&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Fri Nov 25 10:00:37 2011
@@ -45,6 +45,12 @@
 
         <dependency>
             <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.gogo.runtime</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.utils</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationPropertyCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationPropertyCompleter.java?rev=1206105&r1=1206104&r2=1206105&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationPropertyCompleter.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationPropertyCompleter.java Fri Nov 25 10:00:37 2011
@@ -19,9 +19,20 @@
 
 package org.apache.karaf.shell.config.completers;
 
+import java.io.IOException;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
+import org.apache.felix.service.command.CommandSession;
+import org.apache.karaf.shell.config.ConfigCommandSupport;
 import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+import org.apache.karaf.shell.console.jline.CommandSessionHolder;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
 
 /**
  * {@link jline.Completor} for Configuration Admin properties.
@@ -31,22 +42,51 @@ import org.apache.karaf.shell.console.Co
  */
 public class ConfigurationPropertyCompleter implements Completer {
 
+    private final StringsCompleter delegate = new StringsCompleter();
+
+    private ConfigurationAdmin configAdmin;
+
+
+
     public int complete(final String buffer, final int cursor, final List candidates) {
-        // TODO: currently we have no way to access the session which is being run in this thread
-        return -1;
+        CommandSession session = CommandSessionHolder.getSession();
+        if (session != null) {
+            String pid = (String) session.get(ConfigCommandSupport.PROPERTY_CONFIG_PID);
+            Set<String> propertyNames = getPropertyNames(pid);
+            if (propertyNames != null && !propertyNames.isEmpty()) {
+                delegate.getStrings().addAll(propertyNames);
+            }
+        }
+        return delegate.complete(buffer,cursor,candidates);
+    }
+
+    private Set<String> getPropertyNames(String pid) {
+        Set<String> propertyNames = new HashSet<String>();
+        if (pid != null) {
+            Configuration configuration = null;
+            try {
+                configuration = configAdmin.getConfiguration(pid);
+                if (configuration != null) {
+                    Dictionary properties = configuration.getProperties();
+                    if (properties != null) {
+                        Enumeration keys = properties.keys();
+                        while (keys.hasMoreElements()) {
+                            propertyNames.add(String.valueOf(keys.nextElement()));
+                        }
+                    }
+                }
+            } catch (IOException e) {
+              //Ignore
+            }
+        }
+        return propertyNames;
+    }
+
+    public ConfigurationAdmin getConfigAdmin() {
+        return configAdmin;
+    }
 
-//        if (vars.get(ConfigCommandSupport.PROPERTY_CONFIG_PID) == null) {
-//            return -1;
-//        }
-//
-//        Dictionary props = (Dictionary) vars.get(ConfigCommandSupport.PROPERTY_CONFIG_PROPS);
-//        StringsCompleter delegate = new StringsCompleter();
-//
-//        for (Enumeration e = props.keys(); e.hasMoreElements();) {
-//            String key = (String) e.nextElement();
-//            delegate.getStrings().add(key);
-//        }
-//
-//        return delegate.complete(buffer, cursor, candidates);
+    public void setConfigAdmin(ConfigurationAdmin configAdmin) {
+        this.configAdmin = configAdmin;
     }
 }

Modified: karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml?rev=1206105&r1=1206104&r2=1206105&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml (original)
+++ karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml Fri Nov 25 10:00:37 2011
@@ -89,7 +89,9 @@
     </bean>
     <service ref="configCompleter" interface="org.osgi.service.cm.ConfigurationListener" />
 
-    <bean id="configPropertyCompleter" class="org.apache.karaf.shell.config.completers.ConfigurationPropertyCompleter" />
+    <bean id="configPropertyCompleter" class="org.apache.karaf.shell.config.completers.ConfigurationPropertyCompleter">
+        <property name="configAdmin" ref="configAdmin"/>
+    </bean>
 
     <reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"  />
 

Added: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/CommandSessionHolder.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/CommandSessionHolder.java?rev=1206105&view=auto
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/CommandSessionHolder.java (added)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/CommandSessionHolder.java Fri Nov 25 10:00:37 2011
@@ -0,0 +1,20 @@
+package org.apache.karaf.shell.console.jline;
+
+import org.apache.felix.service.command.CommandSession;
+
+public class CommandSessionHolder {
+
+    private static final ThreadLocal<CommandSession> session = new ThreadLocal<CommandSession>();
+
+    public static CommandSession getSession() {
+        return session.get();
+    }
+
+    public static void setSession(CommandSession commandSession) {
+        session.set(commandSession);
+    }
+
+    public static void unset() {
+        session.remove();
+    }
+}

Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java?rev=1206105&r1=1206104&r2=1206105&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/jline/Console.java Fri Nov 25 10:00:37 2011
@@ -146,12 +146,15 @@ public class Console implements Runnable
             }
         }
         running = false;
+        CommandSessionHolder.unset();
         pipe.interrupt();
     }
 
     public void run()
     {
+        ThreadLocal<CommandSessionHolder> consoleState = new ThreadLocal<CommandSessionHolder>();
         thread = Thread.currentThread();
+        CommandSessionHolder.setSession(session);
         running = true;
         pipe.start();
         welcome();