Updated to new jline sources with it moved into...

Updated to new jline sources with it moved into scala.tools.jline. I
transitioned the jline build from maven to sbt, and this commit includes
the first sbt-built binary. Review by jsuereth.

54 files changed, 174 insertions, 128 deletions

diff --git a/src/jline/README.md b/src/jline/README.md
index 6d129e721d..829476145d 100644
--- a/src/jline/README.md
+++ b/src/jline/README.md
@@ -13,15 +13,12 @@ Building
 
 ### Requirements
 
-* Maven 2+
+* SBT
 * Java 5+
 
-Check out and build:
+This is a fork with scala specific modifications.
+The original repository was: git://github.com/jdillon/jline2.git
 
-    git clone git://github.com/jdillon/jline2.git
-    cd jline2
-    mvn install
+You can now build with sbt:
 
-To build the jdk14 jar:
-
-    mvn install -Dretro
+  sbt update proguard
diff --git a/src/jline/pom.xml b/src/jline/pom.xml
index 71043e32c2..08a59b054d 100644
--- a/src/jline/pom.xml
+++ b/src/jline/pom.xml
@@ -167,7 +167,7 @@
                         </goals>
                         <configuration>
                             <instructions>
-                                <Import-Package>!jline*,javax.swing;resolution:=optional,*</Import-Package>
+                                <Import-Package>!scala.tools.jline*,javax.swing;resolution:=optional,*</Import-Package>
                                 <DynamicImport-Package>*</DynamicImport-Package>
                             </instructions>
                         </configuration>
diff --git a/src/jline/project/build.properties b/src/jline/project/build.properties
new file mode 100644
index 0000000000..c6143fe8df
--- /dev/null
+++ b/src/jline/project/build.properties
@@ -0,0 +1,8 @@
+#Project properties
+project.organization=org.improving
+project.name=jline
+sbt.version=0.7.5.RC0
+project.version=0.98
+#build.scala.versions=2.8.1
+build.scala.versions=2.9.0-SNAPSHOT
+project.initialize=false
diff --git a/src/jline/project/build/JlineProject.scala b/src/jline/project/build/JlineProject.scala
new file mode 100644
index 0000000000..721cf607d3
--- /dev/null
+++ b/src/jline/project/build/JlineProject.scala
@@ -0,0 +1,33 @@
+import sbt._
+
+/** I'm sure much of this is done the hard way, but it's done!
+ */
+class JlineProject(info: ProjectInfo) extends DefaultProject(info) with ProguardProject {
+  val snapShots = "Snapshots" at "http://scala-tools.org/repo-snapshots/"
+  val jansi = "org.fusesource.jansi" % "jansi" % "1.4"
+  val junitInterface = "com.novocode" % "junit-interface" % "0.5" % "test->default"
+
+  // val junit = "junit" % "junit" % "4.8.1" % "test"
+  // lazy val jansiPath = (managedDependencyPath / "compile" ** "jansi*").get.toList.head.absolutePath
+
+  override def makeInJarFilter(file: String) =  {
+    if (!file.startsWith("jansi")) super.makeInJarFilter(file)
+    else List(
+      "!META-INF/MANIFEST.MF",
+      "org/fusesource/hawtjni/runtime",
+      "org/fusesource/hawtjni/runtime/Callback.class",
+      "org/fusesource/hawtjni/runtime/Library.class",
+      "!org/fusesource/hawtjni/**",
+      "!META-INF/maven/org.fusesource.hawtjni",
+      "!META-INF/maven/org.fusesource.jansi",
+      "!META-INF/maven/org.fusesource.hawtjni/**",
+      "!META-INF/maven/org.fusesource.jansi/**"
+    ) mkString ", "
+  }
+
+  override def proguardOptions = List(
+    "-dontshrink",
+    "-keep class *",
+    "-keepdirectories"
+  )
+}
diff --git a/src/jline/project/plugins/Plugins.scala b/src/jline/project/plugins/Plugins.scala
new file mode 100644
index 0000000000..8c336f0abf
--- /dev/null
+++ b/src/jline/project/plugins/Plugins.scala
@@ -0,0 +1,5 @@
+import sbt._
+
+class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
+  val proguard = "org.scala-tools.sbt" % "sbt-proguard-plugin" % "0.0.5"
+}
diff --git a/src/jline/project/plugins/project/build.properties b/src/jline/project/plugins/project/build.properties
new file mode 100644
index 0000000000..f39984bd73
--- /dev/null
+++ b/src/jline/project/plugins/project/build.properties
@@ -0,0 +1,3 @@
+#Project properties
+#Fri Jan 21 08:49:59 PST 2011
+plugin.uptodate=true
diff --git a/src/jline/src/main/java/jline/AnsiWindowsTerminal.java b/src/jline/src/main/java/scala/tools/jline/AnsiWindowsTerminal.java
index aefbfff363..94697137d3 100644
--- a/src/jline/src/main/java/jline/AnsiWindowsTerminal.java
+++ b/src/jline/src/main/java/scala/tools/jline/AnsiWindowsTerminal.java
@@ -16,7 +16,7 @@
  * MODIFICATIONS: methods to deal with wrapping the output stream.
  */
 
