Mercurial > hg > release > thermostat-0.7

changeset 712:82eed668f880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start jline as bundle. This patch builds on the previous start-netty-as-bundle patch. Unfortunately, 2.5 versions of jline don't have working OSGi metadata. Version 2.9 works nicely as bundles without modification. Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-October/003798.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Tue, 23 Oct 2012 14:45:07 +0200
parents ced47d3fad73
children d0ac896ea3b6
files distribution/config/osgi-export.properties distribution/pom.xml main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties pom.xml tools/pom.xml tools/src/main/java/com/redhat/thermostat/tools/cli/ShellCommand.java
diffstat 6 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/config/osgi-export.properties	Mon Oct 22 14:23:57 2012 +0200
+++ b/distribution/config/osgi-export.properties	Tue Oct 23 14:45:07 2012 +0200
@@ -62,9 +62,6 @@
 com.sun.tools.attach
 com.sun.management
 
-jline=2.5.0
-jline.console=2.5.0
-jline.console.history=2.5.0
 sun.jvmstat
 sun.jvmstat.monitor
 sun.jvmstat.monitor.event
--- a/distribution/pom.xml	Mon Oct 22 14:23:57 2012 +0200
+++ b/distribution/pom.xml	Tue Oct 23 14:45:07 2012 +0200
@@ -195,6 +195,8 @@
               <target>
                 <symlink link="${project.build.directory}/libs/netty.jar"
                          resource="${project.build.directory}/libs/netty-3.2.4.Final.jar" />
+                <symlink link="${project.build.directory}/libs/jline2.jar"
+                         resource="${project.build.directory}/libs/jline-2.9.jar" />
               </target>
             </configuration>
             <goals>
--- a/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties	Mon Oct 22 14:23:57 2012 +0200
+++ b/main/src/main/resources/com/redhat/thermostat/main/impl/bootstrapbundles.properties	Tue Oct 23 14:45:07 2012 +0200
@@ -3,4 +3,5 @@
         thermostat-bundles-${project.version}.jar, \
         thermostat-tools-${project.version}.jar, \
         thermostat-launcher-${project.version}.jar, \
-        thermostat-main-${project.version}.jar
+        thermostat-main-${project.version}.jar, \
+        jline2.jar
--- a/pom.xml	Mon Oct 22 14:23:57 2012 +0200
+++ b/pom.xml	Tue Oct 23 14:45:07 2012 +0200
@@ -72,7 +72,7 @@
     <mongo-driver.version>2.7.3</mongo-driver.version>
     <commons-beanutils.version>1.8.3</commons-beanutils.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <jline.version>2.5</jline.version>
+    <jline.version>2.9</jline.version>
     <lucene.version>3.6.0</lucene.version>
     <!--
          felix 4.0 is compliant with osgi 4.3
@@ -286,7 +286,7 @@
         <version>${commons-cli.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.jline</groupId>
+        <groupId>jline</groupId>
         <artifactId>jline</artifactId>
         <version>${jline.version}</version>
       </dependency>
--- a/tools/pom.xml	Mon Oct 22 14:23:57 2012 +0200
+++ b/tools/pom.xml	Tue Oct 23 14:45:07 2012 +0200
@@ -72,7 +72,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.jline</groupId>
+      <groupId>jline</groupId>
       <artifactId>jline</artifactId>
     </dependency>
     <dependency>
--- a/tools/src/main/java/com/redhat/thermostat/tools/cli/ShellCommand.java	Mon Oct 22 14:23:57 2012 +0200
+++ b/tools/src/main/java/com/redhat/thermostat/tools/cli/ShellCommand.java	Tue Oct 23 14:45:07 2012 +0200
@@ -130,7 +130,7 @@
     }
 
     private void shellMainLoop(CommandContext ctx, History history, Terminal term) throws IOException, CommandException {
-        ConsoleReader reader = new ConsoleReader(ctx.getConsole().getInput(), new OutputStreamWriter(ctx.getConsole().getOutput()), term);
+        ConsoleReader reader = new ConsoleReader(ctx.getConsole().getInput(), ctx.getConsole().getOutput(), term);
         if (history != null) {
             reader.setHistory(history);
         }