Merge pull request #11 from sbt/wip/packagenames

Move util into sbt.util.internal package

internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/ContextUtil.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._

internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Convert.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._

internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/Instance.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Classes.Applicative

internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/KListBuilder.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id

internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/MixedBuilder.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import scala.reflect._

internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleBuilder.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id

internal/util-appmacro/src/main/scala/sbt/util/internal/appmacro/TupleNBuilder.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package appmacro
 
 import Types.Id

internal/util-cache/src/main/scala/sbt/util/internal/Cache.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import sbinary.{ CollectionTypes, DefaultProtocol, Format, Input, JavaFormats, Output => Out }
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, File, InputStream, OutputStream }

internal/util-cache/src/main/scala/sbt/util/internal/CacheIO.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, FileNotFoundException }
 import sbinary.{ DefaultProtocol, Format, Operations }

internal/util-cache/src/main/scala/sbt/util/internal/FileInfo.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, IOException }
 import sbinary.{ DefaultProtocol, Format }

internal/util-cache/src/main/scala/sbt/util/internal/SeparatedCache.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types.:+:
 import sbinary.{ DefaultProtocol, Format, Input, Output => Out }

internal/util-cache/src/test/scala/CacheTest.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import java.io.File
 import Types.:+:

internal/util-collection/src/main/scala/sbt/util/internal/AList.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import Classes.Applicative
 import Types._

internal/util-collection/src/main/scala/sbt/util/internal/Attributes.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 import scala.reflect.Manifest