-package jline;
+package scala.tools.jline;
 
 import org.fusesource.jansi.AnsiConsole;
 import org.fusesource.jansi.AnsiOutputStream;
diff --git a/src/jline/src/main/java/jline/NoInterruptUnixTerminal.java b/src/jline/src/main/java/scala/tools/jline/NoInterruptUnixTerminal.java
index b2cd22b5c7..ef7cf23c4a 100644
--- a/src/jline/src/main/java/jline/NoInterruptUnixTerminal.java
+++ b/src/jline/src/main/java/scala/tools/jline/NoInterruptUnixTerminal.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jline;
+package scala.tools.jline;
 
 // Based on Apache Karaf impl
 
diff --git a/src/jline/src/main/java/jline/Terminal.java b/src/jline/src/main/java/scala/tools/jline/Terminal.java
index a9ede87814..79611c244d 100644
--- a/src/jline/src/main/java/jline/Terminal.java
+++ b/src/jline/src/main/java/scala/tools/jline/Terminal.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline;
+package scala.tools.jline;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/jline/src/main/java/jline/TerminalFactory.java b/src/jline/src/main/java/scala/tools/jline/TerminalFactory.java
index 7a45cc9c51..95b7c28bd5 100644
--- a/src/jline/src/main/java/jline/TerminalFactory.java
+++ b/src/jline/src/main/java/scala/tools/jline/TerminalFactory.java
@@ -5,10 +5,10 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline;
+package scala.tools.jline;
 
-import jline.internal.Configuration;
-import jline.internal.Log;
+import scala.tools.jline.internal.Configuration;
+import scala.tools.jline.internal.Log;
 
 import java.text.MessageFormat;
 import java.util.HashMap;
diff --git a/src/jline/src/main/java/jline/TerminalSupport.java b/src/jline/src/main/java/scala/tools/jline/TerminalSupport.java
index ee7d2008ca..1ca12cb73f 100644
--- a/src/jline/src/main/java/jline/TerminalSupport.java
+++ b/src/jline/src/main/java/scala/tools/jline/TerminalSupport.java
@@ -5,10 +5,10 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline;
+package scala.tools.jline;
 
-import jline.internal.Log;
-import jline.internal.Configuration;
+import scala.tools.jline.internal.Log;
+import scala.tools.jline.internal.Configuration;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/jline/src/main/java/jline/UnixTerminal.java b/src/jline/src/main/java/scala/tools/jline/UnixTerminal.java
index 755d899765..10c98888d3 100644
--- a/src/jline/src/main/java/jline/UnixTerminal.java
+++ b/src/jline/src/main/java/scala/tools/jline/UnixTerminal.java
@@ -5,13 +5,13 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline;
+package scala.tools.jline;
 
