svn commit: r989210 - /karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java

[gn...@apache.org]

Author: gnodet
Date: Wed Aug 25 16:41:38 2010
New Revision: 989210

URL: http://svn.apache.org/viewvc?rev=989210&view=rev
Log:
KARAF-164: Allow sub classes of Main to override the META-INF path used to discover commands

Modified:
    karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java

Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java?rev=989210&r1=989209&r2=989210&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Main.java Wed Aug 25 16:41:38 2010
@@ -73,7 +73,7 @@ public class Main {
             args = a;
         }
 
-        Enumeration<URL> urls = cl.getResources("META-INF/services/org/apache/karaf/shell/commands");
+        Enumeration<URL> urls = cl.getResources(getDiscoveryResource());
         while (urls.hasMoreElements()) {
             URL url = urls.nextElement();
             BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream()));
@@ -140,6 +140,16 @@ public class Main {
         terminalFactory.destroy();
     }
 
+    /**
+     * Sub classes can override so that their registered commands do not conflict with the default shell
+     * implementation.
+     *
+     * @return
+     */
+    public String getDiscoveryResource() {
+        return "META-INF/services/org/apache/karaf/shell/commands";
+    }
+
     public String getApplication() {
         return application;
     }