#1568: Karaf terminal should support both Karaf 2.x and 3.x

hawtio · Sep 14, 2014 · b84326c · b84326c
1 parent af42a7f
commit b84326c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 28 deletions.
diff --git a/hawtio-karaf-terminal/pom.xml b/hawtio-karaf-terminal/pom.xml
@@ -58,14 +58,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- TODO: delete me -->
-    <dependency>
-      <groupId>org.apache.karaf.shell</groupId>
-      <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>3.0.1</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>

diff --git a/...o-karaf-terminal/src/main/java/io/hawt/web/plugin/karaf/terminal/KarafConsoleFactory.java b/...o-karaf-terminal/src/main/java/io/hawt/web/plugin/karaf/terminal/KarafConsoleFactory.java
@@ -22,6 +22,7 @@ public class KarafConsoleFactory {
     private final static Logger LOG = LoggerFactory.getLogger(KarafConsoleFactory.class);
 
     private static final String KARAF2_CONSOLE_CLASSNAME = "org.apache.karaf.shell.console.jline.Console";
+    private static final String KARAF3_CONSOLE_FACTORY = "org.apache.karaf.shell.console.factory.ConsoleFactory";
 
     public static final int TERM_WIDTH = 120;
     public static final int TERM_HEIGHT = 400;
@@ -104,7 +105,7 @@ public static Object createConsole(CommandProcessor commandProcessor,
         // okay its karaf 3 then
         // TODO: need to lookup the console factory and create the console!
         LOG.debug("Using Karaf 3.x Console API");
-        ServiceReference ref = bundleContext.getServiceReference("(osgi.service.blueprint.compname=consoleFactoryService)");
+        ServiceReference ref = bundleContext.getServiceReference(KARAF3_CONSOLE_FACTORY);
         if (ref != null) {
             Object service = bundleContext.getService(ref);
 

diff --git a/hawtio-system/pom.xml b/hawtio-system/pom.xml
@@ -66,13 +66,6 @@
       <version>${commons-codec-version}</version>
     </dependency>
 
-    <!-- TODO: deleteme -->
-    <dependency>
-      <groupId>org.apache.karaf.management</groupId>
-      <artifactId>org.apache.karaf.management.server</artifactId>
-      <version>3.0.1</version>
-    </dependency>
-
     <!-- testing -->
     <dependency>
       <groupId>io.hawt</groupId>

diff --git a/hawtio-web/src/main/webapp/WEB-INF/web.xml b/hawtio-web/src/main/webapp/WEB-INF/web.xml
@@ -152,18 +152,6 @@
     <url-pattern>/proxy/*</url-pattern>
   </servlet-mapping>
 
-  <!-- spring-batch plugin is work in progress
-    <servlet>
-        <servlet-name>springBatch</servlet-name>
-        <servlet-class>io.hawt.web.SpringBatchConfigServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>springBatch</servlet-name>
-        <url-pattern>/springBatch/*</url-pattern>
-    </servlet-mapping>
-  -->
-
   <servlet>
     <servlet-name>file-upload</servlet-name>
     <servlet-class>io.hawt.web.UploadServlet</servlet-class>