-import jline.console.Key;
-import jline.internal.Configuration;
-import jline.internal.Log;
-import jline.internal.ReplayPrefixOneCharInputStream;
-import jline.internal.TerminalLineSettings;
+import scala.tools.jline.console.Key;
+import scala.tools.jline.internal.Configuration;
+import scala.tools.jline.internal.Log;
+import scala.tools.jline.internal.ReplayPrefixOneCharInputStream;
+import scala.tools.jline.internal.TerminalLineSettings;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,8 +19,8 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import static jline.UnixTerminal.UnixKey.*;
-import static jline.console.Key.*;
+import static scala.tools.jline.UnixTerminal.UnixKey.*;
+import static scala.tools.jline.console.Key.*;
 
 /**
  * Terminal that is used for unix platforms. Terminal initialization
diff --git a/src/jline/src/main/java/jline/UnsupportedTerminal.java b/src/jline/src/main/java/scala/tools/jline/UnsupportedTerminal.java
index 55c399c311..04fe4f7f16 100644
--- a/src/jline/src/main/java/jline/UnsupportedTerminal.java
+++ b/src/jline/src/main/java/scala/tools/jline/UnsupportedTerminal.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline;
+package scala.tools.jline;
 
 /**
  * An unsupported terminal.
diff --git a/src/jline/src/main/java/jline/WindowsTerminal.java b/src/jline/src/main/java/scala/tools/jline/WindowsTerminal.java
index dcaa3a9cde..66d2c69f8d 100644
--- a/src/jline/src/main/java/jline/WindowsTerminal.java
+++ b/src/jline/src/main/java/scala/tools/jline/WindowsTerminal.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline;
+package scala.tools.jline;
 
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
@@ -15,15 +15,15 @@ import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import jline.internal.Configuration;
+import scala.tools.jline.internal.Configuration;
 import org.fusesource.jansi.internal.WindowsSupport;
 
-import jline.internal.Log;
-import jline.internal.ReplayPrefixOneCharInputStream;
+import scala.tools.jline.internal.Log;
+import scala.tools.jline.internal.ReplayPrefixOneCharInputStream;
 
-import static jline.WindowsTerminal.ConsoleMode.*;
-import static jline.WindowsTerminal.WindowsKey.*;
-import static jline.console.Key.*;
+import static scala.tools.jline.WindowsTerminal.ConsoleMode.*;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.*;
+import static scala.tools.jline.console.Key.*;
 
 /**
  * Terminal implementation for Microsoft Windows. Terminal initialization in
diff --git a/src/jline/src/main/java/jline/console/ConsoleReader.java b/src/jline/src/main/java/scala/tools/jline/console/ConsoleReader.java
index 660bb0cbc2..bff0a10648 100644
--- a/src/jline/src/main/java/jline/console/ConsoleReader.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/ConsoleReader.java
@@ -5,17 +5,17 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console;
-
-import jline.Terminal;
-import jline.TerminalFactory;
-import jline.console.completer.CandidateListCompletionHandler;
-import jline.console.completer.Completer;
-import jline.console.completer.CompletionHandler;
-import jline.console.history.History;
-import jline.console.history.MemoryHistory;
-import jline.internal.Configuration;
-import jline.internal.Log;
+package scala.tools.jline.console;
+
+import scala.tools.jline.Terminal;
+import scala.tools.jline.TerminalFactory;
+import scala.tools.jline.console.completer.CandidateListCompletionHandler;
+import scala.tools.jline.console.completer.Completer;
+import scala.tools.jline.console.completer.CompletionHandler;
+import scala.tools.jline.console.history.History;
+import scala.tools.jline.console.history.MemoryHistory;
+import scala.tools.jline.internal.Configuration;
+import scala.tools.jline.internal.Log;
 import org.fusesource.jansi.AnsiOutputStream;
 
 import java.awt.Toolkit;
diff --git a/src/jline/src/main/java/jline/console/CursorBuffer.java b/src/jline/src/main/java/scala/tools/jline/console/CursorBuffer.java
index ef9932f43a..d9cdbec124 100644
--- a/src/jline/src/main/java/jline/console/CursorBuffer.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/CursorBuffer.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console;
+package scala.tools.jline.console;
 
 /**
  * A holder for a {@link StringBuilder} that also contains the current cursor position.
diff --git a/src/jline/src/main/java/jline/console/Key.java b/src/jline/src/main/java/scala/tools/jline/console/Key.java
index 8997985dcc..5c13d19860 100644
--- a/src/jline/src/main/java/jline/console/Key.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/Key.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console;
+package scala.tools.jline.console;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/jline/src/main/java/jline/console/Operation.java b/src/jline/src/main/java/scala/tools/jline/console/Operation.java
index e2d9ea564b..17b216be57 100644
--- a/src/jline/src/main/java/jline/console/Operation.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/Operation.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console;
+package scala.tools.jline.console;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/jline/src/main/java/jline/console/completer/AggregateCompleter.java b/src/jline/src/main/java/scala/tools/jline/console/completer/AggregateCompleter.java
index 621ac5f6d8..3170bd1c68 100644
--- a/src/jline/src/main/java/jline/console/completer/AggregateCompleter.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/AggregateCompleter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/jline/src/main/java/jline/console/completer/ArgumentCompleter.java b/src/jline/src/main/java/scala/tools/jline/console/completer/ArgumentCompleter.java
index 542d4b4424..6f60029a1d 100644
--- a/src/jline/src/main/java/jline/console/completer/ArgumentCompleter.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/ArgumentCompleter.java
@@ -5,9 +5,9 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
-import jline.internal.Log;
+import scala.tools.jline.internal.Log;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/jline/src/main/java/jline/console/completer/CandidateListCompletionHandler.java b/src/jline/src/main/java/scala/tools/jline/console/completer/CandidateListCompletionHandler.java
index 3f6ede6fc4..002f36b52e 100644
--- a/src/jline/src/main/java/jline/console/completer/CandidateListCompletionHandler.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/CandidateListCompletionHandler.java
@@ -5,10 +5,10 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
-import jline.console.ConsoleReader;
-import jline.console.CursorBuffer;
+import scala.tools.jline.console.ConsoleReader;
+import scala.tools.jline.console.CursorBuffer;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/jline/src/main/java/jline/console/completer/Completer.java b/src/jline/src/main/java/scala/tools/jline/console/completer/Completer.java
index ff5d22b108..52d33847f2 100644
--- a/src/jline/src/main/java/jline/console/completer/Completer.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/Completer.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
 import java.util.List;
 
diff --git a/src/jline/src/main/java/jline/console/completer/CompletionHandler.java b/src/jline/src/main/java/scala/tools/jline/console/completer/CompletionHandler.java
index 8f32f2c7f6..030dc84205 100644
--- a/src/jline/src/main/java/jline/console/completer/CompletionHandler.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/CompletionHandler.java
@@ -5,9 +5,9 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
-import jline.console.ConsoleReader;
+import scala.tools.jline.console.ConsoleReader;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/src/jline/src/main/java/jline/console/completer/EnumCompleter.java b/src/jline/src/main/java/scala/tools/jline/console/completer/EnumCompleter.java
index 738689e8a6..5ad049b857 100644
--- a/src/jline/src/main/java/jline/console/completer/EnumCompleter.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/EnumCompleter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
 /**
  * {@link Completer} for {@link Enum} names.
diff --git a/src/jline/src/main/java/jline/console/completer/FileNameCompleter.java b/src/jline/src/main/java/scala/tools/jline/console/completer/FileNameCompleter.java
index 69667aa9bf..6556138769 100644
--- a/src/jline/src/main/java/jline/console/completer/FileNameCompleter.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/FileNameCompleter.java
@@ -5,9 +5,9 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
-import jline.internal.Configuration;
+import scala.tools.jline.internal.Configuration;
 
 import java.io.File;
 import java.util.List;
diff --git a/src/jline/src/main/java/jline/console/completer/NullCompleter.java b/src/jline/src/main/java/scala/tools/jline/console/completer/NullCompleter.java
index 872aee7c84..93cf563bcd 100644
--- a/src/jline/src/main/java/jline/console/completer/NullCompleter.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/NullCompleter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
 import java.util.List;
 
diff --git a/src/jline/src/main/java/jline/console/completer/StringsCompleter.java b/src/jline/src/main/java/scala/tools/jline/console/completer/StringsCompleter.java
index afd2abbcd1..2abfdd0340 100644
--- a/src/jline/src/main/java/jline/console/completer/StringsCompleter.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/StringsCompleter.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/src/jline/src/main/java/jline/console/completer/package-info.java b/src/jline/src/main/java/scala/tools/jline/console/completer/package-info.java
index 4f8fc08a76..8150710cfc 100644
--- a/src/jline/src/main/java/jline/console/completer/package-info.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/completer/package-info.java
@@ -19,4 +19,4 @@
  *
  * @since 2.3
  */