internal/util-collection/src/main/scala/sbt/util/internal/Classes.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 object Classes {
   trait Applicative[M[_]] {

internal/util-collection/src/main/scala/sbt/util/internal/Dag.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 David MacIver, Mark Harrah
  */
-package sbt;
+package sbt.util.internal
 
 trait Dag[Node <: Dag[Node]] {
   self: Node =>

internal/util-collection/src/main/scala/sbt/util/internal/HList.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 

internal/util-collection/src/main/scala/sbt/util/internal/IDSet.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** A mutable set interface that uses object identity to test for set membership.*/
 trait IDSet[T] {

internal/util-collection/src/main/scala/sbt/util/internal/INode.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import java.lang.Runnable
 import java.util.concurrent.{ atomic, Executor, LinkedBlockingQueue }

internal/util-collection/src/main/scala/sbt/util/internal/KList.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import Types._
 import Classes.Applicative

internal/util-collection/src/main/scala/sbt/util/internal/PMap.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import collection.mutable
 

internal/util-collection/src/main/scala/sbt/util/internal/Param.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 

internal/util-collection/src/main/scala/sbt/util/internal/Positions.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 sealed trait SourcePosition
 

internal/util-collection/src/main/scala/sbt/util/internal/Settings.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 

internal/util-collection/src/main/scala/sbt/util/internal/Show.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 trait Show[T] {
   def apply(t: T): String

internal/util-collection/src/main/scala/sbt/util/internal/ShowLines.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 trait ShowLines[A] {
   def showLines(a: A): Seq[String]

internal/util-collection/src/main/scala/sbt/util/internal/Signal.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 object Signals {
   val CONT = "CONT"

internal/util-collection/src/main/scala/sbt/util/internal/TypeFunctions.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 trait TypeFunctions {
   type Id[X] = X

internal/util-collection/src/main/scala/sbt/util/internal/Types.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 object Types extends Types
 

internal/util-collection/src/main/scala/sbt/util/internal/Util.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.util.Locale
 

internal/util-collection/src/test/scala/DagSpecification.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008 Mark Harrah */
 
-package sbt
+package sbt.util.internal
 
 import org.scalacheck._
 import Prop._

internal/util-collection/src/test/scala/KeyTest.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import org.scalacheck._
 import Prop._

internal/util-collection/src/test/scala/LiteralTest.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 

internal/util-collection/src/test/scala/PMapTest.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Types._
 

internal/util-collection/src/test/scala/SettingsExample.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 /** Define our settings system */
 

internal/util-collection/src/test/scala/SettingsTest.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import org.scalacheck._
 import Prop._

internal/util-complete/src/main/scala/sbt/util/internal/LineReader.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import jline.console.ConsoleReader
 import jline.console.history.{ FileHistory, MemoryHistory }
@@ -128,7 +128,7 @@ final class FullReader(historyPath: Option[File], complete: Parser[_], val handl
   protected[this] val reader =
     {
       val cr = JLine.createReader(historyPath)
-      sbt.complete.JLineCompletion.installCustomCompletor(cr, complete)
+      sbt.util.internal.complete.JLineCompletion.installCustomCompletor(cr, complete)
       cr
     }
 }

internal/util-complete/src/main/scala/sbt/util/internal/complete/Completions.scala

@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 /**
  * Represents a set of completions.

internal/util-complete/src/main/scala/sbt/util/internal/complete/EditDistance.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import java.lang.Character.{ toLowerCase => lower }
 

internal/util-complete/src/main/scala/sbt/util/internal/complete/ExampleSource.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import java.io.File
 import sbt.io.IO

internal/util-complete/src/main/scala/sbt/util/internal/complete/History.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 package complete
 
 import History.number

internal/util-complete/src/main/scala/sbt/util/internal/complete/HistoryCommands.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 package complete
 
 import java.io.File

internal/util-complete/src/main/scala/sbt/util/internal/complete/JLineCompletion.scala

@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import jline.console.ConsoleReader
 import jline.console.completer.{ CandidateListCompletionHandler, Completer, CompletionHandler }

internal/util-complete/src/main/scala/sbt/util/internal/complete/Parser.scala

@@ -1,11 +1,12 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2010, 2011  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import Parser._
-import sbt.Types.{ left, right, some }
+import sbt.util.internal.Types.{ left, right, some }
-import sbt.Util.{ makeList, separate }
+import sbt.util.internal.Util.{ makeList, separate }
 
 /**
  * A String parser that provides semi-automatic tab completion.

internal/util-complete/src/main/scala/sbt/util/internal/complete/Parsers.scala

@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import Parser._
 import java.io.File

internal/util-complete/src/main/scala/sbt/util/internal/complete/ProcessError.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 object ProcessError {
   def apply(command: String, msgs: Seq[String], index: Int): String =

internal/util-complete/src/main/scala/sbt/util/internal/complete/TokenCompletions.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import Completion.{ token => ctoken, tokenDisplay }
 

internal/util-complete/src/main/scala/sbt/util/internal/complete/TypeString.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import DefaultParsers._
 import TypeString._

internal/util-complete/src/main/scala/sbt/util/internal/complete/UpperBound.scala

@@ -1,7 +1,8 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008,2010  Mark Harrah
  */
-package sbt.complete
+package sbt.util.internal
+package complete
 
 sealed trait UpperBound {
   /** True if and only if the given value meets this bound.*/

internal/util-complete/src/test/scala/ParserTest.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 object JLineTest {
   import DefaultParsers._

internal/util-complete/src/test/scala/sbt/complete/FileExamplesTest.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope

internal/util-complete/src/test/scala/sbt/complete/FixedSetExamplesTest.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope

internal/util-complete/src/test/scala/sbt/complete/ParserWithExamplesTest.scala

@@ -1,4 +1,5 @@
-package sbt.complete
+package sbt.util.internal
+package complete
 
 import org.specs2.mutable.Specification
 import org.specs2.specification.Scope

internal/util-control/src/main/scala/sbt/util/internal/ErrorHandling.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.IOException
 

internal/util-control/src/main/scala/sbt/util/internal/ExitHook.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** Defines a function to call as sbt exits.*/
 trait ExitHook {

internal/util-control/src/main/scala/sbt/util/internal/MessageOnlyException.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 final class MessageOnlyException(override val toString: String) extends RuntimeException(toString)
 

internal/util-logging/src/main/scala/sbt/util/internal/BasicLogger.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** Implements the level-setting methods of Logger.*/
 abstract class BasicLogger extends AbstractLogger {

internal/util-logging/src/main/scala/sbt/util/internal/BufferedLogger.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import scala.collection.mutable.ListBuffer
 

internal/util-logging/src/main/scala/sbt/util/internal/ConsoleLogger.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010, 2011 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
 import java.util.Locale

internal/util-logging/src/main/scala/sbt/util/internal/ConsoleOut.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import java.io.{ BufferedWriter, PrintStream, PrintWriter }
 

internal/util-logging/src/main/scala/sbt/util/internal/FilterLogger.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /**
  * A filter logger is used to delegate messages but not the logging level to another logger.  This means

internal/util-logging/src/main/scala/sbt/util/internal/FullLogger.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /** Promotes the simple Logger interface to the full AbstractLogger interface. */
 class FullLogger(delegate: Logger) extends BasicLogger {

internal/util-logging/src/main/scala/sbt/util/internal/GlobalLogging.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, PrintWriter }
 

internal/util-logging/src/main/scala/sbt/util/internal/Level.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /**
  * An enumeration defining the levels available for logging.  A level includes all of the levels

internal/util-logging/src/main/scala/sbt/util/internal/LogEvent.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 sealed trait LogEvent extends NotNull
 final class Success(val msg: String) extends LogEvent

internal/util-logging/src/main/scala/sbt/util/internal/Logger.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import xsbti.{ Logger => xLogger, F0 }
 import xsbti.{ Maybe, Position, Problem, Severity }

internal/util-logging/src/main/scala/sbt/util/internal/LoggerWriter.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 /**
  * Provides a `java.io.Writer` interface to a `Logger`.  Content is line-buffered and logged at `level`.

internal/util-logging/src/main/scala/sbt/util/internal/MainLogging.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import java.io.PrintWriter
 

internal/util-logging/src/main/scala/sbt/util/internal/MultiLogger.scala

@@ -2,7 +2,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2008, 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 // note that setting the logging level on this logger has no effect on its behavior, only
 //   on the behavior of the delegates.

internal/util-logging/src/main/scala/sbt/util/internal/StackTrace.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Tony Sloane
  */
-package sbt
+package sbt.util.internal
 
 object StackTrace {
   def isSbtClass(name: String) = name.startsWith("sbt") || name.startsWith("xsbt")

internal/util-logging/src/test/scala/Escapes.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 import org.scalacheck._
 import Prop._

internal/util-logging/src/test/scala/LogWriterTest.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010 Mark Harrah */
 
-package sbt
+package sbt.util.internal
 
 import org.scalacheck._
 import Arbitrary.{ arbitrary => arb, _ }

internal/util-logging/src/test/scala/TestLogger.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 
 object TestLogger {
   def apply[T](f: Logger => T): T =

internal/util-logic/src/main/scala/sbt/util/internal/logic/Logic.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package logic
 
 import scala.annotation.tailrec

internal/util-logic/src/test/scala/sbt/logic/Test.scala

@@ -1,4 +1,4 @@
-package sbt
+package sbt.util.internal
 package logic
 
 import org.scalacheck._

internal/util-relation/src/main/scala/sbt/util/internal/Relation.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import Relation._
 

internal/util-relation/src/test/scala/RelationTest.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2010  Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import org.scalacheck._
 import Prop._

internal/util-tracking/src/main/scala/sbt/util/internal/ChangeReport.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 object ChangeReport {
   def modified[T](files: Set[T]): ChangeReport[T] =

internal/util-tracking/src/main/scala/sbt/util/internal/Tracked.scala

@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009, 2010 Mark Harrah
  */
-package sbt
+package sbt.util.internal
 
 import java.io.{ File, IOException }
 import CacheIO.{ fromFile, toFile }

project/Util.scala

@@ -20,7 +20,7 @@ object Util {
     {
       val init = keywords.map(tn => '"' + tn + '"').mkString("Set(", ", ", ")")
       val ObjectName = "ScalaKeywords"
-      val PackageName = "sbt"
+      val PackageName = "sbt.util.internal"
       val keywordsSrc =
         """package %s
 object %s {