-package jline.console.completer;
\ No newline at end of file
+package scala.tools.jline.console.completer;
\ No newline at end of file
diff --git a/src/jline/src/main/java/jline/console/history/FileHistory.java b/src/jline/src/main/java/scala/tools/jline/console/history/FileHistory.java
index a32e05ab75..5eccba3ce5 100644
--- a/src/jline/src/main/java/jline/console/history/FileHistory.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/history/FileHistory.java
@@ -5,9 +5,9 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.history;
+package scala.tools.jline.console.history;
 
-import jline.internal.Log;
+import scala.tools.jline.internal.Log;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
diff --git a/src/jline/src/main/java/jline/console/history/History.java b/src/jline/src/main/java/scala/tools/jline/console/history/History.java
index 9e098c9985..d8602f2150 100644
--- a/src/jline/src/main/java/jline/console/history/History.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/history/History.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.history;
+package scala.tools.jline.console.history;
 
 import java.util.Iterator;
 import java.util.ListIterator;
diff --git a/src/jline/src/main/java/jline/console/history/MemoryHistory.java b/src/jline/src/main/java/scala/tools/jline/console/history/MemoryHistory.java
index 5b67d8801b..3af936428a 100644
--- a/src/jline/src/main/java/jline/console/history/MemoryHistory.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/history/MemoryHistory.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.history;
+package scala.tools.jline.console.history;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/jline/src/main/java/jline/console/history/PersistentHistory.java b/src/jline/src/main/java/scala/tools/jline/console/history/PersistentHistory.java
index b4cff792e3..916532e7fc 100644
--- a/src/jline/src/main/java/jline/console/history/PersistentHistory.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/history/PersistentHistory.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.console.history;
+package scala.tools.jline.console.history;
 
 import java.io.IOException;
 
diff --git a/src/jline/src/main/java/jline/console/history/package-info.java b/src/jline/src/main/java/scala/tools/jline/console/history/package-info.java
index d001133efb..4635752898 100644
--- a/src/jline/src/main/java/jline/console/history/package-info.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/history/package-info.java
@@ -19,4 +19,4 @@
  *
  * @since 2.0
  */
-package jline.console.history;
\ No newline at end of file
+package scala.tools.jline.console.history;
\ No newline at end of file
diff --git a/src/jline/src/main/java/jline/console/package-info.java b/src/jline/src/main/java/scala/tools/jline/console/package-info.java
index ea2c05651d..9f284e9c05 100644
--- a/src/jline/src/main/java/jline/console/package-info.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/package-info.java
@@ -19,4 +19,4 @@
  *
  * @since 2.0
  */
-package jline.console;
\ No newline at end of file
+package scala.tools.jline.console;
\ No newline at end of file
diff --git a/src/jline/src/main/java/jline/internal/Configuration.java b/src/jline/src/main/java/scala/tools/jline/internal/Configuration.java
index 6c6e0eb843..5350d6c19e 100644
--- a/src/jline/src/main/java/jline/internal/Configuration.java
+++ b/src/jline/src/main/java/scala/tools/jline/internal/Configuration.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package jline.internal;
+package scala.tools.jline.internal;
 
 import java.io.BufferedInputStream;
 import java.io.File;
diff --git a/src/jline/src/main/java/jline/internal/Log.java b/src/jline/src/main/java/scala/tools/jline/internal/Log.java
index deb34c89ae..b226a10532 100644
--- a/src/jline/src/main/java/jline/internal/Log.java
+++ b/src/jline/src/main/java/scala/tools/jline/internal/Log.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package jline.internal;
+package scala.tools.jline.internal;
 
 import java.io.PrintStream;
 
diff --git a/src/jline/src/main/java/jline/internal/ReplayPrefixOneCharInputStream.java b/src/jline/src/main/java/scala/tools/jline/internal/ReplayPrefixOneCharInputStream.java
index ae54fbb329..2adabdd2ab 100644
--- a/src/jline/src/main/java/jline/internal/ReplayPrefixOneCharInputStream.java
+++ b/src/jline/src/main/java/scala/tools/jline/internal/ReplayPrefixOneCharInputStream.java
@@ -1,4 +1,4 @@
-package jline.internal;
+package scala.tools.jline.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/jline/src/main/java/jline/internal/TerminalLineSettings.java b/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java
index 4b4b957649..151862c14d 100644
--- a/src/jline/src/main/java/jline/internal/TerminalLineSettings.java
+++ b/src/jline/src/main/java/scala/tools/jline/internal/TerminalLineSettings.java
@@ -5,7 +5,7 @@
  * BSD license in the documentation provided with this software.
  */
 
-package jline.internal;
+package scala.tools.jline.internal;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
diff --git a/src/jline/src/main/java/jline/internal/package-info.java b/src/jline/src/main/java/scala/tools/jline/internal/package-info.java
index e15ddfb25c..d27444cfdf 100644
--- a/src/jline/src/main/java/jline/internal/package-info.java
+++ b/src/jline/src/main/java/scala/tools/jline/internal/package-info.java
@@ -19,4 +19,4 @@
  *
  * @since 2.0
  */
-package jline.internal;
\ No newline at end of file
+package scala.tools.jline.internal;
\ No newline at end of file
diff --git a/src/jline/src/main/java/jline/package-info.java b/src/jline/src/main/java/scala/tools/jline/package-info.java
index 78924e262a..fde16f98de 100644
--- a/src/jline/src/main/java/jline/package-info.java
+++ b/src/jline/src/main/java/scala/tools/jline/package-info.java
@@ -19,4 +19,4 @@
  *
  * @since 2.0
  */
-package jline;
\ No newline at end of file
+package scala.tools.jline;
\ No newline at end of file
diff --git a/src/jline/src/main/resources/jline/console/completer/CandidateListCompletionHandler.properties b/src/jline/src/main/resources/scala/tools/jline/console/completer/CandidateListCompletionHandler.properties
index fd097efb8a..fd097efb8a 100644
--- a/src/jline/src/main/resources/jline/console/completer/CandidateListCompletionHandler.properties
+++ b/src/jline/src/main/resources/scala/tools/jline/console/completer/CandidateListCompletionHandler.properties
diff --git a/src/jline/src/main/resources/jline/keybindings.properties b/src/jline/src/main/resources/scala/tools/jline/keybindings.properties
index 610a1626aa..610a1626aa 100644
--- a/src/jline/src/main/resources/jline/keybindings.properties
+++ b/src/jline/src/main/resources/scala/tools/jline/keybindings.properties
diff --git a/src/jline/src/main/resources/jline/windowsbindings.properties b/src/jline/src/main/resources/scala/tools/jline/windowsbindings.properties
index 340b5aa5b9..340b5aa5b9 100644
--- a/src/jline/src/main/resources/jline/windowsbindings.properties
+++ b/src/jline/src/main/resources/scala/tools/jline/windowsbindings.properties
diff --git a/src/jline/src/test/java/jline/TerminalFactoryTest.java b/src/jline/src/test/java/scala/tools/jline/TerminalFactoryTest.java
index 3b38fbec95..c0c070bdfd 100644
--- a/src/jline/src/test/java/jline/TerminalFactoryTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/TerminalFactoryTest.java
@@ -1,4 +1,4 @@
-package jline;
+package scala.tools.jline;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/jline/src/test/java/jline/console/ConsoleReaderTest.java b/src/jline/src/test/java/scala/tools/jline/console/ConsoleReaderTest.java
index 45ba4775e1..0e6cba15a0 100644
--- a/src/jline/src/test/java/jline/console/ConsoleReaderTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/ConsoleReaderTest.java
@@ -1,9 +1,9 @@
-package jline.console;
+package scala.tools.jline.console;
 
-import jline.TerminalFactory;
-import jline.WindowsTerminal;
-import jline.console.history.History;
-import jline.console.history.MemoryHistory;
+import scala.tools.jline.TerminalFactory;
+import scala.tools.jline.WindowsTerminal;
+import scala.tools.jline.console.history.History;
+import scala.tools.jline.console.history.MemoryHistory;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -12,18 +12,18 @@ import java.io.InputStream;
 import java.io.StringWriter;
 import java.io.Writer;
 
-import static jline.WindowsTerminal.WindowsKey.DELETE_KEY;
-import static jline.WindowsTerminal.WindowsKey.END_KEY;
-import static jline.WindowsTerminal.WindowsKey.ESCAPE_KEY;
-import static jline.WindowsTerminal.WindowsKey.HOME_KEY;
-import static jline.WindowsTerminal.WindowsKey.INSERT_KEY;
-import static jline.WindowsTerminal.WindowsKey.LEFT_ARROW_KEY;
-import static jline.WindowsTerminal.WindowsKey.NUMPAD_KEY_INDICATOR;
-import static jline.WindowsTerminal.WindowsKey.PAGE_DOWN_KEY;
-import static jline.WindowsTerminal.WindowsKey.PAGE_UP_KEY;
-import static jline.WindowsTerminal.WindowsKey.SPECIAL_KEY_INDICATOR;
-import static jline.console.Operation.DELETE_NEXT_CHAR;
-import static jline.console.Operation.DELETE_PREV_CHAR;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.DELETE_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.END_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.ESCAPE_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.HOME_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.INSERT_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.LEFT_ARROW_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.NUMPAD_KEY_INDICATOR;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.PAGE_DOWN_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.PAGE_UP_KEY;
+import static scala.tools.jline.WindowsTerminal.WindowsKey.SPECIAL_KEY_INDICATOR;
+import static scala.tools.jline.console.Operation.DELETE_NEXT_CHAR;
+import static scala.tools.jline.console.Operation.DELETE_PREV_CHAR;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
diff --git a/src/jline/src/test/java/jline/console/ConsoleReaderTestSupport.java b/src/jline/src/test/java/scala/tools/jline/console/ConsoleReaderTestSupport.java
index 7bb65fe3ca..04e98e5bcb 100644
--- a/src/jline/src/test/java/jline/console/ConsoleReaderTestSupport.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/ConsoleReaderTestSupport.java
@@ -4,9 +4,9 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  */
-package jline.console;
+package scala.tools.jline.console;
 
-import jline.UnixTerminal;
+import scala.tools.jline.UnixTerminal;
 import org.junit.Before;
 
 import java.io.ByteArrayInputStream;
@@ -15,12 +15,12 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 
-import static jline.UnixTerminal.UnixKey.ARROW_DOWN;
-import static jline.UnixTerminal.UnixKey.ARROW_LEFT;
-import static jline.UnixTerminal.UnixKey.ARROW_PREFIX;
-import static jline.UnixTerminal.UnixKey.ARROW_RIGHT;
-import static jline.UnixTerminal.UnixKey.ARROW_START;
-import static jline.UnixTerminal.UnixKey.ARROW_UP;
+import static scala.tools.jline.UnixTerminal.UnixKey.ARROW_DOWN;
+import static scala.tools.jline.UnixTerminal.UnixKey.ARROW_LEFT;
+import static scala.tools.jline.UnixTerminal.UnixKey.ARROW_PREFIX;
+import static scala.tools.jline.UnixTerminal.UnixKey.ARROW_RIGHT;
+import static scala.tools.jline.UnixTerminal.UnixKey.ARROW_START;
+import static scala.tools.jline.UnixTerminal.UnixKey.ARROW_UP;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
diff --git a/src/jline/src/test/java/jline/console/EditLineTest.java b/src/jline/src/test/java/scala/tools/jline/console/EditLineTest.java
index 3471ab4276..be70979563 100644
--- a/src/jline/src/test/java/jline/console/EditLineTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/EditLineTest.java
@@ -4,13 +4,13 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  */
-package jline.console;
+package scala.tools.jline.console;
 
 import org.junit.Test;
 
-import static jline.console.Operation.DELETE_PREV_WORD;
-import static jline.console.Operation.MOVE_TO_END;
-import static jline.console.Operation.PREV_WORD;
+import static scala.tools.jline.console.Operation.DELETE_PREV_WORD;
+import static scala.tools.jline.console.Operation.MOVE_TO_END;
+import static scala.tools.jline.console.Operation.PREV_WORD;
 
 /**
  * Tests various features of editing lines.
diff --git a/src/jline/src/test/java/jline/console/completer/ArgumentCompleterTest.java b/src/jline/src/test/java/scala/tools/jline/console/completer/ArgumentCompleterTest.java
index a74acf4adb..9e2a2ab031 100644
--- a/src/jline/src/test/java/jline/console/completer/ArgumentCompleterTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/completer/ArgumentCompleterTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
-import jline.console.ConsoleReaderTestSupport;
-import jline.console.completer.ArgumentCompleter;
-import jline.console.completer.StringsCompleter;
+import scala.tools.jline.console.ConsoleReaderTestSupport;
+import scala.tools.jline.console.completer.ArgumentCompleter;
+import scala.tools.jline.console.completer.StringsCompleter;
 import org.junit.Test;
 
 /**
diff --git a/src/jline/src/test/java/jline/console/completer/NullCompleterTest.java b/src/jline/src/test/java/scala/tools/jline/console/completer/NullCompleterTest.java
index accdd801ac..70a4c3b554 100644
--- a/src/jline/src/test/java/jline/console/completer/NullCompleterTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/completer/NullCompleterTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
-import jline.console.ConsoleReaderTestSupport;
-import jline.console.completer.NullCompleter;
+import scala.tools.jline.console.ConsoleReaderTestSupport;
+import scala.tools.jline.console.completer.NullCompleter;
 import org.junit.Test;
 
 /**
diff --git a/src/jline/src/test/java/jline/console/completer/StringsCompleterTest.java b/src/jline/src/test/java/scala/tools/jline/console/completer/StringsCompleterTest.java
index 6c7c982a25..518b88d031 100644
--- a/src/jline/src/test/java/jline/console/completer/StringsCompleterTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/completer/StringsCompleterTest.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jline.console.completer;
+package scala.tools.jline.console.completer;
 
-import jline.console.ConsoleReaderTestSupport;
-import jline.console.completer.StringsCompleter;
+import scala.tools.jline.console.ConsoleReaderTestSupport;
+import scala.tools.jline.console.completer.StringsCompleter;
 import org.junit.Test;
 
 /**
diff --git a/src/jline/src/test/java/jline/console/history/HistoryTest.java b/src/jline/src/test/java/scala/tools/jline/console/history/HistoryTest.java
index c53107d984..0a987b2b26 100644
--- a/src/jline/src/test/java/jline/console/history/HistoryTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/history/HistoryTest.java
@@ -4,16 +4,16 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  */
-package jline.console.history;
+package scala.tools.jline.console.history;
 
-import jline.console.ConsoleReaderTestSupport;
+import scala.tools.jline.console.ConsoleReaderTestSupport;
 import org.junit.Test;
 
-import static jline.console.Operation.MOVE_TO_BEG;
-import static jline.console.Operation.NEWLINE;
-import static jline.console.Operation.NEXT_HISTORY;
-import static jline.console.Operation.PREV_HISTORY;
-import static jline.console.Operation.PREV_CHAR;
+import static scala.tools.jline.console.Operation.MOVE_TO_BEG;
+import static scala.tools.jline.console.Operation.NEWLINE;
+import static scala.tools.jline.console.Operation.NEXT_HISTORY;
+import static scala.tools.jline.console.Operation.PREV_HISTORY;
+import static scala.tools.jline.console.Operation.PREV_CHAR;
 
 /**
  * Tests command history.
diff --git a/src/jline/src/test/java/jline/console/history/MemoryHistoryTest.java b/src/jline/src/test/java/scala/tools/jline/console/history/MemoryHistoryTest.java
index 6e5c731a80..91b81548c8 100644
--- a/src/jline/src/test/java/jline/console/history/MemoryHistoryTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/console/history/MemoryHistoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package jline.console.history;
+package scala.tools.jline.console.history;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/jline/src/test/java/jline/example/Example.java b/src/jline/src/test/java/scala/tools/jline/example/Example.java
index 84aee10af3..a89a09c5c9 100644
--- a/src/jline/src/test/java/jline/example/Example.java
+++ b/src/jline/src/test/java/scala/tools/jline/example/Example.java
@@ -4,10 +4,10 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  */
-package jline.example;
+package scala.tools.jline.example;
 
-import jline.console.completer.*;
-import jline.console.ConsoleReader;
+import scala.tools.jline.console.completer.*;
+import scala.tools.jline.console.ConsoleReader;
 
 import java.io.*;
 import java.util.*;
diff --git a/src/jline/src/test/java/jline/internal/TerminalLineSettingsTest.java b/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java
index 80b7f0be0b..3af10887f1 100644
--- a/src/jline/src/test/java/jline/internal/TerminalLineSettingsTest.java
+++ b/src/jline/src/test/java/scala/tools/jline/internal/TerminalLineSettingsTest.java
@@ -1,4 +1,4 @@
-package jline.internal;
+package scala.tools.jline.internal;
 
 import org.junit.Before;
 import org.junit.Test;