From 7f92cc5f4c71107c3f9bc03bfe100ecfa445f7fe Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 26 Jun 2009 01:26:06 +0000
Subject: [PATCH 001/268]  * Removed build scripts and manual dependencies  *
 useDefaultConfigurations supersedes useMavenConfigurations and is now true by
 default  * Moved installer-plugin to its own independent project as an sbt
 plugin  * bumped version for 0.5 release  * Updated project excludes for
 plugins  * Specifying the explicit URL for dependency now infers the
 extension and type from the URL  * Can load credentials from a properties
 file instead of adding them inline  * Added help for '+'  * Added method
 configurationPath to get the path to the directory containing dependencies
 downloaded for a Configuration  * managedStyle = ManagedStyle.Maven by
 default now

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@813 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 LICENSE                                       |  25 +
 NOTICE                                        |  58 ++
 boot/LICENSE                                  |  25 +
 boot/NOTICE                                   |  35 +
 boot/lib/jline-0.9.94.jar                     | Bin 0 -> 87325 bytes
 boot/licenses/LICENSE_Ivy                     | 258 +++++
 boot/licenses/LICENSE_JLine                   |  33 +
 boot/licenses/LICENSE_Scala                   |  35 +
 boot/src/main/scala/Boot.scala                | 310 ++++++
 boot/src/main/scala/BootConfiguration.scala   |  96 ++
 boot/src/main/scala/FilteredLoader.scala      |  20 +
 boot/src/main/scala/ProjectProperties.scala   | 147 +++
 boot/src/main/scala/SimpleReader.scala        |  26 +
 boot/src/main/scala/Update.scala              | 248 +++++
 install/extract/src/main/scala/Main.scala     | 108 +++
 .../main/scala/SelfExtractingProject.scala    |  79 ++
 install/project/build.properties              |   7 +
 install/project/build/InstallProject.scala    |  90 ++
 licenses/LICENSE_Apache                       | 176 ++++
 licenses/LICENSE_Scala                        |  35 +
 licenses/LICENSE_ScalaCheck                   |  32 +
 licenses/LICENSE_sbt                          |  25 +
 licenses/LICENSE_specs                        |  23 +
 project/build.properties                      |   7 +
 project/build/src/CrossCompileProject.scala   | 207 ++++
 project/build/src/LoaderProject.scala         | 129 +++
 project/build/src/SbtProject.scala            |  74 ++
 project/build/src/ScriptedLoader.scala        |  31 +
 project/build/src/ScriptedTests.scala         |  70 ++
 project/build/src/TestScriptParser.scala      | 269 ++++++
 src/main/resources/scalac-plugin.xml          |   4 +
 src/main/scala/sbt/Analysis.scala             | 220 +++++
 src/main/scala/sbt/AnalysisCallback.scala     |  93 ++
 src/main/scala/sbt/Analyzer.scala             | 234 +++++
 src/main/scala/sbt/AutoCompilerPlugins.scala  |  33 +
 src/main/scala/sbt/BasicProjectTypes.scala    | 578 ++++++++++++
 src/main/scala/sbt/BuilderProject.scala       | 210 +++++
 src/main/scala/sbt/ClasspathUtilities.scala   | 197 ++++
 src/main/scala/sbt/Compile.scala              | 279 ++++++
 src/main/scala/sbt/Conditional.scala          | 381 ++++++++
 src/main/scala/sbt/Control.scala              |  73 ++
 src/main/scala/sbt/Dag.scala                  |  30 +
 src/main/scala/sbt/DefaultProject.scala       | 458 +++++++++
 src/main/scala/sbt/DotGraph.scala             |  47 +
 src/main/scala/sbt/Environment.scala          | 345 +++++++
 src/main/scala/sbt/ExitHook.scala             |  43 +
 src/main/scala/sbt/FileTask.scala             | 108 +++
 src/main/scala/sbt/FileUtilities.scala        | 892 ++++++++++++++++++
 src/main/scala/sbt/Fork.scala                 |  82 ++
 src/main/scala/sbt/Format.scala               |  45 +
 src/main/scala/sbt/Hash.scala                 |  79 ++
 src/main/scala/sbt/IntegrationTesting.scala   |  85 ++
 src/main/scala/sbt/LineReader.scala           |  97 ++
 src/main/scala/sbt/Logger.scala               | 337 +++++++
 src/main/scala/sbt/Main.scala                 | 673 +++++++++++++
 src/main/scala/sbt/ManageDependencies.scala   | 743 +++++++++++++++
 src/main/scala/sbt/ManagedInterface.scala     | 376 ++++++++
 src/main/scala/sbt/ModuleUtilities.scala      |  14 +
 src/main/scala/sbt/NameFilter.scala           |  72 ++
 src/main/scala/sbt/Pack.scala                 |  87 ++
 src/main/scala/sbt/ParallelRunner.scala       | 464 +++++++++
 src/main/scala/sbt/Path.scala                 | 336 +++++++
 src/main/scala/sbt/Process.scala              |  89 ++
 src/main/scala/sbt/Project.scala              | 462 +++++++++
 src/main/scala/sbt/ProjectInfo.scala          | 107 +++
 src/main/scala/sbt/ProjectPaths.scala         | 300 ++++++
 src/main/scala/sbt/ReflectUtilities.scala     |  52 +
 src/main/scala/sbt/Resources.scala            | 149 +++
 src/main/scala/sbt/Run.scala                  | 167 ++++
 src/main/scala/sbt/ScalaProject.scala         | 345 +++++++
 src/main/scala/sbt/ScalaVersion.scala         |  47 +
 .../scala/sbt/SourceModificationWatch.scala   |  32 +
 src/main/scala/sbt/TaskManager.scala          |  88 ++
 src/main/scala/sbt/TestFramework.scala        | 221 +++++
 src/main/scala/sbt/TestReportListener.scala   | 316 +++++++
 src/main/scala/sbt/TrapExit.scala             | 238 +++++
 src/main/scala/sbt/Version.scala              |  65 ++
 src/main/scala/sbt/WebApp.scala               | 245 +++++
 src/main/scala/sbt/Webstart.scala             | 277 ++++++
 src/main/scala/sbt/impl/CommandParser.scala   |  54 ++
 src/main/scala/sbt/impl/MapUtilities.scala    |  59 ++
 src/main/scala/sbt/impl/ProcessImpl.scala     | 353 +++++++
 src/main/scala/sbt/impl/RunTask.scala         | 164 ++++
 src/main/scala/sbt/impl/SelectMainClass.scala |  44 +
 .../scala/sbt/impl/TestFrameworkImpl.scala    | 186 ++++
 src/main/scala/sbt/impl/TestParser.scala      |  47 +
 .../scala/sbt/impl/TestStatusReporter.scala   |  74 ++
 src/main/scala/sbt/wrap/Wrappers.scala        | 112 +++
 .../interactive/changes/TestProject2.scala    |   6 +
 .../interactive/changes/TestProject3.scala    |   7 +
 .../interactive/changes/TestProject4.scala    |  10 +
 .../interactive/changes/TestProject5.scala    |  12 +
 .../interactive/changes/TestProject6.scala    |  12 +
 .../interactive/changes/TestProject7.scala    |  12 +
 .../interactive/project/build.properties      |   4 +
 .../project/build/src/Marker.scala            |  13 +
 .../project/build/src/TestProject.scala       |   6 +
 .../actions/interactive/test                  |  46 +
 .../run-test/project/build.properties         |   3 +
 .../project/build/src/TestProject.scala       |   7 +
 .../run-test/src/main/scala/Foo.scala         |  27 +
 .../run-test/src/test/scala/FooTest.scala     |  12 +
 .../compiler-project/run-test/test            |  11 +
 .../project/build.properties                  |   2 +
 .../project/build/src/TestProject.scala       |  26 +
 .../exclude-transitive/test                   |  32 +
 .../inherit-repo/changes/CorrectProject.scala |  19 +
 .../changes/CorrectProject2.scala             |  21 +
 .../changes/CorrectProject3.scala             |  21 +
 .../inherit-repo/project/build.properties     |   5 +
 .../project/build/src/TestProject.scala       |  18 +
 .../dependency-management/inherit-repo/test   |  31 +
 .../inline-default/project/build.properties   |   2 +
 .../project/build/src/TestProject.scala       |  20 +
 .../dependency-management/inline-default/test |  42 +
 .../project/build.properties                  |   4 +
 .../project/build/src/UpdateTestProject.scala |   8 +
 .../inline-dependencies-a/test                |   5 +
 .../changes/scala-tools-ivysettings.xml       |  19 +
 .../ivy-settings-a/changes/scalacheck-ivy.xml |   7 +
 .../ivy-settings-a/ivy.xml                    |   4 +
 .../ivy-settings-a/ivysettings.xml            |   3 +
 .../ivy-settings-a/project/build.properties   |   4 +
 .../dependency-management/ivy-settings-a/test |  20 +
 .../changes/scala-tools-ivysettings.xml       |  19 +
 .../ivy-settings-b/ivysettings.xml            |   3 +
 .../ivy-settings-b/project/build.properties   |   4 +
 .../project/build/src/UpdateTestProject.scala |   6 +
 .../dependency-management/ivy-settings-b/test |  14 +
 .../java.net/project/build.properties         |   2 +
 .../project/build/src/TestProject.scala       |   7 +
 .../dependency-management/java.net/test       |   2 +
 .../provided/project/build.properties         |   2 +
 .../project/build/src/TestProject.scala       |  32 +
 .../dependency-management/provided/test       |  51 +
 .../url/project/build.properties              |   2 +
 .../url/project/build/src/TestProject.scala   |  25 +
 .../dependency-management/url/test            |  12 +
 .../java/analysis/project/build.properties    |   5 +
 .../java/analysis/src/main/java/test/R.java   |  16 +
 .../sbt-test-resources/java/analysis/test     |   2 +
 .../java/basic/project/build.properties       |   5 +
 .../java/basic/src/main/java/test/R.java      |   6 +
 .../java/basic/src/main/scala/S.scala         |   7 +
 .../sbt-test-resources/java/basic/test        |   2 +
 .../java/options/project/build.properties     |   5 +
 .../project/build/src/JavaProject.scala       |   8 +
 .../java/options/src/main/java/test/R.java    |   9 +
 .../java/options/src/main/scala/S.scala       |   7 +
 .../sbt-test-resources/java/options/test      |   2 +
 .../lazy-name/project/build.properties        |   4 +
 .../sbt-test-resources/package/lazy-name/test |  26 +
 .../package/manifest/project/build.properties |   4 +
 .../build/src/ManifestTestProject.scala       |  16 +
 .../src/main/scala/jartest/Main.scala         |   6 +
 .../sbt-test-resources/package/manifest/test  |  11 +
 .../resources/project/build.properties        |   4 +
 .../build/src/ManifestTestProject.scala       |  16 +
 .../src/main/resources/main_resource_test     |   1 +
 .../src/main/scala/jartest/Main.scala         |  10 +
 .../sbt-test-resources/package/resources/test |  36 +
 .../changes/LibTestProject.scala              |   6 +
 .../Class.forName/project/build.properties    |   5 +
 .../Class.forName/src/main/scala/Test.scala   |   8 +
 .../project/Class.forName/test                |  19 +
 .../project/flatten/project/build.properties  |   5 +
 .../project/build/src/FlatProject.scala       |  23 +
 .../project/flatten/src/JavaA.java            |   4 +
 .../project/flatten/src/ScalaA.scala          |   6 +
 .../project/flatten/src/a/JavaB.java          |   6 +
 .../project/flatten/src/a/ScalaB.scala        |  16 +
 .../project/flatten/src/a/test-resource-a     |   1 +
 .../project/flatten/src/test-resource         |   1 +
 .../sbt-test-resources/project/flatten/test   |  25 +
 .../project/flatten/test-src/SimpleTest.scala |  10 +
 .../flatten/test-src/c/ResourcesTest.scala    |  19 +
 .../flatten/test-src/c/test-resource-c        |   1 +
 .../project/flatten/test-src/test-resource    |   1 +
 .../project/lib/changes/LibTestProject.scala  |   6 +
 .../project/lib/project/build.properties      |   5 +
 .../project/lib/src/main/scala/Test.scala     |   6 +
 .../sbt-test-resources/project/lib/test       |  19 +
 .../project/multi/changes/MultiProject.scala  |   6 +
 .../multi/changes/SingleAndTraitProject.scala |   9 +
 .../project/multi/changes/SingleProject.scala |   5 +
 .../multi/changes/SinglePublicProject.scala   |   7 +
 .../project/multi/project/build.properties    |   2 +
 .../sbt-test-resources/project/multi/test     |  31 +
 .../multi-project-a/project/build.properties  |   4 +
 .../project/build/src/TestProject.scala       |   7 +
 .../properties/multi-project-a/test           |   5 +
 .../multi-project-b/project/build.properties  |   4 +
 .../project/build/src/TestProject.scala       |  11 +
 .../properties/multi-project-b/test           |   5 +
 .../run/daemon-exit/project/build.properties  |   3 +
 .../daemon-exit/src/main/scala/Daemon.scala   |  23 +
 .../sbt-test-resources/run/daemon-exit/test   |   2 +
 .../run/daemon/project/build.properties       |   3 +
 .../run/daemon/src/main/scala/Daemon.scala    |  13 +
 .../sbt-test-resources/run/daemon/test        |   2 +
 .../run/spawn-exit/project/build.properties   |   3 +
 .../run/spawn-exit/src/main/scala/Spawn.scala |  30 +
 .../sbt-test-resources/run/spawn-exit/test    |   2 +
 .../run/spawn/project/build.properties        |   3 +
 .../run/spawn/src/main/scala/Spawn.scala      |  35 +
 .../sbt-test-resources/run/spawn/test         |   2 +
 .../empty-a/changes/A.scala                   |   6 +
 .../empty-a/changes/A2.scala                  |   6 +
 .../empty-a/changes/B.scala                   |   6 +
 .../empty-a/project/build.properties          |   4 +
 .../source-dependencies/empty-a/test          |  41 +
 .../new-cyclic/changes/A2.scala               |   1 +
 .../new-cyclic/project/build.properties       |   4 +
 .../new-cyclic/src/main/scala/A.scala         |   1 +
 .../new-cyclic/src/main/scala/B.scala         |   1 +
 .../source-dependencies/new-cyclic/test       |   8 +
 .../remove-test-a/changes/1.scala             |   6 +
 .../remove-test-a/project/build.properties    |   4 +
 .../source-dependencies/remove-test-a/test    |  14 +
 .../remove-test-b/changes/A2.scala            |   6 +
 .../remove-test-b/changes/B3.scala            |   6 +
 .../remove-test-b/changes/B4.scala            |   5 +
 .../remove-test-b/changes/B5.scala            |   5 +
 .../remove-test-b/project/build.properties    |   4 +
 .../remove-test-b/src/main/scala/A.scala      |   5 +
 .../remove-test-b/src/main/scala/B.scala      |   5 +
 .../source-dependencies/remove-test-b/test    |  50 +
 .../replace-test-a/changes/first.scala        |   4 +
 .../replace-test-a/changes/second.scala       |   4 +
 .../replace-test-a/project/build.properties   |   2 +
 .../project/build/src/TestProject.scala       |   9 +
 .../source-dependencies/replace-test-a/test   |  19 +
 .../transitive-a/changes/A2.scala             |   4 +
 .../transitive-a/project/build.properties     |   4 +
 .../transitive-a/src/main/scala/A.scala       |   4 +
 .../transitive-a/src/main/scala/B.scala       |   4 +
 .../transitive-a/src/main/scala/C.scala       |   4 +
 .../source-dependencies/transitive-a/test     |   8 +
 .../transitive-b/changes/A2.scala             |   4 +
 .../transitive-b/project/build.properties     |   4 +
 .../transitive-b/src/main/scala/A.scala       |   4 +
 .../transitive-b/src/main/scala/B.scala       |   1 +
 .../transitive-b/src/main/scala/C.scala       |   4 +
 .../source-dependencies/transitive-b/test     |   8 +
 .../tests/Class.forName/ivy.xml               |  10 +
 .../Class.forName/project/build.properties    |   5 +
 .../Class.forName/src/main/scala/Test.scala   |  10 +
 .../Class.forName/src/test/scala/Test.scala   |  15 +
 .../tests/Class.forName/test                  |  23 +
 .../tests/extend/changes/ScalaCheck.scala     |  41 +
 .../tests/extend/changes/TestFailure.scala    |   6 +
 .../tests/extend/changes/TestProject2.scala   |   8 +
 .../tests/extend/changes/TestProject3.scala   |  12 +
 .../tests/extend/changes/TestSuccess.scala    |   6 +
 .../tests/extend/project/build.properties     |   5 +
 .../project/build/src/TestProject.scala       |   9 +
 .../sbt-test-resources/tests/extend/test      |  72 ++
 .../tests/resources/ivy.xml                   |   7 +
 .../tests/resources/project/build.properties  |   3 +
 .../src/main/resources/MainResource.txt       |   1 +
 .../src/test/resources/TestResource.txt       |   1 +
 .../resources/src/test/scala/BasicTest.scala  |  11 +
 .../sbt-test-resources/tests/resources/test   |   5 +
 .../scalacheck-a/changes/BasicTest.scala      |  21 +
 .../scalacheck-a/changes/FailedTest.scala     |  21 +
 .../scalacheck-a/project/build.properties     |   4 +
 .../project/build/src/TestProject.scala       |   7 +
 .../src/test/scala/DummyTest.scala            |   2 +
 .../tests/scalacheck-a/test                   |  23 +
 .../scalatest-ignore/project/build.properties |   2 +
 .../scalatest-ignore/project/build/Test.scala |   7 +
 .../src/test/scala/IgnoreTest.scala           |  11 +
 .../tests/scalatest-ignore/test               |   5 +
 .../tests/specs-a/changes/BasicTest.scala     |  36 +
 .../tests/specs-a/changes/FailTest.scala      |  36 +
 .../tests/specs-a/project/build.properties    |   4 +
 .../project/build/src/TestProject.scala       |   7 +
 .../specs-a/src/test/scala/DummyTest.scala    |   2 +
 .../sbt-test-resources/tests/specs-a/test     |  23 +
 .../specs-nested/project/build.properties     |   4 +
 .../project/build/src/TestProject.scala       |   6 +
 .../src/test/scala/TestSpecification.scala    |  19 +
 .../tests/specs-nested/test                   |   5 +
 src/test/scala/sbt/DagSpecification.scala     |  56 ++
 .../scala/sbt/EnvironmentSpecification.scala  |  98 ++
 .../sbt/FileUtilitiesSpecification.scala      |  73 ++
 .../scala/sbt/NameFilterSpecification.scala   |  39 +
 src/test/scala/sbt/PathSpecification.scala    | 109 +++
 src/test/scala/sbt/ProcessSpecification.scala |  91 ++
 src/test/scala/sbt/ReflectSpecification.scala | 181 ++++
 src/test/scala/sbt/TestedProcess.scala        |  55 ++
 src/test/scala/sbt/VersionSpecification.scala |  61 ++
 .../scala/sbt/wrap/MutableSetWrapper.scala    |  89 ++
 293 files changed, 17611 insertions(+)
 create mode 100644 LICENSE
 create mode 100644 NOTICE
 create mode 100644 boot/LICENSE
 create mode 100644 boot/NOTICE
 create mode 100644 boot/lib/jline-0.9.94.jar
 create mode 100644 boot/licenses/LICENSE_Ivy
 create mode 100644 boot/licenses/LICENSE_JLine
 create mode 100644 boot/licenses/LICENSE_Scala
 create mode 100755 boot/src/main/scala/Boot.scala
 create mode 100644 boot/src/main/scala/BootConfiguration.scala
 create mode 100644 boot/src/main/scala/FilteredLoader.scala
 create mode 100644 boot/src/main/scala/ProjectProperties.scala
 create mode 100644 boot/src/main/scala/SimpleReader.scala
 create mode 100644 boot/src/main/scala/Update.scala
 create mode 100644 install/extract/src/main/scala/Main.scala
 create mode 100644 install/plugin/src/main/scala/SelfExtractingProject.scala
 create mode 100644 install/project/build.properties
 create mode 100644 install/project/build/InstallProject.scala
 create mode 100644 licenses/LICENSE_Apache
 create mode 100644 licenses/LICENSE_Scala
 create mode 100644 licenses/LICENSE_ScalaCheck
 create mode 100644 licenses/LICENSE_sbt
 create mode 100644 licenses/LICENSE_specs
 create mode 100644 project/build.properties
 create mode 100644 project/build/src/CrossCompileProject.scala
 create mode 100644 project/build/src/LoaderProject.scala
 create mode 100644 project/build/src/SbtProject.scala
 create mode 100644 project/build/src/ScriptedLoader.scala
 create mode 100644 project/build/src/ScriptedTests.scala
 create mode 100644 project/build/src/TestScriptParser.scala
 create mode 100644 src/main/resources/scalac-plugin.xml
 create mode 100644 src/main/scala/sbt/Analysis.scala
 create mode 100644 src/main/scala/sbt/AnalysisCallback.scala
 create mode 100644 src/main/scala/sbt/Analyzer.scala
 create mode 100644 src/main/scala/sbt/AutoCompilerPlugins.scala
 create mode 100644 src/main/scala/sbt/BasicProjectTypes.scala
 create mode 100644 src/main/scala/sbt/BuilderProject.scala
 create mode 100644 src/main/scala/sbt/ClasspathUtilities.scala
 create mode 100644 src/main/scala/sbt/Compile.scala
 create mode 100644 src/main/scala/sbt/Conditional.scala
 create mode 100644 src/main/scala/sbt/Control.scala
 create mode 100644 src/main/scala/sbt/Dag.scala
 create mode 100644 src/main/scala/sbt/DefaultProject.scala
 create mode 100644 src/main/scala/sbt/DotGraph.scala
 create mode 100644 src/main/scala/sbt/Environment.scala
 create mode 100644 src/main/scala/sbt/ExitHook.scala
 create mode 100644 src/main/scala/sbt/FileTask.scala
 create mode 100644 src/main/scala/sbt/FileUtilities.scala
 create mode 100644 src/main/scala/sbt/Fork.scala
 create mode 100644 src/main/scala/sbt/Format.scala
 create mode 100644 src/main/scala/sbt/Hash.scala
 create mode 100644 src/main/scala/sbt/IntegrationTesting.scala
 create mode 100644 src/main/scala/sbt/LineReader.scala
 create mode 100644 src/main/scala/sbt/Logger.scala
 create mode 100644 src/main/scala/sbt/Main.scala
 create mode 100644 src/main/scala/sbt/ManageDependencies.scala
 create mode 100644 src/main/scala/sbt/ManagedInterface.scala
 create mode 100644 src/main/scala/sbt/ModuleUtilities.scala
 create mode 100644 src/main/scala/sbt/NameFilter.scala
 create mode 100644 src/main/scala/sbt/Pack.scala
 create mode 100644 src/main/scala/sbt/ParallelRunner.scala
 create mode 100644 src/main/scala/sbt/Path.scala
 create mode 100644 src/main/scala/sbt/Process.scala
 create mode 100644 src/main/scala/sbt/Project.scala
 create mode 100644 src/main/scala/sbt/ProjectInfo.scala
 create mode 100644 src/main/scala/sbt/ProjectPaths.scala
 create mode 100644 src/main/scala/sbt/ReflectUtilities.scala
 create mode 100644 src/main/scala/sbt/Resources.scala
 create mode 100644 src/main/scala/sbt/Run.scala
 create mode 100644 src/main/scala/sbt/ScalaProject.scala
 create mode 100644 src/main/scala/sbt/ScalaVersion.scala
 create mode 100644 src/main/scala/sbt/SourceModificationWatch.scala
 create mode 100644 src/main/scala/sbt/TaskManager.scala
 create mode 100644 src/main/scala/sbt/TestFramework.scala
 create mode 100644 src/main/scala/sbt/TestReportListener.scala
 create mode 100644 src/main/scala/sbt/TrapExit.scala
 create mode 100644 src/main/scala/sbt/Version.scala
 create mode 100644 src/main/scala/sbt/WebApp.scala
 create mode 100644 src/main/scala/sbt/Webstart.scala
 create mode 100644 src/main/scala/sbt/impl/CommandParser.scala
 create mode 100644 src/main/scala/sbt/impl/MapUtilities.scala
 create mode 100644 src/main/scala/sbt/impl/ProcessImpl.scala
 create mode 100644 src/main/scala/sbt/impl/RunTask.scala
 create mode 100644 src/main/scala/sbt/impl/SelectMainClass.scala
 create mode 100755 src/main/scala/sbt/impl/TestFrameworkImpl.scala
 create mode 100644 src/main/scala/sbt/impl/TestParser.scala
 create mode 100644 src/main/scala/sbt/impl/TestStatusReporter.scala
 create mode 100644 src/main/scala/sbt/wrap/Wrappers.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject2.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject3.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject4.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject5.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject6.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject7.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/project/build/src/Marker.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/actions/interactive/test
 create mode 100644 src/test/resources/sbt-test-resources/compiler-project/run-test/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/compiler-project/run-test/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/compiler-project/run-test/src/main/scala/Foo.scala
 create mode 100644 src/test/resources/sbt-test-resources/compiler-project/run-test/src/test/scala/FooTest.scala
 create mode 100644 src/test/resources/sbt-test-resources/compiler-project/run-test/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject2.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject3.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inherit-repo/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inline-default/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivy.xml
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivysettings.xml
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/ivysettings.xml
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/java.net/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/java.net/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/java.net/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/provided/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/provided/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/provided/test
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/url/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/url/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/dependency-management/url/test
 create mode 100644 src/test/resources/sbt-test-resources/java/analysis/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/java/analysis/src/main/java/test/R.java
 create mode 100644 src/test/resources/sbt-test-resources/java/analysis/test
 create mode 100644 src/test/resources/sbt-test-resources/java/basic/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/java/basic/src/main/java/test/R.java
 create mode 100644 src/test/resources/sbt-test-resources/java/basic/src/main/scala/S.scala
 create mode 100644 src/test/resources/sbt-test-resources/java/basic/test
 create mode 100644 src/test/resources/sbt-test-resources/java/options/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/java/options/project/build/src/JavaProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/java/options/src/main/java/test/R.java
 create mode 100644 src/test/resources/sbt-test-resources/java/options/src/main/scala/S.scala
 create mode 100644 src/test/resources/sbt-test-resources/java/options/test
 create mode 100755 src/test/resources/sbt-test-resources/package/lazy-name/project/build.properties
 create mode 100755 src/test/resources/sbt-test-resources/package/lazy-name/test
 create mode 100644 src/test/resources/sbt-test-resources/package/manifest/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/package/manifest/project/build/src/ManifestTestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/package/manifest/src/main/scala/jartest/Main.scala
 create mode 100644 src/test/resources/sbt-test-resources/package/manifest/test
 create mode 100644 src/test/resources/sbt-test-resources/package/resources/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/package/resources/project/build/src/ManifestTestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/package/resources/src/main/resources/main_resource_test
 create mode 100644 src/test/resources/sbt-test-resources/package/resources/src/main/scala/jartest/Main.scala
 create mode 100644 src/test/resources/sbt-test-resources/package/resources/test
 create mode 100644 src/test/resources/sbt-test-resources/project/Class.forName/changes/LibTestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/Class.forName/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/project/Class.forName/src/main/scala/Test.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/Class.forName/test
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/project/build/src/FlatProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/src/JavaA.java
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/src/ScalaA.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/src/a/JavaB.java
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/src/a/ScalaB.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/src/a/test-resource-a
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/src/test-resource
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/test
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/test-src/SimpleTest.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/test-src/c/ResourcesTest.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/test-src/c/test-resource-c
 create mode 100644 src/test/resources/sbt-test-resources/project/flatten/test-src/test-resource
 create mode 100644 src/test/resources/sbt-test-resources/project/lib/changes/LibTestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/lib/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/project/lib/src/main/scala/Test.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/lib/test
 create mode 100644 src/test/resources/sbt-test-resources/project/multi/changes/MultiProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/multi/changes/SingleAndTraitProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/multi/changes/SingleProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/multi/changes/SinglePublicProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/project/multi/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/project/multi/test
 create mode 100644 src/test/resources/sbt-test-resources/properties/multi-project-a/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/properties/multi-project-a/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/properties/multi-project-a/test
 create mode 100644 src/test/resources/sbt-test-resources/properties/multi-project-b/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/properties/multi-project-b/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/properties/multi-project-b/test
 create mode 100644 src/test/resources/sbt-test-resources/run/daemon-exit/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/run/daemon-exit/src/main/scala/Daemon.scala
 create mode 100644 src/test/resources/sbt-test-resources/run/daemon-exit/test
 create mode 100644 src/test/resources/sbt-test-resources/run/daemon/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/run/daemon/src/main/scala/Daemon.scala
 create mode 100644 src/test/resources/sbt-test-resources/run/daemon/test
 create mode 100644 src/test/resources/sbt-test-resources/run/spawn-exit/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/run/spawn-exit/src/main/scala/Spawn.scala
 create mode 100644 src/test/resources/sbt-test-resources/run/spawn-exit/test
 create mode 100644 src/test/resources/sbt-test-resources/run/spawn/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/run/spawn/src/main/scala/Spawn.scala
 create mode 100644 src/test/resources/sbt-test-resources/run/spawn/test
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A2.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/B.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/empty-a/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/empty-a/test
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/changes/A2.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/A.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/B.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/test
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/changes/1.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/test
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/A2.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B3.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B4.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B5.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/A.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/B.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/test
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/first.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/second.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/test
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-a/changes/A2.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-a/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/A.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/B.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/C.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-a/test
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-b/changes/A2.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-b/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/A.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/B.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/C.scala
 create mode 100644 src/test/resources/sbt-test-resources/source-dependencies/transitive-b/test
 create mode 100644 src/test/resources/sbt-test-resources/tests/Class.forName/ivy.xml
 create mode 100644 src/test/resources/sbt-test-resources/tests/Class.forName/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/tests/Class.forName/src/main/scala/Test.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/Class.forName/src/test/scala/Test.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/Class.forName/test
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/changes/ScalaCheck.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/changes/TestFailure.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/changes/TestProject2.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/changes/TestProject3.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/changes/TestSuccess.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/project/build/src/TestProject.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/extend/test
 create mode 100644 src/test/resources/sbt-test-resources/tests/resources/ivy.xml
 create mode 100644 src/test/resources/sbt-test-resources/tests/resources/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/tests/resources/src/main/resources/MainResource.txt
 create mode 100644 src/test/resources/sbt-test-resources/tests/resources/src/test/resources/TestResource.txt
 create mode 100644 src/test/resources/sbt-test-resources/tests/resources/src/test/scala/BasicTest.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/resources/test
 create mode 100755 src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/BasicTest.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/FailedTest.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build.properties
 create mode 100755 src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build/src/TestProject.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/scalacheck-a/src/test/scala/DummyTest.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/scalacheck-a/test
 create mode 100644 src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build.properties
 create mode 100644 src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build/Test.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
 create mode 100644 src/test/resources/sbt-test-resources/tests/scalatest-ignore/test
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-a/changes/BasicTest.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-a/changes/FailTest.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-a/project/build.properties
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-a/project/build/src/TestProject.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-a/src/test/scala/DummyTest.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-a/test
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-nested/project/build.properties
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-nested/project/build/src/TestProject.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-nested/src/test/scala/TestSpecification.scala
 create mode 100755 src/test/resources/sbt-test-resources/tests/specs-nested/test
 create mode 100644 src/test/scala/sbt/DagSpecification.scala
 create mode 100644 src/test/scala/sbt/EnvironmentSpecification.scala
 create mode 100644 src/test/scala/sbt/FileUtilitiesSpecification.scala
 create mode 100644 src/test/scala/sbt/NameFilterSpecification.scala
 create mode 100644 src/test/scala/sbt/PathSpecification.scala
 create mode 100644 src/test/scala/sbt/ProcessSpecification.scala
 create mode 100644 src/test/scala/sbt/ReflectSpecification.scala
 create mode 100644 src/test/scala/sbt/TestedProcess.scala
 create mode 100644 src/test/scala/sbt/VersionSpecification.scala
 create mode 100644 src/test/scala/sbt/wrap/MutableSetWrapper.scala

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..be586c877
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2008, 2009 Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000000000..a249cda2e
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,58 @@
+Simple Build Tool (sbt)
+Copyright 2008, 2009 Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
+
+
+Portions based on code by Pete Kirkham in Nailgun
+Copyright 2004, Martian Software, Inc
+Licensed under the Apache License, Version 2.0
+(see licenses/LICENSE_Apache)
+
+Portions based on code from the Scala compiler
+Copyright 2002-2008 EPFL, Lausanne
+Licensed under BSD-style license (see licenses/LICENSE_Scala)
+
+Portions based on code from specs
+Copyright (c) 2007-2008 Eric Torreborre
+Licensed under MIT license (see licenses/LICENSE_specs)
+
+The following test frameworks are distributed with sbt (in
+the subversion repository):
+ specs (see licenses/LICENSE_specs)
+ ScalaCheck (see licenses/LICENSE_ScalaCheck)
+ ScalaTest (see licenses/LICENSE_Apache)
+
+Jetty is distributed with sbt (in the subversion repository) and is
+licensed under the Apache License, Version 2.0 (see
+licenses/LICENSE_Apache).
+
+ScalaTest is distributed with sbt (in the subversion repository)
+and requires the following notice:
+
+ This product includes software developed by
+    Artima, Inc. (http://www.artima.com/).
+
+
+Apache Ivy, licensed under the Apache License, Version 2.0
+(see licenses/LICENSE_Apache) is distributed with sbt and
+requires the following notice:
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Ivy were originally developed by
+Jayasoft SARL (http://www.jayasoft.fr/)
+and are licensed to the Apache Software Foundation under the
+"Software Grant License Agreement"
+
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
\ No newline at end of file
diff --git a/boot/LICENSE b/boot/LICENSE
new file mode 100644
index 000000000..6e0b0067b
--- /dev/null
+++ b/boot/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2009 Mark Harrah
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
diff --git a/boot/NOTICE b/boot/NOTICE
new file mode 100644
index 000000000..b2378b336
--- /dev/null
+++ b/boot/NOTICE
@@ -0,0 +1,35 @@
+Simple Build Tool (sbt)
+Copyright 2009 Mark Harrah
+
+Parts of the Scala library are distributed with sbt:
+Copyright 2002-2008 EPFL, Lausanne
+Licensed under BSD-style license (see licenses/LICENSE_Scala)
+
+JLine is distributed with sbt:
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+Licensed under BSD-style license (see licenses/LICENSE_JLine)
+
+Apache Ivy, licensed under the Apache License, Version 2.0
+(see licenses/LICENSE_Apache) is distributed with sbt and
+requires the following notice:
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of Ivy were originally developed by
+Jayasoft SARL (http://www.jayasoft.fr/)
+and are licensed to the Apache Software Foundation under the
+"Software Grant License Agreement"
+
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
diff --git a/boot/lib/jline-0.9.94.jar b/boot/lib/jline-0.9.94.jar
new file mode 100644
index 0000000000000000000000000000000000000000..dede3721dee71225c942ebcfa4e38250e1e893c2
GIT binary patch
literal 87325
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
a1kFQkg0cdOEMRZ};T&L9pX~<BehdIIJx1>U

literal 0
HcmV?d00001

diff --git a/boot/licenses/LICENSE_Ivy b/boot/licenses/LICENSE_Ivy
new file mode 100644
index 000000000..a73dda8d7
--- /dev/null
+++ b/boot/licenses/LICENSE_Ivy
@@ -0,0 +1,258 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+------------------------------------------------------------------------------
+License for JCraft JSch package
+------------------------------------------------------------------------------
+Copyright (c) 2002,2003,2004,2005,2006,2007 Atsuhiko Yamanaka, JCraft,Inc. 
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+
+------------------------------------------------------------------------------
+License for jQuery
+------------------------------------------------------------------------------
+Copyright (c) 2007 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
\ No newline at end of file
diff --git a/boot/licenses/LICENSE_JLine b/boot/licenses/LICENSE_JLine
new file mode 100644
index 000000000..1cdc44c21
--- /dev/null
+++ b/boot/licenses/LICENSE_JLine
@@ -0,0 +1,33 @@
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/boot/licenses/LICENSE_Scala b/boot/licenses/LICENSE_Scala
new file mode 100644
index 000000000..968bcd6e9
--- /dev/null
+++ b/boot/licenses/LICENSE_Scala
@@ -0,0 +1,35 @@
+SCALA LICENSE
+
+Copyright (c) 2002-2008 EPFL, Lausanne, unless otherwise specified.
+All rights reserved.
+
+This software was developed by the Programming Methods Laboratory of the
+Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   3. Neither the name of the EPFL nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/boot/src/main/scala/Boot.scala b/boot/src/main/scala/Boot.scala
new file mode 100755
index 000000000..2a9eb9cb5
--- /dev/null
+++ b/boot/src/main/scala/Boot.scala
@@ -0,0 +1,310 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+ package sbt.boot
+
+// This is the main class for the sbt launcher.  Its purpose is to ensure the appropriate
+// versions of sbt and scala are downloaded to the projects 'project/boot' directory.
+// Then, the downloaded version of sbt is started as usual using the right version of
+// scala.
+
+// Artifact names must be consistent between the main sbt build and this build.
+
+import java.io.{File, FileFilter}
+import java.net.{MalformedURLException, URL, URLClassLoader}
+
+// contains constants and paths
+import BootConfiguration._
+import UpdateTarget.{UpdateScala, UpdateSbt}
+
+// The exception to use when an error occurs at the launcher level (and not a nested exception).
+// This indicates overrides toString because the exception class name is not needed to understand
+// the error message.
+private class BootException(override val toString: String) extends RuntimeException
+// The entry point to the launcher
+object Boot
+{
+	def main(args: Array[String])
+	{
+		System.setProperty("sbt.boot", true.toString)
+		checkProxy()
+		try { boot(args) }
+		catch
+		{
+			case b: BootException => errorAndExit(b)
+			case e =>
+				e.printStackTrace
+				errorAndExit(e)
+		}
+		System.exit(0)
+	}
+	private def errorAndExit(e: Throwable)
+	{
+		System.out.println("Error during sbt execution: " + e.toString)
+		System.exit(1)
+	}
+	def boot(args: Array[String])
+	{
+		 // prompt to create project if it doesn't exist.
+		 // will not return if user declines
+		(new Paths).checkProject()
+		val loaderCache = new LoaderCache
+		if(args.length == 0)
+			load(args, loaderCache) // interactive mode, which can only use one version of scala for a run
+		else
+			runBatch(args.toList, Nil, loaderCache)  // batch mode, which can reboot with a different scala version
+	}
+	private def runBatch(args: List[String], accumulateReversed: List[String], loaderCache: LoaderCache)
+	{
+		def doLoad() = if(!accumulateReversed.isEmpty) load(accumulateReversed.reverse.toArray, loaderCache)
+		args match
+		{
+			case Nil => doLoad()
+			case RebootCommand :: tail =>
+				doLoad()
+				runBatch(tail, Nil, loaderCache)
+			case action :: tail if action.trim.startsWith(CrossBuildPrefix) =>
+				doLoad()
+				load(Array(action), loaderCache) // call main with the single cross-build argument, preserving the '+' prefix, with which it knows what to do
+				runBatch(tail, Nil, loaderCache)
+			case notReload :: tail => runBatch(tail, notReload :: accumulateReversed, loaderCache)
+		}
+	}
+	/** Loads the project in the current working directory using the version of scala and sbt
+	* declared in the build. The class loader used prevents the Scala and Ivy classes used by
+	* this loader from being seen by the loaded sbt/project.*/
+	private def load(args: Array[String], loaderCache: LoaderCache)
+	{
+		val loader = (new Setup(loaderCache)).loader()
+		val sbtMain = Class.forName(SbtMainClass, true, loader)
+		val exitCode = run(sbtMain, args)
+		if(exitCode == NormalExitCode)
+			()
+		else if(exitCode == RebootExitCode)
+			load(args, loaderCache)
+		else
+			System.exit(exitCode)
+	}
+	private def run(sbtMain: Class[_], args: Array[String]): Int =
+	{
+		try {
+			// Versions newer than 0.3.8 enter through the run method, which does not call System.exit
+			val runMethod = sbtMain.getMethod(MainMethodName, classOf[Array[String]])
+			runMethod.invoke(null, Array(args) : _*).asInstanceOf[Int]
+		} catch {
+			case e: NoSuchMethodException => runOld(sbtMain, args)
+		}
+	}
+	/** The entry point for version 0.3.8 was the main method. */
+	private def runOld(sbtMain: Class[_], args: Array[String]): Int =
+	{
+		val runMethod = sbtMain.getMethod(OldMainMethodName, classOf[Array[String]])
+		runMethod.invoke(null, Array(args) : _*)
+		NormalExitCode
+	}
+	
+	private def checkProxy()
+	{
+		import ProxyProperties._
+		val httpProxy = System.getenv(HttpProxyEnv)
+		if(isDefined(httpProxy) && !isPropertyDefined(ProxyHost) && !isPropertyDefined(ProxyPort))
+		{
+			try
+			{
+				val proxy = new URL(httpProxy)
+				setProperty(ProxyHost, proxy.getHost)
+				val port = proxy.getPort
+				if(port >= 0)
+					System.setProperty(ProxyPort, port.toString)
+				copyEnv(HttpProxyUser, ProxyUser)
+				copyEnv(HttpProxyPassword, ProxyPassword)
+			}
+			catch
+			{
+				case e: MalformedURLException =>
+					System.out.println("Warning: could not parse http_proxy setting: " + e.toString)
+			}
+		}
+	}
+	private def copyEnv(envKey: String, sysKey: String) { setProperty(sysKey, System.getenv(envKey)) }
+	private def setProperty(key: String, value: String) { if(value != null) System.setProperty(key, value) }
+	private def isPropertyDefined(k: String) = isDefined(System.getProperty(k))
+	private def isDefined(s: String) = s != null && !s.isEmpty
+}
+
+private class Paths extends NotNull
+{
+	protected final val ProjectDirectory = new File(ProjectDirectoryName)
+	protected final val BootDirectory = new File(ProjectDirectory, BootDirectoryName)
+	protected final val PropertiesFile = new File(ProjectDirectory, BuildPropertiesName)
+	
+	final def checkProject()
+	{
+		if(!ProjectDirectory.exists)
+		{
+			val line = SimpleReader.readLine("Project does not exist, create new project? (y/N/s) : ")
+			if(Setup.isYes(line))
+				ProjectProperties(PropertiesFile, true)
+			else if(Setup.isScratch(line))
+				ProjectProperties.scratch(PropertiesFile)
+			else
+				System.exit(1)
+		}
+	}
+}
+/** A class to handle setting up the properties and classpath of the project
+* before it is loaded. */
+private class Setup(loaderCache: LoaderCache) extends Paths
+{
+	/** Checks that the requested version of sbt and scala have been downloaded.
+	* It performs a simple check that the appropriate directories exist.  It uses Ivy
+	* to resolve and retrieve any necessary libraries. The classpath to use is returned.*/
+	final def loader(): ClassLoader = loader(Nil)
+	private final def loader(forcePrompt: Seq[String]): ClassLoader =
+	{
+		val (normalScalaVersion, sbtVersion) = ProjectProperties.forcePrompt(PropertiesFile, forcePrompt : _*)
+		val scalaVersion = crossScalaVersion(normalScalaVersion)
+		loaderCache( scalaVersion, sbtVersion ) match
+		{
+			case Some(existingLoader) =>
+			{
+				setScalaVersion(scalaVersion)
+				existingLoader
+			}
+			case None =>
+			{
+				getLoader(scalaVersion, sbtVersion) match
+				{
+					case Left(retry) => loader(retry)
+					case Right(classLoader) => classLoader
+				}
+			}
+		}
+	}
+	private def crossScalaVersion(simpleScalaVersion: String): String =
+	{
+		val crossScalaVersion = System.getProperty(SbtScalaVersionKey)
+		if(crossScalaVersion == null || crossScalaVersion.isEmpty)
+			simpleScalaVersion
+		else
+			crossScalaVersion
+	}
+	private def getLoader(scalaVersion: String, sbtVersion: String): Either[Seq[String], ClassLoader] =
+	{
+		import Setup.{failIfMissing,isYes,needsUpdate}
+		import ProjectProperties.{ScalaVersionKey, SbtVersionKey}
+	
+		val baseDirectory = new File(BootDirectory, baseDirectoryName(scalaVersion))
+		System.setProperty(ScalaHomeProperty, baseDirectory.getAbsolutePath)
+		val scalaDirectory = new File(baseDirectory, ScalaDirectoryName)
+		val sbtDirectory = new File(baseDirectory, sbtDirectoryName(sbtVersion))
+		
+		val classLoader = createLoader(scalaDirectory, sbtDirectory)
+		val updateTargets = needsUpdate("", classLoader, TestLoadScalaClasses, UpdateScala) ::: needsUpdate(sbtVersion, classLoader, TestLoadSbtClasses, UpdateSbt)
+		if(updateTargets.isEmpty) // avoid loading Ivy related classes if there is nothing to update
+			success(classLoader, scalaVersion, sbtVersion)
+		else
+		{
+			Update(baseDirectory, sbtVersion, scalaVersion, updateTargets: _*)
+		
+			val classLoader = createLoader(scalaDirectory, sbtDirectory)
+			val sbtFailed = failIfMissing(classLoader, TestLoadSbtClasses, "sbt " + sbtVersion, SbtVersionKey)
+			val scalaFailed = failIfMissing(classLoader, TestLoadScalaClasses, "Scala " + scalaVersion, ScalaVersionKey)
+			
+			(scalaFailed +++ sbtFailed) match
+			{
+				case Success => success(classLoader, scalaVersion, sbtVersion)
+				case f: Failure =>
+					val noRetrieveMessage = "Could not retrieve " + f.label + "."
+					val getNewVersions = SimpleReader.readLine(noRetrieveMessage + " Select different version? (y/N) : ")
+					if(isYes(getNewVersions))
+						Left(f.keys)
+					else
+						throw new BootException(noRetrieveMessage)
+			}
+		}
+	}
+	private def success(classLoader: ClassLoader, scalaVersion: String, sbtVersion: String) =
+	{
+		setScalaVersion(scalaVersion)
+		loaderCache( scalaVersion, sbtVersion ) = classLoader
+		Right(classLoader)
+	}
+	private def createLoader(dirs: File*) =
+	{
+		val classpath = Setup.getJars(dirs : _*)
+		new URLClassLoader(classpath.toArray, new BootFilteredLoader)
+	}
+	private def setScalaVersion(scalaVersion: String) { System.setProperty(SbtScalaVersionKey, scalaVersion) }
+}
+private final class LoaderCache
+{
+	private[this] var cachedSbtVersion: Option[String] = None
+	private[this] val loaderMap = new scala.collection.mutable.HashMap[String, ClassLoader]
+	def apply(scalaVersion: String, sbtVersion: String): Option[ClassLoader] =
+	{
+		cachedSbtVersion flatMap { currentSbtVersion =>
+			if(sbtVersion == currentSbtVersion)
+				loaderMap.get(scalaVersion)
+			else
+				None
+		}
+	}
+	def update(scalaVersion: String, sbtVersion: String, loader: ClassLoader)
+	{
+		for(currentSbtVersion <- cachedSbtVersion)
+		{
+			if(sbtVersion != currentSbtVersion)
+				loaderMap.clear()
+		}
+		cachedSbtVersion = Some(sbtVersion)
+		loaderMap(scalaVersion) = loader
+	}
+}
+private object Setup
+{
+	private def failIfMissing(loader: ClassLoader, classes: Iterable[String], label: String, key: String) = checkTarget(loader, classes, Success, new Failure(label, List(key)))
+	private def needsUpdate(version: String, loader: ClassLoader, classes: Iterable[String], target: UpdateTarget.Value) =
+		if(version.endsWith("-SNAPSHOT"))
+			target :: Nil
+		else
+			checkTarget(loader, classes, Nil, target :: Nil)
+	private def checkTarget[T](loader: ClassLoader, classes: Iterable[String], ifSuccess: => T, ifFailure: => T): T =
+	{
+		try
+		{
+			for(c <- classes)
+				Class.forName(c, false, loader)
+			ifSuccess
+		}
+		catch { case e: ClassNotFoundException => ifFailure }
+	}
+	def isYes(so: Option[String]) = isValue("y", "yes")(so)
+	def isScratch(so: Option[String]) = isValue("s", "scratch")(so)
+	def isValue(values: String*)(so: Option[String]) =
+		so match
+		{
+			case Some(s) => values.contains(s.toLowerCase)
+			case None => false
+		}
+	private def getJars(directories: File*) = directories.flatMap(file => wrapNull(file.listFiles(JarFilter))).map(_.toURI.toURL)
+	private def wrapNull(a: Array[File]): Array[File] = if(a == null) Array() else a
+}
+
+
+private object JarFilter extends FileFilter
+{
+	def accept(file: File) = !file.isDirectory && file.getName.endsWith(".jar")
+}
+
+private sealed trait Checked extends NotNull { def +++(o: Checked): Checked }
+private final object Success extends Checked { def +++(o: Checked) = o }
+private final class Failure(val label: String, val keys: List[String]) extends Checked
+{
+	def +++(o: Checked) =
+		o match
+		{
+			case Success => this
+			case f: Failure => new Failure(label + " and " + f.label, keys ::: f.keys)
+		}
+}
\ No newline at end of file
diff --git a/boot/src/main/scala/BootConfiguration.scala b/boot/src/main/scala/BootConfiguration.scala
new file mode 100644
index 000000000..9fcf74802
--- /dev/null
+++ b/boot/src/main/scala/BootConfiguration.scala
@@ -0,0 +1,96 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+ package sbt.boot
+
+// project/boot/                [BootDirectoryName]
+//     scala-<version>/    [baseDirectoryName]
+//          lib/                      [ScalaDirectoryName]
+//          sbt-<version>/  [sbtDirectoryName]
+//
+// see also ProjectProperties for the set of constants that apply to the build.properties file in a project
+private object BootConfiguration
+{
+	val SbtMainClass = "sbt.Main"
+	val MainMethodName = "run"
+	val OldMainMethodName = "main"
+	
+	// these are the module identifiers to resolve/retrieve
+	val ScalaOrg = "org.scala-lang"
+	val SbtOrg = "sbt"
+	val CompilerModuleName = "scala-compiler"
+	val LibraryModuleName = "scala-library"
+	val SbtModuleName = "simple-build-tool"
+	
+	/** The Ivy conflict manager to use for updating.*/
+	val ConflictManagerName = "strict"
+	/** The name of the local Ivy repository, which is used when compiling sbt from source.*/
+	val LocalIvyName = "local"
+	/** The pattern used for the local Ivy repository, which is used when compiling sbt from source.*/
+	val LocalPattern = "[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
+	/** The artifact pattern used for the local Ivy repository.*/
+	def LocalArtifactPattern = LocalPattern
+	/** The Ivy pattern used for the local Ivy repository.*/
+	def LocalIvyPattern = LocalPattern
+		
+	/** The name of the property declaring the version of scala to use to build the project when not cross-building.*/
+	val ScalaVersion = "scala.version"
+	/** The name of the property declaring the version of sbt to use to build the project.*/
+	val SbtVersion = "sbt.version"
+	/** The name of the system property containing the version of scala actually used to build a project.
+	* This might be different from the ScalaVersion property when cross-building.*/
+	val SbtScalaVersionKey = "sbt.scala.version"
+	/** The class name prefix used to hide the Scala classes used by this loader from sbt
+	* and the project definition*/
+	val ScalaPackage = "scala."
+	/** The class name prefix used to hide the Ivy classes used by this loader from sbt
+	* and the project definition*/
+	val IvyPackage = "org.apache.ivy."
+	/** The loader will check that these classes can be loaded and will assume that their presence indicates
+	* sbt and its dependencies have been downloaded.*/
+	val TestLoadSbtClasses = "sbt.Main" :: "org.apache.ivy.Ivy" :: Nil
+	/** The loader will check that these classes can be loaded and will assume that their presence indicates
+	* the Scala compiler and library have been downloaded.*/
+	val TestLoadScalaClasses = "scala.ScalaObject" :: "scala.tools.nsc.GenericRunnerCommand" :: Nil
+	
+	val ProjectDirectoryName = "project"
+	val BootDirectoryName = "boot"
+	val BuildPropertiesName ="build.properties"
+	val ScalaHomeProperty = "scala.home"
+	val UpdateLogName = "update.log"
+	
+	val CrossBuildPrefix = "+"
+	val RebootCommand = "reboot"
+	val RebootExitCode = -1
+	val NormalExitCode = 0
+	val DefaultIvyConfiguration = "default"
+	
+	/** The base URL to use to resolve sbt for download. */
+	val sbtRootBase = "http://simple-build-tool.googlecode.com/svn/artifacts/"
+	/** The name of the directory within the boot directory to retrieve scala to. */
+	val ScalaDirectoryName = "lib"
+	/** The Ivy pattern to use for retrieving the scala compiler and library.  It is relative to the directory
+	* containing all jars for the requested version of scala. */
+	val scalaRetrievePattern = ScalaDirectoryName + "/[artifact].[ext]"
+	
+	/** The Ivy pattern to use for retrieving sbt and its dependencies.  It is relative to the directory
+	* containing all jars for the requested version of scala. */
+	def sbtRetrievePattern(sbtVersion: String) = sbtDirectoryName(sbtVersion) + "/[artifact]-[revision].[ext]"
+	/** The Ivy pattern to use for resolving sbt and its dependencies from the Google code project.*/
+	def sbtResolverPattern(scalaVersion: String) = sbtRootBase + "[revision]/[type]s/[artifact].[ext]"
+	/** The name of the directory to retrieve sbt and its dependencies to.*/
+	def sbtDirectoryName(sbtVersion: String) = SbtOrg + "-" + sbtVersion
+	/** The name of the directory in the boot directory to put all jars for the given version of scala in.*/
+	def baseDirectoryName(scalaVersion: String) = "scala-" + scalaVersion
+}
+private object ProxyProperties
+{
+	val HttpProxyEnv = "http_proxy"
+	val HttpProxyUser = "http_proxy_user"
+	val HttpProxyPassword = "http_proxy_pass"
+	
+	val ProxyHost = "http.proxyHost"
+	val ProxyPort = "http.proxyPort"
+	val ProxyUser = "http.proxyUser"
+	val ProxyPassword = "http.proxyPassword"
+}
\ No newline at end of file
diff --git a/boot/src/main/scala/FilteredLoader.scala b/boot/src/main/scala/FilteredLoader.scala
new file mode 100644
index 000000000..b0ee20873
--- /dev/null
+++ b/boot/src/main/scala/FilteredLoader.scala
@@ -0,0 +1,20 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.boot
+
+import BootConfiguration._
+
+/** A custom class loader to ensure the main part of sbt doesn't load any Scala or
+* Ivy classes from the jar containing the loader. */
+private[boot] final class BootFilteredLoader extends ClassLoader with NotNull
+{
+	@throws(classOf[ClassNotFoundException])
+	override final def loadClass(className: String, resolve: Boolean): Class[_] =
+	{
+		if(className.startsWith(ScalaPackage) || className.startsWith(IvyPackage))
+			throw new ClassNotFoundException(className)
+		else
+			super.loadClass(className, resolve)
+	}
+}
\ No newline at end of file
diff --git a/boot/src/main/scala/ProjectProperties.scala b/boot/src/main/scala/ProjectProperties.scala
new file mode 100644
index 000000000..d63da6c4b
--- /dev/null
+++ b/boot/src/main/scala/ProjectProperties.scala
@@ -0,0 +1,147 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.boot
+
+/*
+Project does not exist, create new project? [y/N] y
+Name: 
+Organization []:
+Version [1.0]: 
+Scala version [2.7.5]: 
+sbt version [0.5]: 
+*/
+import java.io.File
+/** Constants related to reading/writing the build.properties file in a project.
+* See BootConfiguration for general constants used by the loader. */
+private object ProjectProperties
+{
+	/** The properties key for storing the name of the project.*/
+	val NameKey = "project.name"
+	/** The properties key for storing the organization of the project.*/
+	val OrganizationKey = "project.organization"
+	/** The properties key for storing the version of the project.*/
+	val VersionKey = "project.version"
+	/** The properties key for storing the version of Scala used with the project.*/
+	val ScalaVersionKey = "scala.version"
+	/** The properties key for storing the version of sbt used to build the project.*/
+	val SbtVersionKey = "sbt.version"
+	/** The properties key to communicate to the main component of sbt that the project
+	* should be initialized after being loaded, typically by creating a default directory structure.*/
+	val InitializeProjectKey = "project.initialize"
+	/** The properties key that configures the project to be flattened a bit for use by quick throwaway projects.*/
+	val ScratchKey = "project.scratch"
+	
+	/** The label used when prompting for the name of the user's project.*/
+	val NameLabel = "Name"
+	/** The label used when prompting for the organization of the user's project.*/
+	val OrganizationLabel = "Organization"
+	/** The label used when prompting for the version of the user's project.*/
+	val VersionLabel = "Version"
+	/** The label used when prompting for the version of Scala to use for the user's project.*/
+	val ScalaVersionLabel = "Scala version"
+	/** The label used when prompting for the version of sbt to use for the user's project.*/
+	val SbtVersionLabel = "sbt version"
+	
+	/** The default organization of the new user project when the user doesn't explicitly specify one when prompted.*/
+	val DefaultOrganization = ""
+	/** The default version of the new user project when the user doesn't explicitly specify a version when prompted.*/
+	val DefaultVersion = "1.0"
+	/** The default version of sbt when the user doesn't explicitly specify a version when prompted.*/
+	val DefaultSbtVersion = "0.5"
+	/** The default version of Scala when the user doesn't explicitly specify a version when prompted.*/
+	val DefaultScalaVersion = "2.7.5"
+
+	// sets up the project properties for a throwaway project (flattens src and lib to the root project directory)
+	def scratch(file: File)
+	{
+		withProperties(file) { properties =>
+			for( (key, _, default, _) <- propertyDefinitions(false))
+				properties(key) = default.getOrElse("scratch")
+			properties(ScratchKey) = true.toString
+		}
+	}
+	// returns (scala version, sbt version)
+	def apply(file: File, setInitializeProject: Boolean): (String, String) = applyImpl(file, setInitializeProject, Nil)
+	def forcePrompt(file: File, propertyKeys: String*) = applyImpl(file, false, propertyKeys)
+	private def applyImpl(file: File, setInitializeProject: Boolean, propertyKeys: Iterable[String]): (String, String) =
+	{
+		val organizationOptional = file.exists
+		withProperties(file) { properties =>
+			properties -= propertyKeys
+			
+			prompt(properties, organizationOptional)
+			if(setInitializeProject)
+				properties(InitializeProjectKey) = true.toString
+		}
+	}
+	// (key, label, defaultValue, promptRequired)
+	private def propertyDefinitions(organizationOptional: Boolean) = 
+		(NameKey, NameLabel, None, true) :: 
+		(OrganizationKey, OrganizationLabel, Some(DefaultOrganization), !organizationOptional) ::
+		(VersionKey, VersionLabel, Some(DefaultVersion), true) ::
+		(ScalaVersionKey, ScalaVersionLabel, Some(DefaultScalaVersion), true) ::
+		(SbtVersionKey, SbtVersionLabel, Some(DefaultSbtVersion), true) ::
+		Nil
+	private def prompt(fill: ProjectProperties, organizationOptional: Boolean)
+	{
+		for( (key, label, default, promptRequired) <- propertyDefinitions(organizationOptional))
+		{
+			val value = fill(key)
+			if(value == null && promptRequired)
+				fill(key) = readLine(label, default)
+		}
+	}
+	private def withProperties(file: File)(f: ProjectProperties => Unit) =
+	{
+		val properties = new ProjectProperties(file)
+		f(properties)
+		properties.save
+		(properties(ScalaVersionKey), properties(SbtVersionKey))
+	}
+	private def readLine(label: String, default: Option[String]): String =
+	{
+		val prompt =
+			default match
+			{
+				case Some(d) => "%s [%s]: ".format(label, d)
+				case None => "%s: ".format(label)
+			}
+		SimpleReader.readLine(prompt) orElse default match
+		{
+			case Some(line) => line
+			case None => throw new BootException("Project not loaded: " + label + " not specified.")
+		}
+	}
+}
+
+import java.io.{FileInputStream, FileOutputStream}
+import java.util.Properties
+private class ProjectProperties(file: File) extends NotNull
+{
+	private[this] var modified = false
+	private[this] val properties = new Properties
+	if(file.exists)
+	{
+		val in = new FileInputStream(file)
+		try { properties.load(in) } finally { in.close() }
+	}
+	
+	def update(key: String, value: String)
+	{
+		modified = true
+		properties.setProperty(key, value)
+	}
+	def apply(key: String) = properties.getProperty(key)
+	def save()
+	{
+		if(modified)
+		{
+			file.getParentFile.mkdirs()
+			val out = new FileOutputStream(file)
+			try { properties.store(out, "Project Properties") } finally { out.close() }
+			modified = false
+		}
+	}
+	def -= (keys: Iterable[String]) {  for(key <- keys) properties.remove(key)  }
+}
\ No newline at end of file
diff --git a/boot/src/main/scala/SimpleReader.scala b/boot/src/main/scala/SimpleReader.scala
new file mode 100644
index 000000000..3e9359625
--- /dev/null
+++ b/boot/src/main/scala/SimpleReader.scala
@@ -0,0 +1,26 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.boot
+
+import jline.ConsoleReader
+object SimpleReader extends NotNull
+{
+	protected[this] val reader =
+	{
+		val cr = new ConsoleReader
+		cr.setBellEnabled(false)
+		cr
+	}
+	def readLine(prompt: String) =
+		reader.readLine(prompt) match
+		{
+			case null => None
+			case x =>
+				val trimmed = x.trim
+				if(trimmed.isEmpty)
+					None
+				else
+					Some(trimmed)
+		}
+}
\ No newline at end of file
diff --git a/boot/src/main/scala/Update.scala b/boot/src/main/scala/Update.scala
new file mode 100644
index 000000000..d5bfa8c0e
--- /dev/null
+++ b/boot/src/main/scala/Update.scala
@@ -0,0 +1,248 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.boot
+
+import java.io.{File, FileWriter, PrintWriter, Writer}
+
+import org.apache.ivy.{core, plugins, util}
+import core.LogOptions
+import core.cache.DefaultRepositoryCacheManager
+import core.event.EventManager
+import core.module.id.ModuleRevisionId
+import core.module.descriptor.{Configuration, DefaultDependencyDescriptor, DefaultModuleDescriptor, ModuleDescriptor}
+import core.report.ResolveReport
+import core.resolve.{ResolveEngine, ResolveOptions}
+import core.retrieve.{RetrieveEngine, RetrieveOptions}
+import core.sort.SortEngine
+import core.settings.IvySettings
+import plugins.resolver.{ChainResolver, FileSystemResolver, IBiblioResolver, URLResolver}
+import util.{DefaultMessageLogger, Message}
+
+import BootConfiguration._
+
+private[boot] object UpdateTarget extends Enumeration
+{
+	val UpdateScala, UpdateSbt = Value
+}
+import UpdateTarget.{UpdateSbt, UpdateScala}
+
+object Update
+{
+	/** Use Ivy to resolve and retrieve the specified 'targets' for the given versions.*/
+	def apply(bootDirectory: File, sbtVersion: String, scalaVersion: String, targets: UpdateTarget.Value*) =
+		synchronized // synchronized because Ivy is not thread-safe
+		{
+			val up = new Update(bootDirectory, sbtVersion, scalaVersion, targets : _*)
+			up.update()
+		}
+}
+/** Ensures that the Scala and sbt jars exist for the given versions or else downloads them.*/
+private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion: String, targets: UpdateTarget.Value*)
+{
+	private def logFile = new File(bootDirectory, UpdateLogName)
+	/** A Writer to use to write the full logging information to a file for debugging. **/
+	lazy val logWriter =
+	{
+		bootDirectory.mkdirs
+		new PrintWriter(new FileWriter(logFile))
+	}
+	
+	/** The main entry point of this class for use by the Update module.  It runs Ivy */
+	private def update()
+	{
+		Message.setDefaultLogger(new SbtIvyLogger(logWriter))
+		try { targets.foreach(update) } // runs update on each module separately
+		catch
+		{
+			case e: Exception =>
+				e.printStackTrace(logWriter)
+				log(e.toString)
+				println("  (see " + logFile + " for complete log)")
+		}
+		finally { logWriter.close() }
+	}
+	/** Runs update for the specified target (updates either the scala or sbt jars for building the project) */
+	private def update(target: UpdateTarget.Value)
+	{
+		import Configuration.Visibility.PUBLIC
+		// the actual module id here is not that important
+		val moduleID = new DefaultModuleDescriptor(createID(SbtOrg, "boot", "1.0"), "release", null, false)
+		moduleID.setLastModified(System.currentTimeMillis)
+		moduleID.addConfiguration(new Configuration(DefaultIvyConfiguration, PUBLIC, "", Array(), true, null))
+		// add dependencies based on which target needs updating
+		target match
+		{
+			case UpdateScala =>
+				addDependency(moduleID, ScalaOrg, CompilerModuleName, scalaVersion, "default")
+				addDependency(moduleID, ScalaOrg, LibraryModuleName, scalaVersion, "default")
+				update(moduleID, target, false)
+			case UpdateSbt =>
+				addDependency(moduleID, SbtOrg, SbtModuleName, sbtVersion, scalaVersion)
+				try { update(moduleID, target, false) }
+				catch
+				{
+					 // unfortunately, there is not a more specific exception thrown when a configuration does not exist,
+					 // so we always retry after cleaning the ivy file for this version of sbt on in case it is a newer version
+					 // of Scala than when this version of sbt was initially published
+					case e: RuntimeException =>
+						update(moduleID, target, true)
+				}
+		}
+	}
+	/** Runs the resolve and retrieve for the given moduleID, which has had its dependencies added already. */
+	private def update(moduleID: DefaultModuleDescriptor,  target: UpdateTarget.Value, cleanExisting: Boolean)
+	{
+		val eventManager = new EventManager
+		val settings = new IvySettings
+		addResolvers(settings, scalaVersion, target)
+		settings.setDefaultConflictManager(settings.getConflictManager(ConflictManagerName))
+		settings.setBaseDir(bootDirectory)
+		if(cleanExisting)
+		{
+			val sbtID = createID(SbtOrg, SbtModuleName, sbtVersion)
+			onDefaultRepositoryCacheManager(settings) { cache =>
+				val ivyFile = cache.getIvyFileInCache(sbtID)
+				ivyFile.delete()
+				val original = new File(ivyFile.getParentFile, ivyFile.getName + ".original")
+				original.delete()
+			}
+		}
+		resolve(settings, eventManager, moduleID)
+		retrieve(settings, eventManager, moduleID, target)
+	}
+	private def createID(organization: String, name: String, revision: String) =
+		ModuleRevisionId.newInstance(organization, name, revision)
+	/** Adds the given dependency to the default configuration of 'moduleID'. */
+	private def addDependency(moduleID: DefaultModuleDescriptor, organization: String, name: String, revision: String, conf: String)
+	{
+		val dep = new DefaultDependencyDescriptor(moduleID, createID(organization, name, revision), false, false, true)
+		dep.addDependencyConfiguration(DefaultIvyConfiguration, conf)
+		moduleID.addDependency(dep)
+	}
+	private def resolve(settings: IvySettings, eventManager: EventManager, module: ModuleDescriptor)
+	{
+		val resolveOptions = new ResolveOptions
+		  // this reduces the substantial logging done by Ivy, including the progress dots when downloading artifacts
+		resolveOptions.setLog(LogOptions.LOG_DOWNLOAD_ONLY)
+		val resolveEngine = new ResolveEngine(settings, eventManager, new SortEngine(settings))
+		val resolveReport = resolveEngine.resolve(module, resolveOptions)
+		if(resolveReport.hasError)
+		{
+			logExceptions(resolveReport)
+			println(Set(resolveReport.getAllProblemMessages.toArray: _*).mkString(System.getProperty("line.separator")))
+			throw new BootException("Error retrieving required libraries")
+		}
+	}
+	/** Exceptions are logged to the update log file. */
+	private def logExceptions(report: ResolveReport)
+	{
+		for(unresolved <- report.getUnresolvedDependencies)
+		{
+			val problem = unresolved.getProblem
+			if(problem != null)
+				problem.printStackTrace(logWriter)
+        }
+	}
+	/** Retrieves resolved dependencies using the given target to determine the location to retrieve to. */
+	private def retrieve(settings: IvySettings, eventManager: EventManager, module: ModuleDescriptor,  target: UpdateTarget.Value)
+	{
+		val retrieveOptions = new RetrieveOptions
+		val retrieveEngine = new RetrieveEngine(settings, eventManager)
+		val pattern =
+			target match
+			{
+				// see BuildConfiguration
+				case UpdateSbt => sbtRetrievePattern(sbtVersion)
+				case UpdateScala => scalaRetrievePattern
+			}
+		retrieveEngine.retrieve(module.getModuleRevisionId, pattern, retrieveOptions);
+	}
+	/** Add the scala tools repositories and a URL resolver to download sbt from the Google code project.*/
+	private def addResolvers(settings: IvySettings, scalaVersion: String,  target: UpdateTarget.Value)
+	{
+		val newDefault = new ChainResolver
+		newDefault.setName("redefined-public")
+		newDefault.add(localResolver(settings.getDefaultIvyUserDir.getAbsolutePath))
+		newDefault.add(mavenLocal)
+		target match
+		{
+			case UpdateSbt =>
+				newDefault.add(sbtResolver(scalaVersion))
+				newDefault.add(mavenMainResolver)
+			case UpdateScala =>
+				newDefault.add(mavenResolver("Scala-Tools Maven2 Repository", "http://scala-tools.org/repo-releases"))
+				newDefault.add(mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots"))
+		}
+		onDefaultRepositoryCacheManager(settings)(_.setUseOrigin(true))
+		settings.addResolver(newDefault)
+		settings.setDefaultResolver(newDefault.getName)
+	}
+	private def onDefaultRepositoryCacheManager(settings: IvySettings)(f: DefaultRepositoryCacheManager => Unit)
+	{
+		settings.getDefaultRepositoryCacheManager match
+		{
+			case manager: DefaultRepositoryCacheManager => f(manager)
+			case _ => ()
+		}
+	}
+	/** Uses the pattern defined in BuildConfiguration to download sbt from Google code.*/
+	private def sbtResolver(scalaVersion: String) =
+	{
+		val pattern = sbtResolverPattern(scalaVersion)
+		val resolver = new URLResolver
+		resolver.setName("Sbt Repository")
+		resolver.addIvyPattern(pattern)
+		resolver.addArtifactPattern(pattern)
+		resolver
+	}
+	private def mavenLocal = mavenResolver("Maven2 Local", "file://" + System.getProperty("user.home") + "/.m2/repository/")
+	/** Creates a maven-style resolver.*/
+	private def mavenResolver(name: String, root: String) =
+	{
+		val resolver = defaultMavenResolver(name)
+		resolver.setRoot(root)
+		resolver
+	}
+	/** Creates a resolver for Maven Central.*/
+	private def mavenMainResolver = defaultMavenResolver("Maven Central")
+	/** Creates a maven-style resolver with the default root.*/
+	private def defaultMavenResolver(name: String) =
+	{
+		val resolver = new IBiblioResolver
+		resolver.setName(name)
+		resolver.setM2compatible(true)
+		resolver
+	}
+	private def localResolver(ivyUserDirectory: String) =
+	{
+		val localIvyRoot = ivyUserDirectory + "/local"
+		val artifactPattern = localIvyRoot + "/" + LocalArtifactPattern
+		val ivyPattern = localIvyRoot + "/" + LocalIvyPattern
+		val resolver = new FileSystemResolver
+		resolver.setName(LocalIvyName)
+		resolver.addIvyPattern(ivyPattern)
+		resolver.addArtifactPattern(artifactPattern)
+		resolver
+	}
+	/** Logs the given message to a file and to the console. */
+	private def log(msg: String) =
+	{
+		try { logWriter.println(msg) }
+		catch { case e: Exception => System.err.println("Error writing to update log file: " + e.toString) }
+		println(msg)
+	}
+}
+/** A custom logger for Ivy to ignore the messages about not finding classes
+* intentionally filtered using proguard. */
+private final class SbtIvyLogger(logWriter: PrintWriter) extends DefaultMessageLogger(Message.MSG_INFO) with NotNull
+{
+	private val ignorePrefix = "impossible to define"
+	override def log(msg: String, level: Int)
+	{
+		logWriter.println(msg)
+		if(level <= getLevel && msg != null && !msg.startsWith(ignorePrefix))
+			System.out.println(msg)
+	}
+	override def rawlog(msg: String, level: Int) { log(msg, level) }
+}
\ No newline at end of file
diff --git a/install/extract/src/main/scala/Main.scala b/install/extract/src/main/scala/Main.scala
new file mode 100644
index 000000000..e8c701767
--- /dev/null
+++ b/install/extract/src/main/scala/Main.scala
@@ -0,0 +1,108 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.extract
+
+import java.io.{File, InputStream}
+import java.util.zip.{ZipEntry, ZipFile}
+
+object Main
+{
+	lazy val log: Logger = new ConsoleLogger
+	
+	def main(args: Array[String])
+	{
+		if(args.contains("debug"))
+			log.setLevel(Level.Debug)
+		val result = OpenResource.zipFile.ioOption(FileUtilities.classLocationFile[Install], "processing", log)(process)
+		for(msg <- result)
+		{
+			log.error(msg)
+			System.exit(1)
+		}
+	}
+	private[this] val packedGzip = ".pack.gz"
+	private def isArchive(name: String) = name.endsWith(".gz") || name.endsWith(".zip")
+	private def process(zip: ZipFile) =
+	{
+		val installEntry = zip.getEntry("install")
+		if(installEntry == null)
+			Some("Install commands not found.")
+		else
+		{
+			val jarAndZip = wrap.Wrappers.toList(zip.entries).filter(entry => isArchive(entry.getName)).partition(_.getName.endsWith(packedGzip))
+			jarAndZip match
+			{
+				case (Nil, _)=> Some("sbt loader not found.")
+				case (_, Nil) => Some("Project to extract and build not found.")
+				case (loaderEntry :: _, projectEntry :: _) => extractAndRun(zip, loaderEntry, projectEntry, installEntry)
+			}
+		}
+	}
+	private def extractAndRun(zip: ZipFile, loaderEntry: ZipEntry, projectEntry: ZipEntry, installEntry: ZipEntry) =
+	{
+		val zipResource = OpenResource.zipEntry(zip)
+		
+		import FileUtilities.{gunzip, readString, transfer, unzip, writeStream}
+		val directory = new File(".", trimExtension(projectEntry.getName, ".zip"))
+		assume(!directory.exists, "Could not extract project: directory " + projectEntry.getName + " exists.")
+		
+		val loaderBaseName = trimExtension(loaderEntry.getName, packedGzip)
+		val loaderFile = new File(directory, loaderBaseName + ".jar")
+		val tempLoaderFile = new File(directory, loaderBaseName + ".pack")
+		
+		def extractLoader() =
+		{
+			implicit def fileToPath(f: File) = Path.fromFile(f)
+			val result =
+				writeStream(tempLoaderFile, log) { out => zipResource.ioOption(loaderEntry, "reading", log)(gunzip(_, out, log)) } orElse
+				Pack.unpack(tempLoaderFile, loaderFile, log)
+			FileUtilities.clean(tempLoaderFile :: Nil, true, log)
+			result.toLeft(loaderFile)
+		}
+
+		Control.thread(zipResource.io(installEntry, "reading", log)(readString(_, log))) { installString =>
+			Control.thread(parseInstall(installString)) { install =>
+				zipResource.io(projectEntry, "reading", log)(unzip(_, Path.fromFile(directory), log)).left.toOption orElse
+				Control.thread(extractLoader()) { loaderFile =>
+					run(loaderFile, directory, install)
+				}
+			}
+		}
+	}
+	private def parseInstall(installString: String): Either[String, Install] =
+	{
+		installString.split(separator) match
+		{
+			case Array(allOptions, allActions) =>
+				val options = allOptions.split("""\n""").toList
+				val actions = allActions.split("""\n""").toList
+				Right( Install(options, actions) )
+			case _ => Left("Invalid install script (no separator found)")
+		}
+	}
+	private def filterEmpty(list: List[String]) = list.filter(!_.isEmpty)
+	private def run(loader: File, project: File, install: Install) =
+	{
+		val command = "java" :: "-cp" :: loader.getAbsolutePath :: filterEmpty(install.options) ::: "sbt.boot.Boot" :: filterEmpty(install.actions)
+		val builder = new java.lang.ProcessBuilder(command.toArray : _*)
+		builder.directory(project)
+		//import BasicIO.{processFully, transferFully}
+		//val standardIO = new ProcessIO(transferFully(System.in, _, 0), processFully(System.out.println), processFully(System.err.println))
+		val exitCode = ( Process(builder) ! )//( Process(builder) run standardIO).exitValue()
+		if(exitCode == 0)
+			None
+		else
+			Some("sbt exited with nonzero exit code: " + exitCode)
+	}
+	private def trimExtension(name: String, ext: String) =
+	{
+		if(name.endsWith(ext))
+			name.substring(0, name.length - ext.length)
+		else
+			name
+	}
+	// keep this in sync with sbt.extract.SelfExtractingProject
+	private def separator = "===================="
+}
+private final case class Install(options: List[String], actions: List[String]) extends NotNull
\ No newline at end of file
diff --git a/install/plugin/src/main/scala/SelfExtractingProject.scala b/install/plugin/src/main/scala/SelfExtractingProject.scala
new file mode 100644
index 000000000..516228676
--- /dev/null
+++ b/install/plugin/src/main/scala/SelfExtractingProject.scala
@@ -0,0 +1,79 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.extract
+
+import java.io.{ByteArrayOutputStream, File}
+import FileUtilities.{classLocationFile, clean, createTemporaryDirectory, download, transferAndClose, unzip, write, zip}
+import SelfExtractingProject.{flat, separator}
+
+trait SelfExtractingProject extends Project
+{
+	protected def createSelfExtractingJar(actions: List[String], jvmOptions: List[String], projectZip: Path, outputJar: Path): Option[String] =
+	{
+		def jarForClass(name: String) = Path.fromFile(classLocationFile(Class.forName(name)))
+		val loaderJar = jarForClass("sbt.boot.Boot")
+		val bytes = new ByteArrayOutputStream
+		transferAndClose(this.getClass.getResourceAsStream("extract.location"), bytes, log) orElse
+		{
+			val extractorJarLocation = bytes.toString("UTF-8")
+			createSelfExtractingJar(actions, jvmOptions, projectZip, loaderJar, extractorJarLocation, outputJar)
+		}
+	}
+	private def createSelfExtractingJar(actions: List[String], jvmOptions: List[String], projectZip: Path, loaderJar: Path, extractorJarLocation: String, outputJar: Path): Option[String] =
+	{
+		val installContents = jvmOptions.mkString("\n") + separator + actions.mkString("\n")
+		withTemporaryDirectory(log) { tmp =>
+			val tmpPath = Path.fromFile(tmp)
+			write(new File(tmp, "install"), installContents, log) orElse
+			unzip(this.getClass.getResource(extractorJarLocation), tmpPath, log).left.toOption orElse
+			Control.thread(compressLoader(loaderJar)) { compressedLoader =>
+				zip( (tmpPath ##) :: flat(projectZip) :: compressedLoader :: Nil, outputJar, true, log)
+			}
+		}
+	}
+	private def withTemporaryDirectory(log: Logger)(f: File => Option[String]) =
+	{
+		Control.thread(createTemporaryDirectory(log)) { dir =>
+			Control.trapUnitAndFinally("", log)
+				{ f(dir) }
+				{ clean(Path.fromFile(dir) :: Nil, true, log) }
+		}
+	}
+	private def compressLoader(loaderJar: Path): Either[String, Path] =
+	{
+		val jarName = loaderJar.asFile.getName
+		val dotIndex = jarName.lastIndexOf('.')
+		val baseName =
+			if(dotIndex > 0) jarName.substring(0, dotIndex)
+			else jarName
+		val packedName = baseName + ".pack"
+		val packed = outputPath / packedName
+		val packedAndGzip = (outputPath ##) / (packedName + ".gz")
+		val result =
+			Pack.pack(loaderJar, packed, log) orElse
+			FileUtilities.gzip(packed, packedAndGzip, log)
+		result.toLeft(packedAndGzip)
+	}
+}
+trait BasicSelfExtractingProject extends BasicScalaProject with SelfExtractingProject
+{
+	def installActions: List[String] = update.name :: `package`.name :: Nil
+	def jvmOptions: List[String] = Nil
+	def selfExtractingJar: Path = outputPath / (artifactBaseName + "-setup.jar")
+	
+	lazy val installer = installerAction
+	def installerAction = task { createSelfExtractingJar(installActions, jvmOptions, packageProjectZip, selfExtractingJar) } dependsOn packageProject
+}
+
+object SelfExtractingProject
+{
+	// keep this in sync with sbt.extract.Main.separator
+	def separator = "===================="
+	private def flat(p: Path) =
+		p match
+		{
+			case rp: RelativePath => (rp.parentPath ##) / rp.component
+			case _ => p
+		}
+}
\ No newline at end of file
diff --git a/install/project/build.properties b/install/project/build.properties
new file mode 100644
index 000000000..b2811cd24
--- /dev/null
+++ b/install/project/build.properties
@@ -0,0 +1,7 @@
+#Project properties
+#Thu Jun 25 14:31:30 EDT 2009
+project.organization=org.scala-tools.sbt
+project.name=extract
+sbt.version=0.4.7-p13
+project.version=0.1
+scala.version=2.7.5
diff --git a/install/project/build/InstallProject.scala b/install/project/build/InstallProject.scala
new file mode 100644
index 000000000..b31acfd53
--- /dev/null
+++ b/install/project/build/InstallProject.scala
@@ -0,0 +1,90 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+import sbt._
+
+import java.io.File
+import java.nio.charset.Charset
+
+class InstallerProject(info: ProjectInfo) extends ParentProject(info)
+{
+	lazy val installExtractor: InstallExtractProject = project("extract", "Installer Extractor", new InstallExtractProject(_, installPlugin))
+	lazy val installPlugin: InstallPluginProject = project("plugin", "Installer Plugin", new InstallPluginProject(_, installExtractor), installExtractor)
+}
+protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtractProject) extends PluginProject(info)
+{
+	private lazy val extractProject = extract
+	override def crossScalaVersions = Set("2.7.2", "2.7.3", "2.7.4", "2.7.5")
+	override def mainResources = super.mainResources +++ extractProject.outputJar +++ extractLocation
+	
+	def extractLocation = (outputPath ##) / "extract.location"
+	lazy val writeProperties = task { FileUtilities.write(extractLocation.asFile, extractProject.outputJar.relativePath, Charset.forName("UTF-8"), log) }
+	override def packageAction = super.packageAction dependsOn(extractProject.proguard, writeProperties)
+	
+	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
+	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
+}
+protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info)
+{
+	override def publishLocalAction = publishAction
+	override def publishAction = task {None}
+	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
+	private lazy val plugin = pluginProject
+	val mainClassName = "sbt.extract.Main"
+	val proguardConfigurationPath: Path = outputPath / "proguard.pro"
+	val toolsConfig = config("tools")
+	val defaultConfig = Configurations.Default
+	val proguardJar = "net.sf.proguard" % "proguard" % "4.3" % "tools->default"
+	def rootProjectDirectory = rootProject.info.projectPath
+	def outputJar = (plugin.outputPath ##) / defaultJarName
+	
+	/******** Proguard *******/
+	lazy val proguard = proguardTask dependsOn(`package`, writeProguardConfiguration)
+	lazy val writeProguardConfiguration = writeProguardConfigurationTask dependsOn `package`
+	
+	private def proguardTask =
+		task
+		{
+			FileUtilities.clean(outputJar :: Nil, log)
+			val proguardClasspathString = Path.makeString(managedClasspath(toolsConfig).get)
+			val configFile = proguardConfigurationPath.asFile.getAbsolutePath
+			val exitValue = Process("java", List("-Xmx256M", "-cp", proguardClasspathString, "proguard.ProGuard", "@" + configFile)) ! log
+			if(exitValue == 0) None else Some("Proguard failed with nonzero exit code (" + exitValue + ")")
+		}
+	private def writeProguardConfigurationTask =
+		task
+		{
+			// the template for the proguard configuration file
+			val outTemplate = """
+				|-dontoptimize
+				|-dontobfuscate
+				|-dontnote
+				|-dontwarn
+				|-libraryjars %s
+				|%s
+				|-outjars %s
+				|-ignorewarnings
+				|-keep public class %s {
+				|    public static void main(java.lang.String[]);
+				|}"""
+			
+			val defaultJar = jarPath.absolutePath
+			log.debug("proguard configuration using main jar " + defaultJar)
+			val externalDependencies = (mainCompileConditional.analysis.allExternals).map(_.getAbsoluteFile).filter(_.getName.endsWith(".jar"))
+			debugJars("external dependencies", externalDependencies)
+			// partition jars from the external jar dependencies of this project by whether they are located in the project directory
+			// if they are, they are specified with -injars, otherwise they are specified with -libraryjars
+			val (externalJars, libraryJars) = externalDependencies.toList.partition{jar => Path.relativize(rootProjectDirectory, jar).isDefined}
+			debugJars("library jars", libraryJars)
+			val sbtJarString = FileUtilities.sbtJar.getAbsolutePath + "(!META-INF/**,!licenses/**,LICENSE,NOTICE,!*.xml)"
+			val externalJarStrings = externalJars.map( _ + "(!META-INF/**,!*.properties)")
+			// exclude properties files and manifests from scala-library jar
+			val inJars = (defaultJar :: externalJarStrings).map("-injars " + _).mkString("\n")
+			
+			val proguardConfiguration = outTemplate.stripMargin.format(libraryJars.mkString(File.pathSeparator), inJars, outputJar.absolutePath, mainClassName)
+			log.debug("Proguard configuration written to " + proguardConfigurationPath)
+			FileUtilities.write(proguardConfigurationPath.asFile, proguardConfiguration, log)
+		}
+	private def debugJars[T](label: String, jars: Iterable[T]): Unit =
+		log.debug("proguard configuration " + label + ": \n\t" + jars.mkString("\n\t"))
+}
\ No newline at end of file
diff --git a/licenses/LICENSE_Apache b/licenses/LICENSE_Apache
new file mode 100644
index 000000000..d9a10c0d8
--- /dev/null
+++ b/licenses/LICENSE_Apache
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/licenses/LICENSE_Scala b/licenses/LICENSE_Scala
new file mode 100644
index 000000000..968bcd6e9
--- /dev/null
+++ b/licenses/LICENSE_Scala
@@ -0,0 +1,35 @@
+SCALA LICENSE
+
+Copyright (c) 2002-2008 EPFL, Lausanne, unless otherwise specified.
+All rights reserved.
+
+This software was developed by the Programming Methods Laboratory of the
+Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   3. Neither the name of the EPFL nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/licenses/LICENSE_ScalaCheck b/licenses/LICENSE_ScalaCheck
new file mode 100644
index 000000000..d8ad3a10d
--- /dev/null
+++ b/licenses/LICENSE_ScalaCheck
@@ -0,0 +1,32 @@
+ScalaCheck LICENSE
+
+Copyright (c) 2007, Rickard Nilsson
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   3. Neither the name of the author nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
\ No newline at end of file
diff --git a/licenses/LICENSE_sbt b/licenses/LICENSE_sbt
new file mode 100644
index 000000000..1b82fe7ca
--- /dev/null
+++ b/licenses/LICENSE_sbt
@@ -0,0 +1,25 @@
+Copyright (c) 2008 Mark Harrah, David MacIver
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
diff --git a/licenses/LICENSE_specs b/licenses/LICENSE_specs
new file mode 100644
index 000000000..81af36785
--- /dev/null
+++ b/licenses/LICENSE_specs
@@ -0,0 +1,23 @@
+Copyright (c) 2007-2008 Eric Torreborre
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+Neither the name of specs nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
new file mode 100644
index 000000000..3938597ef
--- /dev/null
+++ b/project/build.properties
@@ -0,0 +1,7 @@
+#Project properties
+#Thu Jun 25 20:59:30 EDT 2009
+project.organization=sbt
+project.name=Simple Build Tool Parent
+sbt.version=0.4.6
+project.version=0.5
+scala.version=2.7.2
diff --git a/project/build/src/CrossCompileProject.scala b/project/build/src/CrossCompileProject.scala
new file mode 100644
index 000000000..a302aa80a
--- /dev/null
+++ b/project/build/src/CrossCompileProject.scala
@@ -0,0 +1,207 @@
+import sbt._
+
+import java.io.File
+import scala.xml.NodeSeq
+
+/** Support for compiling sbt across multiple versions of Scala.  The scala compiler is run in a
+* separate JVM and no partial compilation is done.*/
+abstract class CrossCompileProject extends BasicScalaProject
+{
+	/** Used for 2.8.0-SNAPSHOT*/
+	val scalaToolsSnapshots = "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots"
+
+	/* The base configuration names for the versions of Scala*/
+	private val version2_7_2 = "2.7.2"
+	private val version2_7_3 = "2.7.3"
+	private val version2_7_4 = "2.7.4"
+	private val version2_7_5 = "2.7.5"
+	private val version2_8_0 = "2.8.0.r18093-b20090623200909"
+	private val base = "base"
+
+	/* The configurations for the versions of Scala.*/
+	private val conf_2_7_2 = config(version2_7_2)
+	private val conf_2_7_3 = config(version2_7_3)
+	private val conf_2_7_4 = config(version2_7_4)
+	private val conf_2_7_5 = config(version2_7_5)
+	private val conf_2_8_0 = config(version2_8_0)
+	private val conf_base = config(base)
+	// the list of all configurations cross-compile supports
+	private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_8_0 :: Nil
+	// the list of configurations to actually build against
+	private val buildConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil//allConfigurations not currently used because of issues with 2.8.0
+	// the configuration to use for normal development (when cross-building is not done)
+	private def developmentVersion = buildConfigurations.first
+	
+	/* Methods to derive the configuration name from the base name 'v'.*/
+	private def optional(v: Configuration) = config("optional-" + v.toString)
+	private def scalac(v: Configuration) = config("scalac-" + v.toString)
+	private def sbt(v: Configuration) = config("sbt_" + v.toString)
+	private def depConf(v: Configuration) = v.toString + "->default"
+	
+	// =========== Cross-compilation across scala versions ===========
+	
+	// The dependencies that should go in each configuration are:
+	//   base                             Required dependencies that are the same across all scala versions.
+	//   <version>                  Required dependencies to use with Scala <version>
+	//   optional-base              Optional dependencies that are the same for all scala versions
+	//   optional-<version>   Optional dependencies to use with Scala <version>
+	//   compile                        Used for normal development, it should extend a specific <version> and optional-<version>
+	//   scalac-<version>       The scala compiler for Scala <version>
+	// There should be a jar publication for each version of scala.  The artifact should be named sbt_<version>.
+	override def ivyXML =
+		(<configurations>
+			<conf name={conf_base.toString}/>
+			<conf name={optional(conf_base).toString}/>
+			{ variableConfigurations }
+			<!-- The configuration used for normal development (actions other than cross-*) -->
+			<conf name="default" extends={developmentVersion + "," + optional(developmentVersion).toString} visibility="private"/>
+		</configurations>
+		<publications>
+			{ publications }
+		</publications>
+		<dependencies>
+			<!-- Dependencies that are the same across all Scala versions -->
+			<dependency org="org.apache.ivy" name="ivy" rev="2.0.0" transitive="false" conf={depConf(conf_base)}/>
+			<dependency org="com.jcraft" name="jsch" rev="0.1.31" transitive="false" conf={depConf(conf_base)}/>
+			<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.14" transitive="true" conf={depConf(optional(conf_base))}/>
+
+			<!-- the dependencies that are different dependeding on the version of Scala -->
+			{ variableDependencies(conf_2_7_2, /*ScalaTest*/"0.9.3", /*Specs*/"1.4.0", false) }
+			{ variableDependencies(conf_2_7_3, /*ScalaTest*/"0.9.4", /*Specs*/"1.4.3", true) }
+			{ variableDependencies(conf_2_7_4, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
+			{ variableDependencies(conf_2_7_5, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
+			{ variableDependencies(conf_2_8_0, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
+		</dependencies>)
+
+	/** Creates a publication (an 'artifact' element) for each Scala version */
+	private def publications: NodeSeq =
+	{
+		for(conf <- buildConfigurations) yield
+			<artifact name={sbt(conf).toString} conf={conf.toString}/>
+	}
+	/** Creates the main, optional, and scalac configurations for each Scala version*/
+	private def variableConfigurations: NodeSeq =
+	{
+		buildConfigurations flatMap
+		{ conf =>
+			scalaComment(conf) ++
+			(<conf name={conf.toString} extends={conf_base.toString}/>
+			<conf name={optional(conf).toString} extends={optional(conf_base).toString}/>
+			<conf name={scalac(conf).toString} visibility="private"/>)
+		}
+	}
+	/** Defines the dependencies for the given version of Scala, ScalaTest, and Specs.  If uniformTestOrg is true,
+	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name. */
+	private def variableDependencies(scalaVersion: Configuration, scalaTestVersion: String, specsVersion: String, uniformTestOrg: Boolean) =
+	{
+		if(buildConfigurations.contains(scalaVersion))
+		{
+			scalaComment(scalaVersion) ++
+			{
+				if(scalaVersion eq conf_2_8_0)
+					Nil
+				else
+				{
+					testDependency("scalatest", scalaTestVersion, uniformTestOrg, scalaVersion) ++
+					testDependency("specs", specsVersion, uniformTestOrg, scalaVersion) ++
+					testDependency("scalacheck", "1.5", false, scalaVersion)
+				}
+			} ++
+			scalaDependency("scala-compiler", scalaVersion) ++ scalaDependency("scala-library", scalaVersion) ++
+			{
+				if(scalaVersion == conf_2_8_0)
+					<dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf={depConf(conf_2_8_0)}/>
+				else
+					NodeSeq.Empty
+			}
+		}
+		else
+			Nil
+	}
+	private def scalaDependency(name: String, scalaVersion: Configuration) =
+		<dependency org="org.scala-lang" name={name} rev={scalaVersion.toString} conf={depConf(scalac(scalaVersion))}/>
+	
+	/** Creates a comment containing the version of Scala*/
+	private def scalaComment(scalaVersion: Configuration) = scala.xml.Comment("Scala " + scalaVersion)
+	/** Creates a dependency element for a test.  See 'testOrg' for a description of uniformTestOrg.*/
+
+	private def testDependency(name: String, version: String, uniformTestOrg: Boolean, baseConf: Configuration) =
+		<dependency org={testOrg(name, uniformTestOrg)} name={name} rev={version} transitive="false" conf={depConf(optional(baseConf))}/>
+		
+	/** Returns the organization for the given test library.  If uniform is true,
+	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name.*/
+	private def testOrg(name: String, uniform: Boolean) =
+		if(uniform) "org.scala-tools.testing"
+		else "org." + name
+
+	/** Disable filtering Scala jars from dependency management, because we need them and are putting them
+	* in custom configurations and are using them in a separate process than sbt runs in.*/
+	override def filterScalaJars = false
+	
+	/** The lib directory is now only for building using the 'build' script.*/
+	override def unmanagedClasspath = path("ignore_lib_directory")
+	/** When cross-compiling, replace mainCompilePath with the classes directory for the version being compiled.*/
+	override def fullUnmanagedClasspath(config: Configuration) =
+		if( (Configurations.Default :: Configurations.defaultMavenConfigurations) contains config)
+			super.fullUnmanagedClasspath(config)
+		else
+			classesPath(config) +++ mainResourcesPath
+	
+	// include the optional-<version> dependencies as well as the ones common across all scala versions
+	def optionalClasspath(version: Configuration) = fullClasspath(optional(version)) +++ super.optionalClasspath
+	
+	private val CompilerMainClass = "scala.tools.nsc.Main"
+	// use a publish configuration that publishes the 'base' + all <version> configurations (base is required because
+	//   the <version> configurations extend it)
+	private val conf = new DefaultPublishConfiguration("local", "release")
+	{
+		override def configurations: Option[Iterable[Configuration]] = Some(config(base) :: buildConfigurations)
+	}
+	// the actions for cross-version packaging and publishing
+	lazy val crossPackage = buildConfigurations.map(packageForScala)
+	lazy val crossDeliverLocal = deliverTask(conf, updateOptions) dependsOn(crossPackage : _*)
+	lazy val crossPublishLocal = publishTask(conf, updateOptions) dependsOn(crossDeliverLocal)
+	// Creates a task that produces a packaged sbt compiled against Scala scalaVersion.
+	//  The jar is named 'sbt_<scala-version>-<sbt-version>.jar'
+	private def packageForScala(scalaVersion: Configuration) =
+	{
+		val classes = classesPath(scalaVersion) ** "*"
+		val jarName = crossJarName(scalaVersion)
+		val packageActionName = crossActionName("package", scalaVersion)
+		val compileAction = compileForScala(scalaVersion) named(crossActionName("compile", scalaVersion))
+		packageTask(classes +++ mainResources, outputPath, jarName, packageOptions) dependsOn(compileAction) named(packageActionName)
+	}
+	private def crossActionName(base: String, scalaVersion: Configuration) = base + " [ " + scalaVersion.toString + " ] "
+	private def crossJarName(scalaVersion: Configuration) = sbt(scalaVersion) + "-" + version.toString +  ".jar"
+	// This creates a task that compiles sbt against the given version of scala.  Classes are put in classes-<scalaVersion>.
+	private def compileForScala(version: Configuration)=
+		task
+		{
+			val classes = classesPath(version)
+			val toClean = (outputPath / crossJarName(version)) +++ (classes ** "*")
+			val setupResult =
+				FileUtilities.clean(toClean.get, true, log) orElse
+				FileUtilities.createDirectory(classes, log)
+			for(err <- setupResult) log.error(err)
+			// the classpath containing the scalac compiler
+			val compilerClasspath = concatPaths(fullClasspath(scalac(version)))
+			
+			// The libraries to compile sbt against
+			val classpath = fullClasspath(version) +++ optionalClasspath(version)
+			val sources: List[String] = pathListStrings(mainSources)
+			val compilerOptions = List("-cp", concatPaths(classpath), "-d", classes.toString)
+			val compilerArguments: List[String] = compilerOptions ::: sources
+			
+			// the compiler classpath has to be appended to the boot classpath to work properly
+			val allArguments = "-Xmx512M" :: ("-Xbootclasspath/a:" + compilerClasspath) :: CompilerMainClass :: compilerArguments
+			log.debug("Running external compiler with command: java " + allArguments.mkString(" "))
+			val exitValue = Process("java", allArguments) ! log
+			if(exitValue == 0)
+				None
+			else
+				Some("Nonzero exit value (" + exitValue + ") when calling scalac " + version + " with options: \n" + compilerOptions.mkString(" "))
+		}
+	private def concatPaths(p: PathFinder): String = Path.makeString(p.get)
+	private def pathListStrings(p: PathFinder): List[String] = p.get.map(_.absolutePath).toList
+	private def classesPath(scalaVersion: Configuration) = ("target"  / ("classes-" + scalaVersion.toString)) ##
+}
diff --git a/project/build/src/LoaderProject.scala b/project/build/src/LoaderProject.scala
new file mode 100644
index 000000000..927d60fe5
--- /dev/null
+++ b/project/build/src/LoaderProject.scala
@@ -0,0 +1,129 @@
+import sbt._
+
+import LoaderProject._
+import java.io.File
+
+// a project for the sbt launcher
+// the main content of this project definition is setting up and running proguard
+//   to combine and compact all dependencies into a single jar
+protected/* removes the ambiguity as to which project is the entry point by making this class non-public*/
+	class LoaderProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val mainClassName = "sbt.boot.Boot"
+	val baseName = "sbt-launcher"
+	val proguardConfigurationPath: Path = outputPath / "proguard.pro"
+	lazy val outputJar: Path = rootProject.outputPath / (baseName + "-" + version + ".jar")
+	def rootProjectDirectory = rootProject.info.projectPath
+	
+	override def mainClass = Some(mainClassName)
+	override def defaultJarBaseName = baseName + "-" + version.toString
+	
+	/******  Resources *****/
+	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
+	override def mainResources = super.mainResources +++ extraResources
+	
+	/****** Dependencies  *******/
+	val defaultConfig = config("default")
+	val toolsConfig = config("tools")
+	val ivy = "org.apache.ivy" % "ivy" % "2.0.0"
+	val proguardJar = "net.sf.proguard" % "proguard" % "4.3" % "tools->default"
+	
+	/******** Proguard *******/
+	lazy val proguard = proguardTask dependsOn(`package`, writeProguardConfiguration) describedAs(ProguardDescription)
+	lazy val writeProguardConfiguration = writeProguardConfigurationTask dependsOn `package` describedAs WriteProguardDescription
+	
+	private def proguardTask =
+		task
+		{
+			FileUtilities.clean(outputJar :: Nil, log)
+			val proguardClasspath = managedClasspath(toolsConfig)
+			val proguardClasspathString = Path.makeString(proguardClasspath.get)
+			val configFile = proguardConfigurationPath.asFile.getAbsolutePath
+			val exitValue = Process("java", List("-Xmx128M", "-cp", proguardClasspathString, "proguard.ProGuard", "@" + configFile)) ! log
+			if(exitValue == 0) None else Some("Proguard failed with nonzero exit code (" + exitValue + ")")
+		}
+	private def writeProguardConfigurationTask =
+		task
+		{
+			// these are classes that need to be explicitly kept because they are loaded reflectively
+			val ivyKeepResolvers =
+				"org.apache.ivy.plugins.resolver.URLResolver" ::
+				"org.apache.ivy.plugins.resolver.IBiblioResolver" ::
+				Nil
+			// the template for the proguard configuration file
+			val outTemplate = """
+				|-dontoptimize
+				|-dontobfuscate
+				|-dontnote
+				|-dontwarn
+				|-libraryjars %s
+				|-injars %s(!META-INF/**,!fr/**,!**/antlib.xml,!**/*.png)
+				|-injars %s(!META-INF/**)
+				|%s
+				|-outjars %s
+				|-ignorewarnings
+				|%s
+				|%s
+				|-keep public class %s {
+				|    public static void main(java.lang.String[]);
+				|}"""
+			
+			val defaultJar = (outputPath / defaultJarName).asFile.getAbsolutePath
+			log.debug("proguard configuration using main jar " + defaultJar)
+			val ivyKeepOptions = ivyKeepResolvers.map("-keep public class " + _  + allPublic).mkString("\n")
+			val runtimeClasspath = runClasspath.get.map(_.asFile).toList
+			val jlineJars = runtimeClasspath.filter(isJLineJar)
+			val externalDependencies = (mainCompileConditional.analysis.allExternals).map(_.getAbsoluteFile).filter(_.getName.endsWith(".jar"))
+			log.debug("proguard configuration external dependencies: \n\t" + externalDependencies.mkString("\n\t"))
+			// partition jars from the external jar dependencies of this project by whether they are located in the project directory
+			// if they are, they are specified with -injars, otherwise they are specified with -libraryjars
+			val (externalJars, libraryJars) = externalDependencies.toList.partition(jar => Path.relativize(rootProjectDirectory, jar).isDefined)
+			log.debug("proguard configuration library jars locations: " + libraryJars.mkString(", "))
+			// pull out Ivy in order to exclude resources inside
+			val (ivyJars, externalJarsNoIvy) = externalJars.partition(_.getName.startsWith("ivy"))
+			log.debug("proguard configuration ivy jar location: " + ivyJars.mkString(", "))
+			// the loader uses JLine, so there is a dependency on the compiler (because JLine is distributed with the compiler,
+			//   it finds the JLine classes from the compiler jar instead of the jline jar on the classpath), but we don't want to
+			//    include the version of JLine from the compiler.
+			val includeExternalJars = externalJarsNoIvy.filter(jar => !isJarX(jar, "scala-compiler"))
+			// exclude properties files and manifests from scala-library jar
+			val inJars = (defaultJar :: includeExternalJars.map( _ + "(!META-INF/**,!*.properties)")).map("-injars " + _).mkString("\n")
+			
+			withJar(ivyJars, "Ivy") { ivyJar =>
+				withJar(jlineJars, "JLine") { jlineJar =>
+					val proguardConfiguration =
+						outTemplate.stripMargin.format(libraryJars.mkString(File.pathSeparator),
+							ivyJar.getAbsolutePath, jlineJar.getAbsolutePath,
+							inJars, outputJar.absolutePath, ivyKeepOptions, keepJLine, mainClassName)
+					log.debug("Proguard configuration written to " + proguardConfigurationPath)
+					FileUtilities.write(proguardConfigurationPath.asFile, proguardConfiguration, log)
+				}
+			}
+		}
+	private def withJar(files: List[File], name: String)(f: File => Option[String]): Option[String] =
+		files match
+		{
+			case Nil => Some(name + " not present (try running update)")
+			case jar :: _ => f(jar)
+		}
+	private def isJLineJar(file: File) = isJarX(file, "jline")
+	private def isJarX(file: File, x: String) =
+	{
+		val name = file.getName
+		name.startsWith(x) && name.endsWith(".jar")
+	}
+	// class body declaration for proguard that keeps all public members
+	private val allPublic = " {\n public * ;\n}"
+	
+	private val keepJLine =
+	"""
+	|-keep public class jline.** {
+	|    public protected *;
+	|}
+	""".stripMargin
+}
+object LoaderProject
+{
+	val ProguardDescription = "Produces the final compacted jar that contains only the minimum classes needed using proguard."
+	val WriteProguardDescription = "Creates the configuration file to use with proguard."
+}
\ No newline at end of file
diff --git a/project/build/src/SbtProject.scala b/project/build/src/SbtProject.scala
new file mode 100644
index 000000000..f7b815f12
--- /dev/null
+++ b/project/build/src/SbtProject.scala
@@ -0,0 +1,74 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+import sbt._
+
+import java.io.File
+
+class SbtProject(info: ProjectInfo) extends ParentProject(info)
+{
+	// Launcher sub project.
+	lazy val boot = project("boot", "Simple Build Tool Loader", new LoaderProject(_))
+	// Main builder sub project
+	lazy val main = project(info.projectPath, "Simple Build Tool", new MainProject(_))
+	// One-shot build for users building from trunk
+	lazy val fullBuild = task { None } dependsOn(boot.proguard, main.crossPublishLocal) describedAs
+		"Builds the loader and builds main sbt against all supported versions of Scala and installs to the local repository."
+		
+	override def shouldCheckOutputDirectories = false
+	override def baseUpdateOptions = QuietUpdate :: Nil
+	
+	override def parallelExecution = true
+	override def deliverLocalAction = noAction
+	private def noAction = task { None }
+	override def publishLocalAction = noAction
+}
+
+protected class MainProject(val info: ProjectInfo) extends CrossCompileProject
+{
+	override def mainScalaSources =
+		if(Project.currentScalaVersion.map(_.startsWith("2.8")).getOrElse(false)) // cannot compile against test libraries currently
+			Path.lazyPathFinder { super.mainScalaSources.get.filter(_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
+		else
+			super.mainScalaSources
+	override def defaultJarBaseName = "sbt_" + version.toString
+	/** Additional resources to include in the produced jar.*/
+	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
+	override def mainResources = super.mainResources +++ extraResources
+	override def mainClass = Some("sbt.Main")
+	override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: "sbt.ProcessSpecification" :: Nil) :: super.testOptions.toList
+	
+	// ======== Scripted testing ==========
+	
+	def sbtTestResources = testResourcesPath / "sbt-test-resources"
+	
+	lazy val testNoScripted = super.testAction
+	override def testAction = testNoScripted dependsOn(scripted)
+	lazy val scripted = scriptedTask dependsOn(testCompile, `package`)
+	def scriptedTask =
+		task
+		{
+			log.info("Running scripted tests...")
+			log.info("")
+			// load ScriptedTests using a ClassLoader that loads from the project classpath so that the version
+			// of sbt being built is tested, not the one doing the building.
+			val loader = ScriptedLoader(scriptedClasspath.toArray)
+			val scriptedClass = Class.forName(ScriptedClassName, true, loader)
+			val scriptedConstructor = scriptedClass.getConstructor(classOf[File], classOf[Function2[String, String, Boolean]])
+			val runner = scriptedConstructor.newInstance(sbtTestResources.asFile, filter)
+			runner.asInstanceOf[{def scriptedTests(log: Logger): Option[String]}].scriptedTests(log)
+		}
+	/** The classpath to use for scripted tests.   This ensures that the version of sbt being built it the one used for testing.*/
+	private def scriptedClasspath =
+	{
+		val buildClasspath = classOf[SbtProject]. getProtectionDomain.getCodeSource.getLocation.toURI.toURL
+		val scalacJar = FileUtilities.scalaCompilerJar.toURI.toURL
+		val ivy = runClasspath.get.filter(_.asFile.getName.startsWith("ivy-")).map(_.asURL).toList
+		val builtSbtJar = (outputPath / defaultJarName).asURL
+		builtSbtJar :: buildClasspath :: scalacJar :: ivy
+	}
+		
+	val ScriptedClassName = "scripted.ScriptedTests"
+	
+	val filter = (group: String, name: String) => true
+}
\ No newline at end of file
diff --git a/project/build/src/ScriptedLoader.scala b/project/build/src/ScriptedLoader.scala
new file mode 100644
index 000000000..cf73edb6c
--- /dev/null
+++ b/project/build/src/ScriptedLoader.scala
@@ -0,0 +1,31 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+import sbt._
+
+import java.net.URL
+
+package sbt { // need access to LoaderBase, which is private in package sbt
+	object ScriptedLoader
+	{
+		def apply(paths: Array[URL]): ClassLoader = new ScriptedLoader(paths)
+	}
+	private class ScriptedLoader(paths: Array[URL]) extends LoaderBase(paths, classOf[ScriptedLoader].getClassLoader)
+	{
+		private val delegateFor = List("sbt.Logger", "sbt.LogEvent", "sbt.SetLevel", "sbt.Success", "sbt.Log", "sbt.SetTrace", "sbt.Trace", "sbt.ControlEvent")
+		def doLoadClass(className: String): Class[_] =
+		{
+			// Logger needs to be loaded from the version of sbt building the project because we need to pass
+			// a Logger from that loader into ScriptedTests.
+			// All other sbt classes should be loaded from the project classpath so that we test those classes with 'scripted'
+			if(!shouldDelegate(className) && (className.startsWith("sbt.") || className.startsWith("scripted.") || className.startsWith("scala.tools.")))
+				findClass(className)
+			else
+				selfLoadClass(className)
+		}
+	
+		private def shouldDelegate(className: String) = delegateFor.exists(check => isNestedOrSelf(className, check))
+		private def isNestedOrSelf(className: String, checkAgainst: String) =
+			className == checkAgainst || className.startsWith(checkAgainst + "$")
+		}
+}
\ No newline at end of file
diff --git a/project/build/src/ScriptedTests.scala b/project/build/src/ScriptedTests.scala
new file mode 100644
index 000000000..3d4650990
--- /dev/null
+++ b/project/build/src/ScriptedTests.scala
@@ -0,0 +1,70 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+
+package scripted
+
+import sbt._
+import java.io.File
+
+trait ScriptedTestFilter extends NotNull
+{
+	def accept(group: String, name: String): Boolean
+}
+class BasicFilter(f: (String, String) => Boolean) extends ScriptedTestFilter
+{
+	def accept(group: String, name: String) = f(group, name)
+}
+
+object AcceptAllFilter extends ScriptedTestFilter
+{
+	def accept(group: String, name: String): Boolean = true
+}
+class ScriptedTests(testResources: Resources, filter: ScriptedTestFilter) extends NotNull
+{
+	def this(resourceBaseDirectory: File, filter: (String, String) => Boolean) = this(new Resources(resourceBaseDirectory), new BasicFilter(filter))
+	def this(resourceBaseDirectory: File, filter: ScriptedTestFilter) = this(new Resources(resourceBaseDirectory), filter)
+	def this(testResources: Resources) = this(testResources, AcceptAllFilter)
+	def this(resourceBaseDirectory: File) = this(new Resources(resourceBaseDirectory))
+	
+	val ScriptFilename = "test"
+	import testResources._
+	
+	private def includeDirectory(file: File) = file.getName != ".svn"
+	def scriptedTests(log: Logger): Option[String] =
+	{
+		System.setProperty("sbt.scala.version", "")
+		var success = true
+		for(group <- baseDirectory.listFiles(DirectoryFilter) if includeDirectory(group))
+		{
+			log.info("Test group " + group.getName)
+			for(test <- group.listFiles(DirectoryFilter) if includeDirectory(test))
+			{
+				val testName = test.getName
+				if(!filter.accept(group.getName, testName))
+					log.warn(" Test " + testName + " skipped.")
+				else
+					scriptedTest(test, log) match
+					{
+						case Some(err) =>
+							log.error(" Test " + testName + " failed: " + err)
+							success = false
+						case None => log.info(" Test " + testName + " succeeded.")
+					}
+			}
+		}
+		if(success)
+			None
+		else
+			Some("One or more tests failed.")
+	}
+	
+	def scriptedTest(group: String, name: String, log: Logger): Option[String] =
+		readOnlyResourceDirectory(group, name).fold(err => Some(err), testDirectory => scriptedTest(testDirectory, log))
+	def scriptedTest(testDirectory: File, log: Logger): Option[String] =
+	{
+		(for(script <- (new TestScriptParser(testDirectory, log)).parse(new File(testDirectory, ScriptFilename)).right;
+			u <- withProject(testDirectory, log)(script).right )
+		yield u).left.toOption
+	}
+}
diff --git a/project/build/src/TestScriptParser.scala b/project/build/src/TestScriptParser.scala
new file mode 100644
index 000000000..bab2fc1fc
--- /dev/null
+++ b/project/build/src/TestScriptParser.scala
@@ -0,0 +1,269 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+
+package scripted
+
+import sbt._
+import java.io.{BufferedReader, File, InputStreamReader}
+
+/*
+statement*
+statement ::= ('$' | '>') word+ '[' word ']'
+word ::= [^ \[\]]+
+comment ::= '#' [^ \n\r]* ('\n' | '\r' | eof)
+*/
+import scala.util.parsing.combinator._
+import scala.util.parsing.input.Positional
+
+import TestScriptParser._
+private class TestScriptParser(baseDirectory: File, log: Logger) extends RegexParsers with NotNull
+{
+	type Statement = Project => Either[String, ReloadProject]
+	type PStatement = Statement with Positional
+	
+	private def evaluateList(list: List[PStatement])(p: Project): WithProjectResult[Unit] =
+		list match
+		{
+			case Nil => ValueResult(())
+			case head :: tail =>
+				head(p) match
+				{
+					case Left(msg) => new ErrorResult(msg)
+					case Right(reload) => ContinueResult(p =>evaluateList(tail)(p), reload)
+				}
+		}
+
+	def script: Parser[Project => WithProjectResult[Unit]] = rep1(space ~> statement  <~ space) ^^ evaluateList
+	def statement: Parser[PStatement] =
+		positioned
+		{
+			(StartRegex ~! rep1(word) ~! "[" ~! word ~! "]") ^^
+			{
+				case start ~ command ~ open ~ result ~ close =>
+					val successExpected = result.toLowerCase == SuccessLiteral.toLowerCase
+					new Statement with Positional
+					{ selfPositional =>
+						def apply(p: Project) =
+						{
+							val result =
+								try
+								{
+									start match
+									{
+										case CommandStart => evaluateCommand(command, successExpected, selfPositional)(p)
+										case ActionStart => evaluateAction(command, successExpected)(p).toLeft(NoReload)
+									}
+								}
+								catch
+								{
+									case e: Exception =>
+										log.trace(e)
+										Left(e.toString)
+								}
+							result.left.map(message => linePrefix(this) + message)
+						}
+					}
+			}
+		}
+	private def linePrefix(p: Positional) = "{line " + p.pos.line + "} "
+	def space = """(\s+|(\#[^\n\r]*))*""".r
+	def word: Parser[String] =  ("\'" ~> "[^'\n\r]*".r <~ "\'")  |  ("\"" ~> "[^\"\n\r]*".r <~ "\"")  |  WordRegex
+	def parse(scriptFile: File): Either[String, Project => WithProjectResult[Unit]] =
+	{
+		def parseReader(reader: java.io.Reader) =
+			parseAll(script, reader) match
+			{
+				case Success(result, next) => Right(result)
+				case err: NoSuccess =>
+				{
+					val pos = err.next.pos
+					Left("Could not parse test script '" + scriptFile.getCanonicalPath + 
+					"' (" + pos.line + "," + pos.column + "): " + err.msg)
+				}
+			}
+		FileUtilities.readValue(scriptFile, log)(parseReader)
+	}
+	
+	private def scriptError(message: String): Some[String] = Some("Test script error: " + message)
+	private def wrongArguments(commandName: String, args: List[String]): Some[String] =
+		scriptError("Command '" + commandName + "' does not accept arguments (found '" + spacedString(args) + "').")
+	private def wrongArguments(commandName: String, requiredArgs: String, args: List[String]): Some[String] = 
+		scriptError("Wrong number of arguments to " + commandName + " command.  " + requiredArgs + " required, found: '" + spacedString(args) + "'.")
+	private def evaluateCommand(command: List[String], successExpected: Boolean, position: Positional)(project: Project): Either[String, ReloadProject] =
+	{
+		command match
+		{
+			case "reload" :: Nil => Right(if(successExpected) new ReloadSuccessExpected(linePrefix(position)) else ReloadErrorExpected)
+			case x => evaluateCommandNoReload(x, successExpected)(project).toLeft(NoReload)
+		}
+	}
+	private def evaluateCommandNoReload(command: List[String], successExpected: Boolean)(project: Project): Option[String] =
+	{
+		evaluate(successExpected, "Command '" + command.firstOption.getOrElse("") + "'", project)
+		{
+			command match
+			{
+				case Nil => scriptError("No command specified.")
+				case "touch" :: paths => touch(paths, project)
+				case "delete" :: paths => delete(paths, project)
+				case "mkdir" :: paths => makeDirectories(paths, project)
+				case "copy-file" :: from :: to :: Nil => copyFile(from, to, project)
+				case "copy-file" :: args => wrongArguments("copy-file", "Two paths", args)
+				case "sync" :: from :: to :: Nil => sync(from, to, project)
+				case "sync" :: args => wrongArguments("sync", "Two directory paths", args)
+				case "copy" :: paths => copy(paths, project)
+				case "exists" :: paths => exists(paths, project)
+				case "absent" :: paths => absent(paths, project)
+				case "pause" :: Nil => readLine("Press enter to continue. "); println(); None
+				case "pause" :: args => wrongArguments("pause", args)
+				case "newer" :: a :: b :: Nil => newer(a, b, project)
+				case "newer" :: args => wrongArguments("newer", "Two paths", args)
+				case "sleep" :: time :: Nil => trap("Error while sleeping:") { Thread.sleep(time.toLong) }
+				case "sleep" :: args => wrongArguments("sleep", "Time in milliseconds", args)
+				case "exec" :: command :: args => execute(command, args, project)
+				case "exec" :: other => wrongArguments("exec", "Command and arguments", other)
+				case "reload" :: args => wrongArguments("reload", args)
+				case unknown :: arguments => scriptError("Unknown command " + unknown)
+			}
+		}
+	}
+	private def foreachBufferedLogger(project: Project)(f: BufferedLogger => Unit)
+	{
+		project.topologicalSort.foreach(p => p.log match { case buffered: BufferedLogger => f(buffered); case _ => () })
+	}
+	private def evaluate(successExpected: Boolean, label: String, project: Project)(body: => Option[String]): Option[String] =
+	{
+		def startRecordingLog() { foreachBufferedLogger(project)(_.startRecording()) }
+		def playLog() { foreachBufferedLogger(project)(_.playAll()) }
+		def stopLog() { foreachBufferedLogger(project)(_.stop()) }
+		
+		startRecordingLog()
+		val result =
+			body match
+			{
+				case None =>
+					if(successExpected) None
+					else
+					{
+						playLog()
+						Some(label + " succeeded (expected failure).")
+					}
+				case Some(failure) =>
+					if(successExpected)
+					{
+						playLog()
+						Some(label + " failed (expected success): " + failure)
+					}
+					else None
+			}
+		stopLog()
+		result
+	}
+	private def evaluateAction(action: List[String], successExpected: Boolean)(project: Project): Option[String] =
+	{
+		def actionToString = action.mkString(" ")
+		action match
+		{
+			case Nil => scriptError("No action specified.")
+			case head :: Nil if project.taskNames.toSeq.contains(head)=>
+					evaluate(successExpected, "Action '" + actionToString + "'", project)(project.act(head))
+			case head :: tail =>
+				evaluate(successExpected, "Method '" + actionToString + "'", project)(project.call(head, tail.toArray))
+		}
+	}
+	private def spacedString[T](l: Seq[T]) = l.mkString(" ")
+	private def wrap(result: Option[String]) = result.flatMap(scriptError)
+	private def trap(errorPrefix: String)(action: => Unit) = wrap( Control.trapUnit(errorPrefix, log) { action; None } )
+	
+	private def fromStrings(paths: List[String], project: Project) = paths.map(path => fromString(path, project))
+	private def fromString(path: String, project: Project) = Path.fromString(project.info.projectPath, path)
+	private def touch(paths: List[String], project: Project) =
+		if(paths.isEmpty)
+			scriptError("No paths specified for touch command.")
+		else
+			wrap(lazyFold(paths) { path => FileUtilities.touch(fromString(path, project), log) })
+		
+	private def delete(paths: List[String], project: Project) =
+		if(paths.isEmpty)
+			scriptError("No paths specified for delete command.")
+		else
+			wrap(FileUtilities.clean(fromStrings(paths, project), true, log))
+	private def sync(from: String, to: String, project: Project) =
+		wrap(FileUtilities.sync(fromString(from, project), fromString(to, project), log))
+	private def copyFile(from: String, to: String, project: Project) =
+		wrap(FileUtilities.copyFile(fromString(from, project), fromString(to, project), log))
+	private def copy(paths: List[String], project: Project) =
+		paths match
+		{
+			case Nil => scriptError("No paths specified for copy command.")
+			case path :: Nil => scriptError("No destination specified for copy command.")
+			case _ =>
+				val mapped = fromStrings(paths, project).toArray
+				val last = mapped.length - 1
+				wrap(FileUtilities.copy(mapped.take(last), mapped(last), log).left.toOption)
+		}
+	private def makeDirectories(paths: List[String], project: Project) =
+		fromStrings(paths, project) match
+		{
+			case Nil => scriptError("No paths specified for mkdir command.")
+			case p => FileUtilities.createDirectories(p, project.log)
+		}
+	private def newer(a: String, b: String, project: Project) =
+		trap("Error testing if '" + a + "' is newer than '" + b + "'")
+		{
+			val pathA = fromString(a, project)
+			val pathB = fromString(b, project)
+			pathA.exists && (!pathB.exists || pathA.lastModified > pathB.lastModified)
+		}
+	private def exists(paths: List[String], project: Project) =
+		fromStrings(paths, project).filter(!_.exists) match
+		{
+			case Nil => None
+			case x => Some("File(s) did not exist: " + x.mkString("[ ", " , ", " ]"))
+		}
+	private def absent(paths: List[String], project: Project) =
+		fromStrings(paths, project).filter(_.exists) match
+		{
+			case Nil => None
+			case x => Some("File(s) existed: " + x.mkString("[ ", " , ", " ]"))
+		}
+	private def execute(command: String, args: List[String], project: Project) =
+	{
+		if(command.trim.isEmpty)
+			Some("Command was empty.")
+		else
+		{
+			Control.trapUnit("Error running command: ", project.log)
+			{
+				val builder = new java.lang.ProcessBuilder((command :: args).toArray :  _*).directory(project.info.projectDirectory)
+				val exitValue = Process(builder) ! log
+				if(exitValue == 0)
+					None
+				else
+					Some("Nonzero exit value (" + exitValue + ")")
+			}
+		}
+	}
+}
+private object TestScriptParser
+{
+	val SuccessLiteral = "success"
+	val Failure = "error"
+	val CommandStart = "$"
+	val ActionStart = ">"
+	val WordRegex = """[^ \[\]\s'\"][^ \[\]\s]*""".r
+	val StartRegex = ("[" + CommandStart + ActionStart + "]").r
+	
+	final def lazyFold[T](list: List[T])(f: T => Option[String]): Option[String] =
+		list match
+		{
+			case Nil => None
+			case head :: tail =>
+				f(head) match
+				{
+					case None => lazyFold(tail)(f)
+					case x => x
+				}
+		}
+}
diff --git a/src/main/resources/scalac-plugin.xml b/src/main/resources/scalac-plugin.xml
new file mode 100644
index 000000000..54ec5669c
--- /dev/null
+++ b/src/main/resources/scalac-plugin.xml
@@ -0,0 +1,4 @@
+<plugin>
+  <name>sbt-analyze</name>
+  <classname>sbt.Analyzer</classname>
+</plugin>
diff --git a/src/main/scala/sbt/Analysis.scala b/src/main/scala/sbt/Analysis.scala
new file mode 100644
index 000000000..4498fd800
--- /dev/null
+++ b/src/main/scala/sbt/Analysis.scala
@@ -0,0 +1,220 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+trait TaskAnalysis[Source, Product, External] extends NotNull
+{
+	import scala.collection.Set
+	def save(): Option[String]
+	def revert(): Option[String]
+	def clear(): Unit
+	
+	def allSources: Set[Source]
+	def allProducts: Set[Product]
+	def allExternals: Set[External]
+	
+	def sourceDependencies(source: Source): Option[Set[Source]]
+	def products(source: Source): Option[Set[Product]]
+	def externalDependencies(external: External): Option[Set[Source]]
+	
+	def addSource(source: Source): Unit
+	def addExternalDependency(dependsOn: External, source: Source): Unit
+	def addSourceDependency(dependsOn: Source, source: Source): Unit
+	def addProduct(source: Source, product: Product): Unit
+	
+	def removeSource(source: Source): Unit
+	def removeDependent(source: Source): Unit
+	def removeDependencies(source: Source): Option[Set[Source]]
+	def removeExternalDependency(external: External): Unit
+}
+
+import java.io.File
+import BasicAnalysis._
+import impl.MapUtilities.{add, all, read, mark, readOnlyIterable, write}
+import scala.collection.mutable.{HashMap, HashSet, ListBuffer, Map, Set}
+
+sealed class BasicAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends TaskAnalysis[Path, Path, File]
+{
+	private val sourceDependencyMap: Map[Path, Set[Path]] = new HashMap
+	private val productMap: Map[Path, Set[Path]] = new HashMap
+	private val externalDependencyMap: Map[File, Set[Path]] = new HashMap
+	
+	final type AnyMapToSource = Map[K, Set[Path]] forSome {type K}
+	final type AnySourceMap = Map[Path, T] forSome {type T}
+	final type AnySourceSetMap = Map[Path, Set[T]] forSome {type T}
+	final type AnyMap = Map[K, V] forSome { type K; type V }
+	
+	protected def mapsToClear = List[AnyMap](sourceDependencyMap, productMap, externalDependencyMap)
+	protected def mapsToRemoveSource = List[AnySourceMap](sourceDependencyMap, productMap)
+	protected def mapsToRemoveDependent = List[AnyMapToSource](sourceDependencyMap, externalDependencyMap)
+	protected def mapsToMark = List[AnySourceSetMap](sourceDependencyMap, productMap)
+	
+	def clear()
+	{
+		for(map <- mapsToClear)
+			map.clear()
+	}
+	def removeSource(source: Path)
+	{
+		for(sourceProducts <- productMap.get(source))
+			FileUtilities.clean(sourceProducts, true, log)
+		for(map <- mapsToRemoveSource)
+			map -= source
+	}
+	def removeSelfDependency(source: Path)
+	{
+		for(deps <- sourceDependencyMap.get(source))
+			deps -= source
+	}
+	def removeDependent(source: Path)
+	{
+		for(map <- mapsToRemoveDependent; deps <- map.values)
+			deps -= source
+	}
+	def removeDependencies(source: Path) = sourceDependencyMap.removeKey(source)
+	def removeExternalDependency(dep: File) = externalDependencyMap.removeKey(dep.getAbsoluteFile)
+	
+	def externalDependencies(external: File) = externalDependencyMap.get(external.getAbsoluteFile)
+	def sourceDependencies(source: Path) = sourceDependencyMap.get(source)
+	def products(sources: Iterable[Path]): Iterable[Path] =
+	{
+		val buffer = new ListBuffer[Path]
+		for(source <- sources; sourceProducts <- productMap.get(source))
+			buffer ++= sourceProducts
+		buffer.readOnly
+	}
+	def products(source: Path) = productMap.get(source)
+	
+	def allSources = sourceDependencyMap.keySet
+	def allProducts: Set[Path] = HashSet(flatten(productMap.values.toList) : _*)
+	def allExternals = externalDependencyMap.keySet
+	
+	def allExternalDependencies = readOnlyIterable(externalDependencyMap)
+	def allDependencies = readOnlyIterable(sourceDependencyMap)
+	
+	def addSourceDependency(on: Path, from: Path) = add(on, from, sourceDependencyMap)
+	def addExternalDependency(on: File, from: Path) = add(on.getAbsoluteFile, from, externalDependencyMap)
+	def addProduct(source: Path, file: Path) = add(source, file, productMap)
+	def addSource(source: Path) =
+	{
+		for(map <- mapsToMark)
+			mark(source, map)
+	}
+	
+	import Format._ // get implicits for data types
+	implicit val path: Format[Path] = Format.path(projectPath)
+	implicit val pathSet: Format[Set[Path]] = Format.set
+	
+	protected def backedMaps: Iterable[Backed[_,_]] = 
+		Backed(sourceDependencyMap, DependenciesLabel, DependenciesFileName) ::
+		Backed(productMap, GeneratedLabel, GeneratedFileName) ::
+		Backed(externalDependencyMap, ExternalDependenciesLabel, ExternalDependenciesFileName) ::
+		Nil
+	
+	def revert() = load()
+	private def loadBacked[Key,Value](b: Backed[Key,Value]) = read(b.map, analysisPath / b.name, log)(b.keyFormat, b.valueFormat)
+	private def storeBacked[Key,Value](b: Backed[Key,Value]) = write(b.map, b.label, analysisPath / b.name, log)(b.keyFormat, b.valueFormat)
+	final def load(): Option[String] = Control.lazyFold(backedMaps.toList)(backed =>loadBacked(backed))
+	final def save(): Option[String] = Control.lazyFold(backedMaps.toList)(backed => storeBacked(backed))
+}
+object BasicAnalysis
+{
+	private def flatten(s: Iterable[Set[Path]]): Seq[Path] = s.flatMap(x => x.toSeq).toSeq
+
+	val GeneratedFileName = "generated_files"
+	val DependenciesFileName = "dependencies"
+	val ExternalDependenciesFileName = "external"
+	
+	val GeneratedLabel = "Generated Classes"
+	val DependenciesLabel = "Source Dependencies"
+	val ExternalDependenciesLabel = "External Dependencies"
+	
+	def load(analysisPath: Path, projectPath: Path, log: Logger): Either[String, BasicAnalysis] =
+	{
+		val analysis = new BasicAnalysis(analysisPath, projectPath, log)
+		analysis.load().toLeft(analysis)
+	}
+}
+object CompileAnalysis
+{
+	val HashesFileName = "hashes"
+	val TestsFileName = "tests"
+	val ApplicationsFileName = "applications"
+	val ProjectDefinitionsName = "projects"
+	
+	val HashesLabel = "Source Hashes"
+	val TestsLabel = "Tests"
+	val ApplicationsLabel = "Classes with main methods"
+	val ProjectDefinitionsLabel = "Project Definitions"
+	
+	def load(analysisPath: Path, projectPath: Path, log: Logger): Either[String, CompileAnalysis] =
+	{
+		val analysis = new CompileAnalysis(analysisPath, projectPath, log)
+		analysis.load().toLeft(analysis)
+	}
+}
+import CompileAnalysis._
+import Format._ // get implicits for data types
+sealed class BasicCompileAnalysis protected (analysisPath: Path, projectPath: Path, log: Logger) extends BasicAnalysis(analysisPath, projectPath, log)
+{
+	/*private */val hashesMap = new HashMap[Path, Array[Byte]]
+	
+	override protected def mapsToClear = hashesMap :: super.mapsToClear
+	override protected def mapsToRemoveSource = hashesMap :: super.mapsToRemoveSource
+	
+	def setHash(source: Path, hash: Array[Byte]) { hashesMap(source) = hash }
+	def clearHash(source: Path) { hashesMap.removeKey(source) }
+	def hash(source: Path) = hashesMap.get(source)
+	def clearHashes() { hashesMap.clear() }
+	
+	def getClasses(sources: PathFinder, outputDirectory: Path): PathFinder =
+		Path.lazyPathFinder
+		{
+			val basePath = (outputDirectory ##)
+			for(c <- products(sources.get)) yield
+				Path.relativize(basePath, c).getOrElse(c)
+		}
+		
+	implicit val stringSet: Format[Set[String]] = Format.set
+	override protected def backedMaps = Backed(hashesMap, HashesLabel, HashesFileName) :: super.backedMaps.toList
+}
+private[sbt] final class BuilderCompileAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends BasicCompileAnalysis(analysisPath, projectPath, log)
+{
+	private val projectDefinitionMap = new HashMap[Path, Set[String]]
+	override protected def mapsToClear = projectDefinitionMap :: super.mapsToClear
+	override protected def mapsToRemoveSource = projectDefinitionMap :: super.mapsToRemoveSource
+	def allProjects = all(projectDefinitionMap)
+	def addProjectDefinition(source: Path, className: String) = add(source, className, projectDefinitionMap)
+	
+	override protected def backedMaps =
+		Backed(projectDefinitionMap, ProjectDefinitionsLabel, ProjectDefinitionsName) ::
+		super.backedMaps
+}
+final class CompileAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends BasicCompileAnalysis(analysisPath, projectPath, log)
+{
+	private val testMap = new HashMap[Path, Set[TestDefinition]]
+	private val applicationsMap = new HashMap[Path, Set[String]]
+	def allTests = all(testMap)
+	def allApplications = all(applicationsMap)
+	def addTest(source: Path, test: TestDefinition) = add(source, test, testMap)
+	def addApplication(source: Path, className: String) = add(source, className, applicationsMap)
+	
+	def testSourceMap: Map[String, Path] =
+	{
+		val map = new HashMap[String, Path]
+		for( (source, tests) <- testMap; test <- tests) map(test.testClassName) = source
+		map
+	}
+	
+	override protected def mapsToClear = applicationsMap :: testMap :: super.mapsToClear
+	override protected def mapsToRemoveSource = applicationsMap :: testMap :: super.mapsToRemoveSource
+	
+	implicit val testSet: Format[Set[TestDefinition]] = Format.set
+	override protected def backedMaps =
+		Backed(testMap, TestsLabel, TestsFileName) ::
+		Backed(applicationsMap, ApplicationsLabel, ApplicationsFileName) ::
+		super.backedMaps
+}
+/** A map that is persisted in a properties file named 'name' and with 'label'.  'keyFormat' and 'valueFormat' are used to (de)serialize. */
+final case class Backed[Key, Value](map: Map[Key, Value], label: String, name: String)(implicit val keyFormat: Format[Key], val valueFormat: Format[Value]) extends NotNull
\ No newline at end of file
diff --git a/src/main/scala/sbt/AnalysisCallback.scala b/src/main/scala/sbt/AnalysisCallback.scala
new file mode 100644
index 000000000..e20d9190b
--- /dev/null
+++ b/src/main/scala/sbt/AnalysisCallback.scala
@@ -0,0 +1,93 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+package sbt
+
+import java.io.File
+
+object AnalysisCallback
+{
+	private val map = new scala.collection.mutable.HashMap[Int, AnalysisCallback]
+	private var nextID: Int = 0
+	def register(callback: AnalysisCallback): Int =
+	{
+		val id = nextID
+		nextID += 1
+		map(id) = callback
+		id
+	}
+	def apply(id: Int): Option[AnalysisCallback] = map.get(id)
+	def unregister(id: Int)
+	{
+		map -= id
+	}
+}
+
+trait AnalysisCallback extends NotNull
+{
+	/** The names of classes that the analyzer should find subclasses of.*/
+	def superclassNames: Iterable[String]
+	/** The base path for the project.*/
+	def basePath: Path
+	/** Called when the the given superclass could not be found on the classpath by the compiler.*/
+	def superclassNotFound(superclassName: String): Unit
+	/** Called before the source at the given location is processed. */
+	def beginSource(sourcePath: Path): Unit
+	/** Called when the a subclass of one of the classes given in <code>superclassNames</code> is
+	* discovered.*/
+	def foundSubclass(sourcePath: Path, subclassName: String, superclassName: String, isModule: Boolean): Unit
+	/** Called to indicate that the source file <code>sourcePath</code> depends on the source file
+	* <code>dependsOnPath</code>.*/
+	def sourceDependency(dependsOnPath: Path, sourcePath: Path): Unit
+	/** Called to indicate that the source file <code>sourcePath</code> depends on the jar
+	* <code>jarPath</code>.*/
+	def jarDependency(jarPath: File, sourcePath: Path): Unit
+	/** Called to indicate that the source file <code>sourcePath</code> depends on the class file
+	* <code>classFile</code>.*/
+	def classDependency(classFile: File, sourcePath: Path): Unit
+	/** Called to indicate that the source file <code>sourcePath</code> produces a class file at
+	* <code>modulePath</code>.*/
+	def generatedClass(sourcePath: Path, modulePath: Path): Unit
+	/** Called after the source at the given location has been processed. */
+	def endSource(sourcePath: Path): Unit
+	/** Called when a module with a public 'main' method with the right signature is found.*/
+	def foundApplication(sourcePath: Path, className: String): Unit
+}
+abstract class BasicAnalysisCallback[A <: BasicCompileAnalysis](val basePath: Path, val superclassNames: Iterable[String],
+	protected val analysis: A) extends AnalysisCallback
+{
+	def superclassNotFound(superclassName: String) {}
+	
+	def beginSource(sourcePath: Path)
+	{
+		analysis.addSource(sourcePath)
+	}
+	def sourceDependency(dependsOnPath: Path, sourcePath: Path)
+	{
+		analysis.addSourceDependency(dependsOnPath, sourcePath)
+	}
+	def jarDependency(jarFile: File, sourcePath: Path)
+	{
+		analysis.addExternalDependency(jarFile, sourcePath)
+	}
+	def classDependency(classFile: File, sourcePath: Path)
+	{
+		analysis.addExternalDependency(classFile, sourcePath)
+	}
+	def generatedClass(sourcePath: Path, modulePath: Path)
+	{
+		analysis.addProduct(sourcePath, modulePath)
+	}
+	def endSource(sourcePath: Path)
+	{
+		analysis.removeSelfDependency(sourcePath)
+	}
+}
+abstract class BasicCompileAnalysisCallback(basePath: Path, superclassNames: Iterable[String], analysis: CompileAnalysis)
+	extends BasicAnalysisCallback(basePath, superclassNames, analysis)
+{
+	def foundApplication(sourcePath: Path, className: String)
+	{
+		analysis.addApplication(sourcePath, className)
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Analyzer.scala b/src/main/scala/sbt/Analyzer.scala
new file mode 100644
index 000000000..3e45d804a
--- /dev/null
+++ b/src/main/scala/sbt/Analyzer.scala
@@ -0,0 +1,234 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import scala.tools.nsc.{io, plugins, symtab, Global, Phase}
+import io.{AbstractFile, PlainFile, ZipArchive}
+import plugins.{Plugin, PluginComponent}
+import symtab.Flags
+import scala.collection.mutable.{HashMap, HashSet, Map, Set}
+
+import java.io.File
+
+object Analyzer
+{
+	val PluginName = "sbt-analyzer"
+	val CallbackIDOptionName = "callback:"
+}
+class Analyzer(val global: Global) extends Plugin
+{
+	import global._
+	import Analyzer._
+	
+	val name = PluginName
+	val description = "A plugin to find all concrete instances of a given class and extract dependency information."
+	val components = List[PluginComponent](Component)
+	
+	private var callbackOption: Option[AnalysisCallback] = None
+	
+	override def processOptions(options: List[String], error: String => Unit)
+	{
+		for(option <- options)
+		{
+			if(option.startsWith(CallbackIDOptionName))
+				callbackOption = AnalysisCallback(option.substring(CallbackIDOptionName.length).toInt)
+			else
+				error("Option for sbt analyzer plugin not understood: " + option)
+		}
+		if(callbackOption.isEmpty)
+			error("Callback ID not specified for sbt analyzer plugin.")
+	}
+
+	override val optionsHelp: Option[String] =
+	{
+		val prefix = "  -P:" + name + ":"
+		Some(prefix + CallbackIDOptionName + "<callback-id>            Set the callback id.\n")
+	}
+
+	/* ================================================== */
+	// These two templates abuse scope for source compatibility between Scala 2.7.x and 2.8.x so that a single
+	// sbt codebase compiles with both series of versions.
+	// In 2.8.x, PluginComponent.runsAfter has type List[String] and the method runsBefore is defined on
+	//   PluginComponent with default value Nil.
+	// In 2.7.x, runsBefore does not exist on PluginComponent and PluginComponent.runsAfter has type String.
+	//
+	// Therefore, in 2.8.x, object runsBefore is shadowed by PluginComponent.runsBefore (which is Nil) and so
+	//   afterPhase :: runsBefore
+	// is equivalent to List[String](afterPhase)
+	// In 2.7.x, object runsBefore is not shadowed and so runsAfter has type String.
+	private object runsBefore { def :: (s: String) = s }
+	private abstract class CompatiblePluginComponent(afterPhase: String) extends PluginComponent
+	{
+		override val runsAfter = afterPhase :: runsBefore
+	}
+	/* ================================================== */
+	
+	private object Component extends CompatiblePluginComponent("jvm")
+	{
+		val global = Analyzer.this.global
+		val phaseName = Analyzer.this.name
+		def newPhase(prev: Phase) = new AnalyzerPhase(prev)
+	}
+
+	private class AnalyzerPhase(prev: Phase) extends Phase(prev)
+	{
+		def name = Analyzer.this.name
+		def run
+		{
+			val callback = callbackOption.get
+			val projectPath = callback.basePath
+			val projectPathString = Path.basePathString(projectPath).getOrElse({error("Could not determine base path for " + projectPath); ""})
+			def relativize(file: File) = Path.relativize(projectPath, projectPathString, file)
+			
+			val outputDir = new File(global.settings.outdir.value)
+			val outputPathOption = relativize(outputDir)
+			if(outputPathOption.isEmpty)
+				error("Output directory " + outputDir.getAbsolutePath + " must be in the project directory.")
+			val outputPath = outputPathOption.get
+			
+			val superclassNames = callback.superclassNames.map(newTermName)
+			val superclassesAll =
+				for(name <- superclassNames) yield
+				{
+					try { Some(global.definitions.getClass(name)) }
+					catch { case fe: scala.tools.nsc.FatalError => callback.superclassNotFound(name.toString); None }
+				}
+			val superclasses = superclassesAll.filter(_.isDefined).map(_.get)
+			
+			for(unit <- currentRun.units)
+			{
+				// build dependencies structure
+				val sourceFile = unit.source.file.file
+				val sourcePathOption = relativize(sourceFile)
+				if(sourcePathOption.isEmpty)
+					error("Source file " + sourceFile.getAbsolutePath + " must be in the project directory.")
+				val sourcePath = sourcePathOption.get
+				callback.beginSource(sourcePath)
+				for(on <- unit.depends)
+				{
+					val onSource = on.sourceFile
+					if(onSource == null)
+					{
+						classFile(on) match
+						{
+							case Some(f) =>
+							{
+								f match
+								{
+									case ze: ZipArchive#Entry => callback.jarDependency(new File(ze.getArchive.getName), sourcePath)
+									case pf: PlainFile =>
+									{
+										 // ignore dependencies in the output directory: these are handled by source dependencies
+										if(Path.relativize(outputPath, pf.file).isEmpty)
+											callback.classDependency(pf.file, sourcePath)
+									}
+									case _ => ()
+								}
+							}
+							case None => ()
+						}
+					}
+					else
+					{
+						for(depPath <- relativize(onSource.file))
+							callback.sourceDependency(depPath, sourcePath)
+					}
+				}
+				
+				// find subclasses and modules with main methods
+				for(clazz @ ClassDef(mods, n, _, _) <- unit.body)
+				{
+					val sym = clazz.symbol
+					if(sym != NoSymbol && mods.isPublic && !mods.isAbstract && !mods.isTrait &&
+						 !sym.isImplClass && sym.isStatic && !sym.isNestedClass)
+					{
+						val isModule = sym.isModuleClass
+						for(superclass <- superclasses.filter(sym.isSubClass))
+							callback.foundSubclass(sourcePath, sym.fullNameString, superclass.fullNameString, isModule)
+						if(isModule && hasMainMethod(sym))
+							callback.foundApplication(sourcePath, sym.fullNameString)
+					}
+				}
+				
+				// build list of generated classes
+				for(iclass <- unit.icode)
+				{
+					val sym = iclass.symbol
+					def addGenerated(separatorRequired: Boolean)
+					{
+						val classPath = pathOfClass(outputPath, sym, separatorRequired)
+						if(classPath.asFile.exists)
+							callback.generatedClass(sourcePath, classPath)
+					}
+					if(sym.isModuleClass && !sym.isImplClass)
+					{
+						if(isTopLevelModule(sym) && sym.linkedClassOfModule == NoSymbol)
+							addGenerated(false)
+						addGenerated(true)
+					}
+					else
+						addGenerated(false)
+				}
+				callback.endSource(sourcePath)
+			}
+		}
+	}
+	
+	private def classFile(sym: Symbol): Option[AbstractFile] =
+	{
+		import scala.tools.nsc.symtab.Flags
+		val name = sym.fullNameString(java.io.File.separatorChar) + (if (sym.hasFlag(Flags.MODULE)) "$" else "")
+		val entry = classPath.root.find(name, false)
+		if (entry ne null)
+			Some(entry.classFile)
+		else
+			None
+	}
+	
+	private def isTopLevelModule(sym: Symbol): Boolean =
+		atPhase (currentRun.picklerPhase.next) {
+			sym.isModuleClass && !sym.isImplClass && !sym.isNestedClass
+		}
+	private def pathOfClass(outputPath: Path, s: Symbol, separatorRequired: Boolean): Path =
+		pathOfClass(outputPath, s, separatorRequired, ".class")
+	private def pathOfClass(outputPath: Path, s: Symbol, separatorRequired: Boolean, postfix: String): Path =
+	{
+		if(s.owner.isPackageClass && s.isPackageClass)
+			packagePath(outputPath, s) / postfix
+		else
+			pathOfClass(outputPath, s.owner.enclClass, true, s.simpleName + (if(separatorRequired) "$" else "") + postfix)
+	}
+	private def packagePath(outputPath: Path, s: Symbol): Path =
+	{
+		if(s.isEmptyPackageClass || s.isRoot)
+			outputPath
+		else
+			packagePath(outputPath, s.owner.enclClass) / s.simpleName.toString
+	}
+	
+	private def hasMainMethod(sym: Symbol): Boolean =
+	{
+		val main = sym.info.nonPrivateMember(newTermName("main"))//nme.main)
+		main.tpe match
+		{
+			case OverloadedType(pre, alternatives) => alternatives.exists(alt => isVisible(alt) && isMainType(pre.memberType(alt)))
+			case tpe => isVisible(main) && isMainType(main.owner.thisType.memberType(main))
+		}
+	}
+	private def isVisible(sym: Symbol) = sym != NoSymbol && sym.isPublic && !sym.isDeferred
+	private def isMainType(tpe: Type) =
+	{
+		tpe match
+		{
+			// singleArgument is of type Symbol in 2.8.0 and type Type in 2.7.x
+			case MethodType(List(singleArgument), result) => isUnitType(result) && isStringArray(singleArgument)
+			case _ => false
+		}
+	}
+	private lazy val StringArrayType = appliedType(definitions.ArrayClass.typeConstructor, definitions.StringClass.tpe :: Nil)
+	// isStringArray is overloaded to handle the incompatibility between 2.7.x and 2.8.0
+	private def isStringArray(tpe: Type): Boolean = tpe.typeSymbol == StringArrayType.typeSymbol
+	private def isStringArray(sym: Symbol): Boolean = isStringArray(sym.tpe)
+	private def isUnitType(tpe: Type) = tpe.typeSymbol == definitions.UnitClass
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/AutoCompilerPlugins.scala b/src/main/scala/sbt/AutoCompilerPlugins.scala
new file mode 100644
index 000000000..1b5a94864
--- /dev/null
+++ b/src/main/scala/sbt/AutoCompilerPlugins.scala
@@ -0,0 +1,33 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+trait AutoCompilerPlugins extends BasicScalaProject
+{
+	import Configurations.CompilerPlugin
+	abstract override def ivyConfigurations =
+	{
+		val superConfigurations = super.ivyConfigurations.toList
+		val newConfigurations =
+			if(superConfigurations.isEmpty)
+			{
+				if(useDefaultConfigurations)
+					CompilerPlugin :: Configurations.defaultMavenConfigurations
+				else
+				 	Configurations.Default :: CompilerPlugin :: Nil
+			}
+			else
+				CompilerPlugin :: superConfigurations
+		log.debug("Auto configurations: " + newConfigurations.toList.mkString(", "))
+		Configurations.removeDuplicates(newConfigurations)
+	}
+	abstract override def compileOptions = compilerPlugins ++ super.compileOptions
+
+	/** A PathFinder that provides the classpath to search for compiler plugins. */
+	def pluginClasspath = fullClasspath(CompilerPlugin)
+	protected def compilerPlugins: List[CompileOption] =
+		ClasspathUtilities.compilerPlugins(pluginClasspath.get).map(plugin => new CompileOption("-Xplugin:" + plugin.getAbsolutePath)).toList
+
+	def compilerPlugin(dependency: ModuleID) = dependency % "plugin->default(compile)"
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
new file mode 100644
index 000000000..f5020d411
--- /dev/null
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -0,0 +1,578 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt
+
+import StringUtilities.{appendable,nonEmpty}
+
+/** A project that provides a classpath. */
+trait ClasspathProject extends Project
+{
+	/** The local classpath for this project.*/
+	def projectClasspath(config: Configuration): PathFinder
+	
+	/** Returns the classpath of this project and the classpaths of all dependencies for the
+	* given configuration.  Specifically, this concatentates projectClasspath(config) for all
+	* projects of type ClasspathProject in topologicalSort. */
+	def fullClasspath(config: Configuration): PathFinder =
+		Path.lazyPathFinder
+		{
+			val set = new wrap.MutableSetWrapper(new java.util.LinkedHashSet[Path])
+			for(project <- topologicalSort)
+			{
+				project match
+				{
+					case sp: ClasspathProject => set ++= sp.projectClasspath(config).get
+					case _ => ()
+				}
+			}
+			set.toList
+		}
+}
+trait BasicDependencyProject extends BasicManagedProject with UnmanagedClasspathProject
+{
+	/** This returns the classpath for only this project for the given configuration.*/
+	def projectClasspath(config: Configuration) = fullUnmanagedClasspath(config) +++ managedClasspath(config)
+}
+/** A project that provides a directory in which jars can be manually managed.*/
+trait UnmanagedClasspathProject extends ClasspathProject
+{
+	/** The location of the manually managed (unmanaged) dependency directory.*/
+	def dependencyPath: Path
+	/** The classpath containing all jars in the unmanaged directory. */
+	def unmanagedClasspath: PathFinder =
+	{
+		val base = descendents(dependencyPath, "*.jar")
+		if(scratch)
+			base +++ (info.projectPath * "*.jar")
+		else
+			base
+	}
+	/** The classpath containing all unmanaged classpath elements for the given configuration. This typically includes
+	* at least 'unmanagedClasspath'.*/
+	def fullUnmanagedClasspath(config: Configuration): PathFinder
+}
+
+/** A project that provides automatic dependency management.*/
+trait ManagedProject extends ClasspathProject
+{
+	trait ManagedOption extends ActionOption
+	final class ManagedFlagOption extends ManagedOption
+	/** An update option that specifies that unneeded files should be pruned from the managed library directory
+	* after updating. */
+	final val Synchronize = new ManagedFlagOption
+	/** An update option that specifies that Ivy should validate configurations.*/
+	final val Validate = new ManagedFlagOption
+	/** An update option that puts Ivy into a quieter logging mode.*/
+	final val QuietUpdate = new ManagedFlagOption
+	/** An update option that adds the scala-tools.org releases repository to the set of resolvers, unless
+	* no inline repositories are present and an ivysettings.xml file is present.*/
+	final val AddScalaToolsReleases = new ManagedFlagOption
+	/** An update option that specifies that an error should be generated if no inline dependencies, resolvers,
+	* XML file, or Ivy or Maven configuration files are present.*/
+	final val ErrorIfNoConfiguration = new ManagedFlagOption
+	/** An update option that explicitly specifies the dependency manager to use.  This can be used to
+	* override the default precendence. */
+	final case class LibraryManager(m: Manager) extends ManagedOption
+	/** An update option that overrides the default Ivy cache location. */
+	final case class CacheDirectory(dir: Path) extends ManagedOption
+	final case class CheckScalaVersion(configs: Iterable[Configuration], checkExplicit: Boolean, filterImplicit: Boolean) extends ManagedOption
+	
+	private def withConfigurations(outputPattern: String, managedDependencyPath: Path, options: Seq[ManagedOption])
+		(doWith: (IvyConfiguration, UpdateConfiguration) => Option[String]) =
+	{
+		var synchronize = false
+		var validate = false
+		var quiet = false
+		var addScalaTools = false
+		var errorIfNoConfiguration = false
+		var manager: Manager = new AutoDetectManager(projectID)
+		var cacheDirectory: Option[Path] = None
+		var checkScalaVersion: Option[IvyScala] = None
+		for(option <- options)
+		{
+			option match
+			{
+				case Synchronize => synchronize = true
+				case Validate => validate = true
+				case LibraryManager(m) => manager = m
+				case QuietUpdate => quiet = true
+				case AddScalaToolsReleases => addScalaTools = true
+				case ErrorIfNoConfiguration => errorIfNoConfiguration = true
+				case CacheDirectory(dir) => cacheDirectory = Some(dir)
+				case CheckScalaVersion(configs, checkExplicit, filterImplicit) =>
+					checkScalaVersion = getScalaVersion.map(version => new IvyScala(version, configs, checkExplicit, filterImplicit))
+				case _ => log.warn("Ignored unknown managed option " + option)
+			}
+		}
+		val ivyPaths = new IvyPaths(info.projectPath, managedDependencyPath, cacheDirectory)
+		val ivyFlags = new IvyFlags(validate, addScalaTools, errorIfNoConfiguration)
+		val ivyConfiguration = new IvyConfiguration(ivyPaths, manager, ivyFlags, checkScalaVersion, log)
+		val updateConfiguration = new UpdateConfiguration(outputPattern, synchronize, quiet)
+		doWith(ivyConfiguration, updateConfiguration)
+	}
+	private def getScalaVersion =
+	{
+		val v = scalaVersion.value
+		if(v.isEmpty) None
+		else Some(v)
+	}
+	private def withIvyTask(doTask: => Option[String]) =
+		task
+		{
+			try { doTask }
+			catch
+			{
+				case e: NoClassDefFoundError =>
+					log.trace(e)
+					Some("Apache Ivy is required for dependency management (" + e.toString + ")")
+			}
+		}
+	def updateTask(outputPattern: String, managedDependencyPath: Path, options: ManagedOption*): Task =
+		updateTask(outputPattern, managedDependencyPath, options)
+	def updateTask(outputPattern: String, managedDependencyPath: Path, options: => Seq[ManagedOption]) =
+		withIvyTask(withConfigurations(outputPattern, managedDependencyPath, options)(ManageDependencies.update))
+		
+	def publishTask(publishConfiguration: => PublishConfiguration, options: => Seq[ManagedOption]) =
+		withIvyTask
+		{
+			val publishConfig = publishConfiguration
+			import publishConfig._
+			withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) =>
+				val delivered = if(publishIvy) Some(deliveredPattern) else None
+				ManageDependencies.publish(ivyConf, resolverName, srcArtifactPatterns, delivered, configurations) }
+		}
+	def deliverTask(deliverConfiguration: => PublishConfiguration, options: => Seq[ManagedOption]) =
+		withIvyTask
+		{
+			val deliverConfig = deliverConfiguration
+			import deliverConfig._
+			withConfigurations("", managedDependencyPath, options) { (ivyConf, updateConf) =>
+				ManageDependencies.deliver(ivyConf, updateConf, status, deliveredPattern, extraDependencies, configurations)
+			}
+		}
+	def makePomTask(output: => Path, extraDependencies: => Iterable[ModuleID], configurations: => Option[Iterable[Configuration]], options: => Seq[ManagedOption]) =
+		withIvyTask(withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) =>
+			ManageDependencies.makePom(ivyConf, extraDependencies, configurations, output.asFile) })
+		
+	def cleanCacheTask(managedDependencyPath: Path, options: => Seq[ManagedOption]) =
+		withIvyTask(withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) => ManageDependencies.cleanCache(ivyConf) })
+		
+	def cleanLibTask(managedDependencyPath: Path) = task { FileUtilities.clean(managedDependencyPath.get, log) }
+
+	/** This is the public ID of the project (used for publishing, for example) */
+	def moduleID: String = normalizedName + appendable(crossScalaVersionString)
+	/** This is the full public ID of the project (used for publishing, for example) */
+	def projectID: ModuleID = ModuleID(organization, moduleID, version.toString)
+
+	/** This is the default name for artifacts (such as jars) without any version string.*/
+	def artifactID = moduleID
+	/** This is the default name for artifacts (such as jars) including the version string.*/
+	def artifactBaseName = artifactID + "-" + version.toString
+	def artifacts: Iterable[Artifact]
+	
+	def managedDependencyPath: Path
+	/** The managed classpath for the given configuration.  This can be overridden to add jars from other configurations
+	* so that the Ivy 'extends' mechanism is not required.  That way, the jars are only copied to one configuration.*/
+	def managedClasspath(config: Configuration): PathFinder = configurationClasspath(config)
+	/** All dependencies in the given configuration. */
+	final def configurationClasspath(config: Configuration): PathFinder = descendents(configurationPath(config), "*.jar")
+	/** The base path to which dependencies in configuration 'config' are downloaded.*/
+	def configurationPath(config: Configuration): Path = managedDependencyPath / config.toString
+	
+	import StringUtilities.nonEmpty
+	implicit def toGroupID(groupID: String): GroupID =
+	{
+		nonEmpty(groupID, "Group ID")
+		new GroupID(groupID, ScalaVersion.currentString)
+	}
+	implicit def toRepositoryName(name: String): RepositoryName =
+	{
+		nonEmpty(name, "Repository name")
+		new RepositoryName(name)
+	}
+	implicit def moduleIDConfigurable(m: ModuleID): ModuleIDConfigurable =
+	{
+		require(m.configurations.isEmpty, "Configurations already specified for module " + m)
+		new ModuleIDConfigurable(m)
+	}
+	
+	/** Creates a new configuration with the given name.*/
+	def config(name: String) = new Configuration(name)
+}
+/** This class groups required configuration for the deliver and publish tasks. */
+trait PublishConfiguration extends NotNull
+{
+	/** The name of the resolver to which publishing should be done.*/
+	def resolverName: String
+	/** The Ivy pattern used to determine the delivered Ivy file location.  An example is
+	* (outputPath / "[artifact]-[revision].[ext]").relativePath. */
+	def deliveredPattern: String
+	/** Ivy patterns used to find artifacts for publishing.  An example pattern is
+	* (outputPath / "[artifact]-[revision].[ext]").relativePath */
+	def srcArtifactPatterns: Iterable[String]
+	/** Additional dependencies to include for delivering/publishing only.  These are typically dependencies on
+	* subprojects. */
+	def extraDependencies: Iterable[ModuleID]
+	/** The status to use when delivering or publishing.  This might be "release" or "integration" or another valid Ivy status. */
+	def status: String
+	/**  The configurations to include in the publish/deliver action: specify none for all configurations. */
+	def configurations: Option[Iterable[Configuration]]
+	/** True if the Ivy file should be published. */
+	def publishIvy: Boolean
+}
+object ManagedStyle extends Enumeration
+{
+	val Maven, Ivy = Value
+}
+import ManagedStyle.{Ivy, Maven, Value => ManagedType}
+trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject with BasicDependencyPaths
+{
+	import BasicManagedProject._
+	/** The dependency manager that represents inline declarations.  The default manager packages the information
+	* from 'ivyXML', 'projectID', 'repositories', and 'libraryDependencies' and does not typically need to be
+	* be overridden. */
+	def manager = new SimpleManager(ivyXML, true, projectID, repositories, ivyConfigurations, defaultConfiguration, artifacts, libraryDependencies.toList: _*)
+	
+	/** The pattern for Ivy to use when retrieving dependencies into the local project.  Classpath management
+	* depends on the first directory being [conf] and the extension being [ext].*/
+	def outputPattern = "[conf]/[artifact](-[revision]).[ext]"
+	/** Override this to specify the publications, configurations, and/or dependencies sections of an Ivy file.
+	* See http://code.google.com/p/simple-build-tool/wiki/LibraryManagement for details.*/
+	def ivyXML: scala.xml.NodeSeq = scala.xml.NodeSeq.Empty
+	/** The base options passed to the 'update' action. */
+	def baseUpdateOptions = checkScalaVersion :: Validate :: Synchronize :: QuietUpdate :: AddScalaToolsReleases :: Nil
+	override def ivyConfigurations: Iterable[Configuration] =
+	{
+		val reflective = super.ivyConfigurations
+		if(useDefaultConfigurations)
+		{
+			if(reflective.isEmpty && !useIntegrationTestConfiguration)
+				Nil
+			else
+			{
+				val base = Configurations.defaultMavenConfigurations ++ reflective
+				val allConfigurations =
+					if(useIntegrationTestConfiguration)
+						base ++ List(Configurations.IntegrationTest)
+					else
+						base
+				Configurations.removeDuplicates(allConfigurations)
+			}
+		}
+		else
+			reflective
+	}
+	def useIntegrationTestConfiguration = false
+	def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations))
+	def useMavenConfigurations = true // TBD: set to true and deprecate
+	def useDefaultConfigurations = useMavenConfigurations
+	def managedStyle: ManagedType = Maven
+	protected implicit final val defaultPatterns: RepositoryHelpers.Patterns =
+	{
+		managedStyle match
+		{
+			case Maven => Resolver.mavenStylePatterns
+			case Ivy => Resolver.ivyStylePatterns
+		}
+	}
+	/** The options provided to the 'update' action.  This is by default the options in 'baseUpdateOptions'.
+	* If 'manager' has any dependencies, resolvers, or inline Ivy XML (which by default happens when inline
+	* dependency management is used), it is passed as the dependency manager.*/
+	def updateOptions: Seq[ManagedOption] =
+	{
+		val m = manager
+		if(m.dependencies.isEmpty && m.resolvers.isEmpty && ivyXML.isEmpty && m.artifacts.isEmpty && m.configurations.isEmpty)
+			baseUpdateOptions
+		else
+			LibraryManager(m) :: baseUpdateOptions
+	}
+	def deliverOptions: Seq[ManagedOption] = updateOptions.filter { case _: CheckScalaVersion => false; case _ => true }
+	def publishOptions: Seq[ManagedOption] = deliverOptions
+	/** True if the 'provided' configuration should be included on the 'compile' classpath.  The default value is true.*/
+	def includeProvidedWithCompile = true
+	/** True if the default implicit extensions should be used when determining classpaths.  The default value is true. */
+	def defaultConfigurationExtensions = true
+	/** If true, verify that explicit dependencies on Scala libraries use the same version as scala.version. */
+	def checkExplicitScalaDependencies = true
+	/** If true, filter dependencies on scala-library and scala-compiler. This is true by default to avoid conflicts with
+	* the jars provided by sbt.  You can set this to false to download these jars.  Overriding checkScalaInConfigurations might
+	* be more appropriate, however.*/
+	def filterScalaJars = true
+	/** The configurations to check/filter.*/
+	def checkScalaInConfigurations: Iterable[Configuration] =
+	{
+		val all = ivyConfigurations
+		if(all.isEmpty)
+			Configurations.defaultMavenConfigurations
+		else
+			all
+	}
+	def checkScalaVersion = CheckScalaVersion(checkScalaInConfigurations, checkExplicitScalaDependencies, filterScalaJars)
+	def defaultPublishRepository: Option[Resolver] =
+	{
+		reflectiveRepositories.get("publish-to") orElse
+		info.parent.flatMap
+			{
+				case managed: BasicManagedProject => managed.defaultPublishRepository
+				case _ => None
+			}
+	}
+	/** Includes the Provided configuration on the Compile classpath, the Compile configuration on the Runtime classpath,
+	* and Compile and Runtime on the Test classpath.  Including Provided can be disabled by setting
+	* includeProvidedWithCompile to false.  Including Compile and Runtime can be disabled by setting
+	* defaultConfigurationExtensions to false.*/
+	override def managedClasspath(config: Configuration) =
+	{
+		import Configurations.{Compile, CompilerPlugin, Default, Provided, Runtime, Test}
+		val baseClasspath = configurationClasspath(config)
+		config match
+		{
+			case Compile =>
+				val baseCompileClasspath = baseClasspath +++ managedClasspath(Default)
+				if(includeProvidedWithCompile)
+					baseCompileClasspath +++ managedClasspath(Provided)
+				else
+					baseCompileClasspath
+			case Runtime if defaultConfigurationExtensions => baseClasspath +++ managedClasspath(Compile)
+			case Test if defaultConfigurationExtensions => baseClasspath +++ managedClasspath(Runtime)
+			case _ => baseClasspath
+		}
+	}
+	
+	protected def updateAction = updateTask(outputPattern, managedDependencyPath, updateOptions) describedAs UpdateDescription
+	protected def cleanLibAction = cleanLibTask(managedDependencyPath) describedAs CleanLibDescription
+	protected def cleanCacheAction = cleanCacheTask(managedDependencyPath, updateOptions) describedAs CleanCacheDescription
+	
+	protected def deliverProjectDependencies: Iterable[ModuleID] =
+	{
+		val interDependencies = new scala.collection.mutable.ListBuffer[ModuleID]
+		dependencies.foreach(dep => dep match { case mp: ManagedProject => interDependencies += mp.projectID; case _ => () })
+		if(filterScalaJars)
+			interDependencies ++= deliverScalaDependencies
+		interDependencies.readOnly
+	}
+	protected def deliverScalaDependencies: Iterable[ModuleID] = Nil
+	protected def makePomAction = makePomTask(pomPath, deliverProjectDependencies, None, updateOptions)
+	protected def deliverLocalAction = deliverTask(publishLocalConfiguration, deliverOptions)
+	protected def publishLocalAction =
+	{
+		val dependencies = deliverLocal :: publishPomDepends
+		publishTask(publishLocalConfiguration, publishOptions) dependsOn(dependencies : _*)
+	}
+	protected def publishLocalConfiguration = new DefaultPublishConfiguration("local", "release", true)
+	protected def deliverAction = deliverTask(publishConfiguration, deliverOptions)
+	protected def publishAction =
+	{
+		val dependencies = deliver :: publishPomDepends
+		publishTask(publishConfiguration, publishOptions) dependsOn(dependencies : _*)
+	}
+	private def publishPomDepends = if(managedStyle == Maven) makePom :: Nil else Nil
+	protected def publishConfiguration =
+	{
+		val repository = defaultPublishRepository.getOrElse(error("Repository to publish to not specified."))
+		val publishIvy = managedStyle != Maven
+		new DefaultPublishConfiguration(repository, "release", publishIvy)
+	}
+	protected class DefaultPublishConfiguration(val resolverName: String, val status: String, val publishIvy: Boolean) extends PublishConfiguration
+	{
+		def this(resolver: Resolver, status: String, publishIvy: Boolean) = this(resolver.name, status, publishIvy)
+		def this(resolverName: String, status: String) = this(resolverName, status, true)
+		def this(resolver: Resolver, status: String) = this(resolver.name, status)
+		
+		protected def deliveredPathPattern = outputPath / "[artifact]-[revision].[ext]"
+		def deliveredPattern = deliveredPathPattern.relativePath
+		def srcArtifactPatterns: Iterable[String] =
+		{
+			val pathPatterns =
+				(outputPath / "[artifact]-[revision]-[type].[ext]") ::
+				(outputPath / "[artifact]-[revision].[ext]") ::
+				Nil
+			pathPatterns.map(_.relativePath)
+		}
+		def extraDependencies: Iterable[ModuleID] = Nil//deliverProjectDependencies
+		/**  The configurations to include in the publish/deliver action: specify none for all public configurations. */
+		def configurations: Option[Iterable[Configuration]] = None
+	}
+	
+	lazy val update = updateAction
+	lazy val makePom = makePomAction
+	lazy val deliverLocal = deliverLocalAction
+	lazy val publishLocal = publishLocalAction
+	lazy val deliver = deliverAction
+	lazy val publish = publishAction
+	lazy val cleanLib = cleanLibAction
+	lazy val cleanCache = cleanCacheAction
+}
+
+object BasicManagedProject
+{
+	val UpdateDescription =
+		"Resolves and retrieves automatically managed dependencies."
+	val CleanLibDescription =
+		"Deletes the managed library directory."
+	val CleanCacheDescription =
+		"Deletes the cache of artifacts downloaded for automatically managed dependencies."
+}
+
+trait BasicDependencyPaths extends ManagedProject
+{
+	import BasicDependencyPaths._
+	def dependencyDirectoryName = DefaultDependencyDirectoryName
+	def managedDirectoryName = DefaultManagedDirectoryName
+	def pomName = artifactBaseName + PomExtension
+	def dependencyPath = path(dependencyDirectoryName)
+	def managedDependencyPath = crossPath(managedDependencyRootPath)
+	def managedDependencyRootPath: Path = managedDirectoryName
+	def pomPath = outputPath / pomName
+}
+object BasicDependencyPaths
+{
+	val DefaultManagedDirectoryName = "lib_managed"
+	val DefaultManagedSourceDirectoryName = "src_managed"
+	val DefaultDependencyDirectoryName = "lib"
+	val PomExtension = ".pom"
+}
+
+object StringUtilities
+{
+	def normalize(s: String) = s.toLowerCase.replaceAll("""\s+""", "-")
+	def nonEmpty(s: String, label: String)
+	{
+		require(s.trim.length > 0, label + " cannot be empty.")
+	}
+	def appendable(s: String) = if(s.isEmpty) "" else "_" + s
+}
+final class GroupID private[sbt] (groupID: String, scalaVersion: String) extends NotNull
+{
+	def % (artifactID: String) = groupArtifact(artifactID)
+	def %% (artifactID: String) =
+	{
+		require(!scalaVersion.isEmpty, "Cannot use %% when the sbt launcher is not used.")
+		groupArtifact(artifactID + appendable(scalaVersion))
+	}
+	private def groupArtifact(artifactID: String) =
+	{
+		nonEmpty(artifactID, "Artifact ID")
+		new GroupArtifactID(groupID, artifactID)
+	}
+}
+final class GroupArtifactID private[sbt] (groupID: String, artifactID: String) extends NotNull
+{
+	def % (revision: String): ModuleID =
+	{
+		nonEmpty(revision, "Revision")
+		ModuleID(groupID, artifactID, revision, None)
+	}
+}
+final class ModuleIDConfigurable private[sbt] (moduleID: ModuleID) extends NotNull
+{
+	def % (configurations: String): ModuleID =
+	{
+		nonEmpty(configurations, "Configurations")
+		import moduleID._
+		ModuleID(organization, name, revision, Some(configurations))
+	}
+}
+final class RepositoryName private[sbt] (name: String) extends NotNull
+{
+	def at (location: String) =
+	{
+		nonEmpty(location, "Repository location")
+		new MavenRepository(name, location)
+	}
+}
+
+import scala.collection.{Map, mutable}
+/** A Project that determines its tasks by reflectively finding all vals with a type
+* that conforms to Task.*/
+trait ReflectiveTasks extends Project
+{
+	def tasks: Map[String, Task] = reflectiveTaskMappings
+	def reflectiveTaskMappings : Map[String, Task] = Reflective.reflectiveMappings[Task](this)
+}
+/** A Project that determines its method tasks by reflectively finding all vals with a type
+* that conforms to MethodTask.*/
+trait ReflectiveMethods extends Project
+{
+	def methods: Map[String, MethodTask] = reflectiveMethodMappings
+	def reflectiveMethodMappings : Map[String, MethodTask] = Reflective.reflectiveMappings[MethodTask](this)
+}
+/** A Project that determines its dependencies on other projects by reflectively
+* finding all vals with a type that conforms to Project.*/
+trait ReflectiveModules extends Project
+{
+	override def subProjects: Map[String, Project] = reflectiveModuleMappings
+	def reflectiveModuleMappings : Map[String, Project] = Reflective.reflectiveMappings[Project](this)
+}
+/** A Project that determines its dependencies on other projects by reflectively
+* finding all vals with a type that conforms to Project and determines its tasks
+* by reflectively finding all vals with a type that conforms to Task.*/
+trait ReflectiveProject extends ReflectiveModules with ReflectiveTasks with ReflectiveMethods
+
+/** This Project subclass is used to contain other projects as dependencies.*/
+class ParentProject(val info: ProjectInfo) extends BasicDependencyProject
+{
+	def dependencies = info.dependencies ++ subProjects.values.toList
+	/** The directories to which a project writes are listed here and is used
+	* to check a project and its dependencies for collisions.*/
+	override def outputDirectories = managedDependencyPath :: outputPath :: Nil
+	def fullUnmanagedClasspath(config: Configuration) = unmanagedClasspath
+}
+
+object Reflective
+{
+	def reflectiveMappings[T](obj: AnyRef)(implicit m: scala.reflect.Manifest[T]): Map[String, T] =
+	{
+		val mappings = new mutable.OpenHashMap[String, T]
+		for ((name, value) <- ReflectUtilities.allVals[T](obj))
+			mappings(ReflectUtilities.transformCamelCase(name, '-')) = value
+		mappings
+	}
+}
+
+/** A Project that determines its library dependencies by reflectively finding all vals with a type
+* that conforms to ModuleID.*/
+trait ReflectiveLibraryDependencies extends ManagedProject
+{
+	def excludeIDs: Iterable[ModuleID] = projectID :: Nil
+	def libraryDependencies: Set[ModuleID] = reflectiveLibraryDependencies
+	def reflectiveLibraryDependencies : Set[ModuleID] = Set[ModuleID](Reflective.reflectiveMappings[ModuleID](this).values.toList: _*) -- excludeIDs
+}
+
+trait ReflectiveConfigurations extends Project
+{
+	def ivyConfigurations: Iterable[Configuration] = reflectiveIvyConfigurations
+	def reflectiveIvyConfigurations: Set[Configuration] = Configurations.removeDuplicates(Reflective.reflectiveMappings[Configuration](this).values.toList)
+}
+trait ReflectiveArtifacts extends ManagedProject
+{
+	def managedStyle: ManagedType
+	def artifacts: Set[Artifact] =
+	{
+		val reflective = reflectiveArtifacts
+		managedStyle match
+		{
+			case Maven =>reflective ++ List(Artifact(artifactID, "pom", "pom"))
+			case Ivy => reflective
+		}
+	}
+	def reflectiveArtifacts: Set[Artifact] = Set(Reflective.reflectiveMappings[Artifact](this).values.toList: _*)
+}
+/** A Project that determines its library dependencies by reflectively finding all vals with a type
+* that conforms to ModuleID.*/
+trait ReflectiveRepositories extends Project
+{
+	def repositories: Set[Resolver] =
+	{
+		val reflective = Set[Resolver](reflectiveRepositories.values.toList: _*)
+		info.parent match
+		{
+			case Some(p: ReflectiveRepositories) => p.repositories ++ reflective
+			case None => reflective
+		}
+	}
+	def reflectiveRepositories: Map[String, Resolver] = Reflective.reflectiveMappings[Resolver](this)
+}
+
+trait ReflectiveManagedProject extends ReflectiveProject with ReflectiveArtifacts with ReflectiveRepositories with ReflectiveLibraryDependencies with ReflectiveConfigurations
\ No newline at end of file
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
new file mode 100644
index 000000000..0cf3a82a1
--- /dev/null
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -0,0 +1,210 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah, David MacIver
+ */
+package sbt
+
+import BasicProjectPaths._
+
+sealed abstract class InternalProject extends Project
+{
+	override final def historyPath = None
+	override def tasks: Map[String, Task] = Map.empty
+	override final protected def disableCrossPaths = false
+	override final def shouldCheckOutputDirectories = false
+}
+private sealed abstract class BasicBuilderProject extends InternalProject with SimpleScalaProject
+{
+	def sourceFilter = "*.scala" | "*.java"
+	def jarFilter: NameFilter = "*.jar"
+	def compilePath = outputPath / DefaultMainCompileDirectoryName
+	def mainResourcesPath = path(DefaultResourcesDirectoryName)
+	def dependencyPath = path(DefaultDependencyDirectoryName)
+	def libraries = descendents(dependencyPath, jarFilter)
+	override final def dependencies = Nil
+	
+	protected final def logInfo(messages: String*): Unit = atInfo { messages.foreach(message => log.info(message)) }
+	protected final def atInfo(action: => Unit)
+	{
+		val oldLevel = log.getLevel
+		log.setLevel(Level.Info)
+		action
+		log.setLevel(oldLevel)
+	}
+	
+	def projectClasspath = compilePath +++ libraries +++ sbtJarPath
+	def sbtJarPath = Path.lazyPathFinder { Path.fromFile(FileUtilities.sbtJar) :: Nil }
+		
+	abstract class BuilderCompileConfiguration extends AbstractCompileConfiguration
+	{
+		def projectPath = info.projectPath
+		def log = BasicBuilderProject.this.log
+		def options = (Deprecation :: Unchecked :: Nil).map(_.asString)
+		def javaOptions = Nil
+		def maxErrors = ScalaProject.DefaultMaximumCompileErrors
+		def compileOrder = CompileOrder.Mixed
+	}
+	def definitionCompileConfiguration =
+		new BuilderCompileConfiguration
+		{
+			def label = "builder"
+			def sources = (info.projectPath * sourceFilter) +++ path(DefaultSourceDirectoryName).descendentsExcept(sourceFilter, defaultExcludes)
+			def outputDirectory = compilePath
+			def classpath = projectClasspath
+			def analysisPath = outputPath / DefaultMainAnalysisDirectoryName
+		}
+		
+	def tpe: String
+
+	val definitionCompileConditional = new BuilderCompileConditional(definitionCompileConfiguration, tpe)
+	final class BuilderCompileConditional(config: BuilderCompileConfiguration, tpe: String) extends AbstractCompileConditional(config)
+	{
+		type AnalysisType = BuilderCompileAnalysis
+		override protected def constructAnalysis(analysisPath: Path, projectPath: Path, log: Logger) =
+			new BuilderCompileAnalysis(analysisPath, projectPath, log)
+		override protected def execute(cAnalysis: ConditionalAnalysis): Option[String] =
+		{
+			if(cAnalysis.dirtySources.isEmpty)
+				None
+			else
+			{
+				definitionChanged()
+				logInfo(
+					"Recompiling " + tpe + "...",
+					 "\t" + cAnalysis.toString)
+				super.execute(cAnalysis)
+			}
+		}
+		protected def analysisCallback: AnalysisCallback =
+			new BasicAnalysisCallback(info.projectPath, List(Project.ProjectClassName), analysis)
+			{
+				def foundApplication(sourcePath: Path, className: String)  {}
+				def foundSubclass(sourcePath: Path, subclassName: String, superclassName: String, isModule: Boolean)
+				{
+					if(superclassName == Project.ProjectClassName && !isModule)
+					{
+						log.debug("Found " + tpe + " " + subclassName)
+						analysis.addProjectDefinition(sourcePath, subclassName)
+					}
+				}
+			}
+	}
+	protected def definitionChanged() {}
+	lazy val compile = compileTask
+	def compileTask = task { definitionCompileConditional.run }
+	
+	def projectDefinition: Either[String, Option[String]] =
+	{
+		definitionCompileConditional.analysis.allProjects.toList match
+		{
+			case Nil => 
+				log.debug("No " + tpe + "s detected using default project.")
+				Right(None)
+			case singleDefinition :: Nil => Right(Some(singleDefinition))
+			case multipleDefinitions =>Left(multipleDefinitions.mkString("Multiple " + tpe + "s detected: \n\t","\n\t","\n"))
+		}
+	}
+	override final def methods = Map.empty
+}
+/** The project definition used to build project definitions. */
+private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, override protected val logImpl: Logger) extends BasicBuilderProject
+{
+	private lazy val pluginProject =
+	{
+		if(pluginPath.exists)
+			Some(new PluginBuilderProject(ProjectInfo(pluginPath.asFile, Nil, None)))
+		else
+			None
+	}
+	override def projectClasspath = super.projectClasspath +++ pluginProject.map(_.pluginClasspath).getOrElse(Path.emptyPathFinder)
+	def tpe = "project definition"
+
+	override def compileTask = super.compileTask dependsOn(pluginProject.map(_.syncPlugins).toList : _*)
+		
+	final class PluginBuilderProject(val info: ProjectInfo) extends BasicBuilderProject
+	{
+		override protected def logImpl = BuilderProject.this.log
+		val pluginUptodate = propertyOptional[Boolean](false)
+		def tpe = "plugin definition"
+		def managedSourcePath = path(BasicDependencyPaths.DefaultManagedSourceDirectoryName)
+		def managedDependencyPath = crossPath(BasicDependencyPaths.DefaultManagedDirectoryName)
+		override protected def definitionChanged() { setUptodate(false) }
+		private def setUptodate(flag: Boolean)
+		{
+			pluginUptodate() = flag
+			saveEnvironment()
+		}
+		
+		private def pluginTask(f: => Option[String]) = task { if(!pluginUptodate.value) f else None }
+		
+		lazy val syncPlugins = pluginTask(sync()) dependsOn(extractSources)
+		lazy val extractSources = pluginTask(extract()) dependsOn(update)
+		lazy val update = pluginTask(loadAndUpdate()) dependsOn(compile)
+		
+		private def sync() = pluginCompileConditional.run orElse { setUptodate(true); None }
+		private def extract() =
+		{
+			FileUtilities.clean(managedSourcePath, log) orElse
+			Control.lazyFold(plugins.get.toList) { jar =>
+				Control.thread(FileUtilities.unzip(jar, extractTo(jar), sourceFilter, log)) { extracted =>
+					if(!extracted.isEmpty)
+						logInfo("\tExtracted source plugin " + jar + " ...")
+					None
+				}
+			}
+		}
+		private def loadAndUpdate() =
+		{
+			Control.thread(projectDefinition) {
+				case Some(definition) =>
+					logInfo("\nUpdating plugins")
+					val pluginInfo = ProjectInfo(info.projectPath.asFile, Nil, None)
+					val pluginBuilder = Project.constructProject(pluginInfo, Project.getProjectClass[PluginDefinition](definition, projectClasspath))
+					pluginBuilder.projectName() = "Plugin builder"
+					pluginBuilder.projectVersion() = OpaqueVersion("1.0")
+					val result = pluginBuilder.update.run
+					if(result.isEmpty)
+					{
+						atInfo {
+							log.success("Plugins updated successfully.")
+							log.info("")
+						}
+					}
+					result
+				case None => None
+			}
+		}
+		def extractTo(jar: Path) =
+		{
+			val name = jar.asFile.getName
+			managedSourcePath / name.substring(0, name.length - ".jar".length)
+		}
+		def plugins = descendents(managedDependencyPath, jarFilter)
+		def pluginClasspath = plugins +++ pluginCompileConfiguration.outputDirectory
+		
+		lazy val pluginCompileConditional = new BuilderCompileConditional(pluginCompileConfiguration, "plugin")
+		lazy val pluginCompileConfiguration =
+			new BuilderCompileConfiguration
+			{
+				def label = "plugin builder"
+				def sources = descendents(managedSourcePath, sourceFilter)
+				def outputDirectory = outputPath / "plugin-classes"
+				def classpath = sbtJarPath
+				def analysisPath = outputPath / "plugin-analysis"
+			}
+	}
+}
+class PluginDefinition(val info: ProjectInfo) extends InternalProject with BasicManagedProject
+{
+	override final def outputPattern = "[artifact](-[revision]).[ext]"
+	override final val tasks = Map("update" -> update)
+	override def projectClasspath(config: Configuration) = Path.emptyPathFinder
+	override def dependencies = info.dependencies
+}
+class PluginProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
+	override def packageAction = packageSrc
+	override def packageSrcJar = jarPath
+	override def useMavenConfigurations = true
+	override def managedStyle = ManagedStyle.Maven
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ClasspathUtilities.scala b/src/main/scala/sbt/ClasspathUtilities.scala
new file mode 100644
index 000000000..48dc42ade
--- /dev/null
+++ b/src/main/scala/sbt/ClasspathUtilities.scala
@@ -0,0 +1,197 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import java.net.{URI, URL, URLClassLoader}
+import java.util.Collections
+import scala.collection.Set
+import scala.collection.mutable.{HashSet, ListBuffer}
+
+private[sbt] object ClasspathUtilities
+{
+	def toClasspath(finder: PathFinder): Array[URL] = toClasspath(finder.get)
+	def toClasspath(paths: Iterable[Path]): Array[URL] = paths.map(_.asURL).toSeq.toArray
+	def toLoader(finder: PathFinder): ClassLoader = toLoader(finder.get)
+	def toLoader(paths: Iterable[Path]): ClassLoader = new URLClassLoader(toClasspath(paths), getClass.getClassLoader)
+	
+	def isArchive(path: Path): Boolean = isArchive(path.asFile)
+	def isArchive(file: File): Boolean = isArchiveName(file.getName)
+	def isArchiveName(fileName: String) = fileName.endsWith(".jar") || fileName.endsWith(".zip")
+	// Partitions the given classpath into (jars, directories)
+	def separate(paths: Iterable[File]): (Iterable[File], Iterable[File]) = paths.partition(isArchive)
+	// Partitions the given classpath into (jars, directories)
+	def separatePaths(paths: Iterable[Path]) = separate(paths.map(_.asFile.getCanonicalFile))
+	private[sbt] def buildSearchPaths(classpath: Iterable[Path]): (wrap.Set[File], wrap.Set[File]) =
+	{
+		val (jars, dirs) = separatePaths(classpath)
+		(linkedSet(jars ++ extraJars.toList), linkedSet(dirs ++ extraDirs.toList))
+	}
+	private[sbt] def onClasspath(classpathJars: wrap.Set[File], classpathDirectories: wrap.Set[File], file: File): Boolean =
+	{
+		val f = file.getCanonicalFile
+		if(ClasspathUtilities.isArchive(f))
+			classpathJars.contains(f)
+		else
+			classpathDirectories.toList.find(Path.relativize(_, f).isDefined).isDefined
+	}
+	
+	/** Returns all entries in 'classpath' that correspond to a compiler plugin.*/
+	def compilerPlugins(classpath: Iterable[Path]): Iterable[File] =
+	{
+		val loader = new URLClassLoader(classpath.map(_.asURL).toList.toArray)
+		wrap.Wrappers.toList(loader.getResources("scalac-plugin.xml")).flatMap(asFile)
+	}
+	/** Converts the given URL to a File.  If the URL is for an entry in a jar, the File for the jar is returned. */
+	private[sbt] def asFile(url: URL) =
+	{
+		try
+		{
+			url.getProtocol match
+			{
+				case "file" => new File(url.toURI) :: Nil
+				case "jar" =>
+					val path = url.getPath
+					val end = path.indexOf('!')
+					new File(new URI(if(end == -1) path else path.substring(0, end))) :: Nil
+				case _ => Nil
+			}
+		}
+		catch { case e: Exception => Nil }
+	}
+	
+	private lazy val (extraJars, extraDirs) =
+	{
+		import scala.tools.nsc.GenericRunnerCommand
+		val settings = (new GenericRunnerCommand(Nil, message => error(message))).settings
+		val bootPaths = FileUtilities.pathSplit(settings.bootclasspath.value).map(p => new File(p)).toList
+		val (bootJars, bootDirs) = separate(bootPaths)
+		val extJars =
+		{
+			val buffer = new ListBuffer[File]
+			def findJars(dir: File)
+			{
+				buffer ++= dir.listFiles(new SimpleFileFilter(isArchive))
+				for(dir <- dir.listFiles(DirectoryFilter))
+					findJars(dir)
+			}
+			for(path <- FileUtilities.pathSplit(settings.extdirs.value); val dir = new File(path) if dir.isDirectory)
+				findJars(dir)
+			buffer.readOnly.map(_.getCanonicalFile)
+		}
+		(linkedSet(extJars ++ bootJars), linkedSet(bootDirs))
+	}
+	private def linkedSet[T](s: Iterable[T]): wrap.Set[T] =
+	{
+		val set = new wrap.MutableSetWrapper(new java.util.LinkedHashSet[T])
+		set ++= s
+		set.readOnly
+	}
+}
+
+private abstract class LoaderBase(urls: Array[URL], parent: ClassLoader) extends URLClassLoader(urls, parent) with NotNull
+{
+	require(parent != null) // included because a null parent is legitimate in Java
+	@throws(classOf[ClassNotFoundException])
+	override final def loadClass(className: String, resolve: Boolean): Class[_] =
+	{
+		val loaded = findLoadedClass(className)
+		val found =
+			if(loaded == null)
+				doLoadClass(className)
+			else
+				loaded
+			
+		if(resolve)
+			resolveClass(found)
+		found
+	}
+	protected def doLoadClass(className: String): Class[_]
+	protected final def selfLoadClass(className: String): Class[_] = super.loadClass(className, false)
+}
+private class IntermediateLoader(urls: Array[URL], parent: ClassLoader) extends LoaderBase(urls, parent) with NotNull
+{
+	def doLoadClass(className: String): Class[_] =
+	{
+		// if this loader is asked to load an sbt class, it must be because the project we are building is sbt itself,
+		 // so we want to load the version of classes on the project classpath, not the parent
+		if(className.startsWith(Loaders.SbtPackage))
+			findClass(className)
+		else
+			selfLoadClass(className)
+	}
+}
+/** Delegates class loading to `parent` for all classes included by `filter`.  An attempt to load classes excluded by `filter`
+* results in a `ClassNotFoundException`.*/
+private class FilteredLoader(parent: ClassLoader, filter: ClassFilter) extends ClassLoader(parent) with NotNull
+{
+	require(parent != null) // included because a null parent is legitimate in Java
+	def this(parent: ClassLoader, excludePackages: Iterable[String]) = this(parent, new ExcludePackagesFilter(excludePackages))
+	
+	@throws(classOf[ClassNotFoundException])
+	override final def loadClass(className: String, resolve: Boolean): Class[_] =
+	{
+		if(filter.include(className))
+			super.loadClass(className, resolve)
+		else
+			throw new ClassNotFoundException(className)
+	}
+}
+private class SelectiveLoader(urls: Array[URL], parent: ClassLoader, filter: ClassFilter) extends URLClassLoader(urls, parent) with NotNull
+{
+	require(parent != null) // included because a null parent is legitimate in Java
+	def this(urls: Array[URL], parent: ClassLoader, includePackages: Iterable[String]) = this(urls, parent, new IncludePackagesFilter(includePackages))
+	
+	@throws(classOf[ClassNotFoundException])
+	override final def loadClass(className: String, resolve: Boolean): Class[_] =
+	{
+		if(filter.include(className))
+			super.loadClass(className, resolve)
+		else
+		{
+			val loaded = parent.loadClass(className)
+			if(resolve)
+				resolveClass(loaded)
+			loaded
+		}
+	}
+}
+private trait ClassFilter
+{
+	def include(className: String): Boolean
+}
+private abstract class PackageFilter(packages: Iterable[String]) extends ClassFilter
+{
+	require(packages.forall(_.endsWith(".")))
+	protected final def matches(className: String): Boolean = packages.exists(className.startsWith)
+}
+private class ExcludePackagesFilter(exclude: Iterable[String]) extends PackageFilter(exclude)
+{
+	def include(className: String): Boolean = !matches(className)
+}
+private class IncludePackagesFilter(include: Iterable[String]) extends PackageFilter(include)
+{
+	def include(className: String): Boolean = matches(className)
+}
+
+private class LazyFrameworkLoader(runnerClassName: String, urls: Array[URL], parent: ClassLoader, grandparent: ClassLoader)
+	extends LoaderBase(urls, parent) with NotNull
+{
+	def doLoadClass(className: String): Class[_] =
+	{
+		if(Loaders.isNestedOrSelf(className, runnerClassName))
+			findClass(className)
+		else if(Loaders.isSbtClass(className)) // we circumvent the parent loader because we know that we want the
+			grandparent.loadClass(className)              // version of sbt that is currently the builder (not the project being built)
+		else
+			parent.loadClass(className)
+	}
+}
+private object Loaders
+{
+	val SbtPackage = "sbt."
+	def isNestedOrSelf(className: String, checkAgainst: String) =
+		className == checkAgainst || className.startsWith(checkAgainst + "$")
+	def isSbtClass(className: String) = className.startsWith(Loaders.SbtPackage)
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
new file mode 100644
index 000000000..3dd80ec86
--- /dev/null
+++ b/src/main/scala/sbt/Compile.scala
@@ -0,0 +1,279 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+object CompileOrder extends Enumeration
+{
+	val Mixed, JavaThenScala, ScalaThenJava = Value
+}
+sealed abstract class CompilerCore
+{
+	val ClasspathOptionString = "-classpath"
+	val OutputOptionString = "-d"
+	
+	// Returns false if there were errors, true if there were not.
+	protected def process(args: List[String], log: Logger): Boolean
+	// Returns false if there were errors, true if there were not.
+	protected def processJava(args: List[String], log: Logger): Boolean = true
+	def actionStartMessage(label: String): String
+	def actionNothingToDoMessage: String
+	def actionSuccessfulMessage: String
+	def actionUnsuccessfulMessage: String
+
+	final def apply(label: String, sources: Iterable[Path], classpathString: String, outputDirectory: Path, options: Seq[String], log: Logger): Option[String] =
+		apply(label, sources, classpathString, outputDirectory, options, Nil, CompileOrder.Mixed, log)
+	final def apply(label: String, sources: Iterable[Path], classpathString: String, outputDirectory: Path, options: Seq[String], javaOptions: Seq[String], order: CompileOrder.Value, log: Logger): Option[String] =
+	{
+		log.info(actionStartMessage(label))
+		val classpathOption: List[String] =
+			if(classpathString.isEmpty)
+				Nil
+			else
+				List(ClasspathOptionString, classpathString)
+		val outputDir = outputDirectory.asFile
+		FileUtilities.createDirectory(outputDir, log) orElse
+		{
+			val classpathAndOut: List[String] = OutputOptionString :: outputDir.getAbsolutePath :: classpathOption
+			
+			Control.trapUnit("Compiler error: ", log)
+			{
+				val sourceList = sources.map(_.asFile.getAbsolutePath).toList
+				if(sourceList.isEmpty)
+				{
+					log.info(actionNothingToDoMessage)
+					None
+				}
+				else
+				{
+					def filteredSources(extension: String) = sourceList.filter(_.endsWith(extension))
+					def compile(label: String, sources: List[String], options: Seq[String])(process: (List[String], Logger) => Boolean) =
+					{
+						if(sources.isEmpty)
+						{
+							log.debug("No "+label+" sources to compile.")
+							true
+						}
+						else
+						{
+							val arguments = (options ++ classpathAndOut ++ sources).toList
+							log.debug(label + " arguments: " + arguments.mkString(" "))
+							process(arguments, log)
+						}
+					}
+					def scalaCompile = () =>
+					{
+						val scalaSourceList = if(order == CompileOrder.Mixed) sourceList else filteredSources(".scala")
+						compile("Scala", scalaSourceList, options)(process)
+					}
+					def javaCompile = () =>
+					{
+						val javaSourceList = filteredSources(".java")
+						compile("Java", javaSourceList, javaOptions)(processJava)
+					}
+					
+					val (first, second) = if(order == CompileOrder.JavaThenScala) (javaCompile, scalaCompile) else (scalaCompile, javaCompile)
+					if(first() && second())
+					{
+						log.info(actionSuccessfulMessage)
+						None
+					}
+					else
+						Some(actionUnsuccessfulMessage)
+				}
+			}
+		}
+	}
+}
+
+sealed abstract class CompilerBase extends CompilerCore
+{
+	def actionStartMessage(label: String) = "Compiling " + label + " sources..."
+	val actionNothingToDoMessage = "Nothing to compile."
+	val actionSuccessfulMessage = "Compilation successful."
+	val actionUnsuccessfulMessage = "Compilation unsuccessful."
+}
+final class ForkCompile(config: ForkScalaCompiler) extends CompilerBase
+{
+	import java.io.File
+	protected def process(arguments: List[String], log: Logger) =
+		Fork.scalac(config.javaHome, config.compileJVMOptions, config.scalaJars, arguments, log) == 0
+	override protected def processJava(args: List[String], log: Logger) =
+		Fork.javac(config.javaHome, args, log) == 0
+}
+object ForkCompile
+{
+	def apply(config: ForkScalaCompiler, conditional: CompileConditional) =
+	{
+		import conditional.config.{compileOrder, classpath, javaOptions, label, log, options, outputDirectory, sources}
+		// recompile only if any sources were modified after any classes or no classes exist
+		val sourcePaths = sources.get
+		val newestSource = (0L /: sourcePaths)(_ max _.lastModified)
+		val products = (outputDirectory  ** GlobFilter("*.class")).get
+		val oldestClass = (java.lang.Long.MAX_VALUE /: products)(_ min _.lastModified)
+		if(products.isEmpty || newestSource > oldestClass)
+		{
+			// full recompile, since we are not doing proper dependency tracking
+			FileUtilities.clean(outputDirectory :: Nil, log)
+			val compiler = new ForkCompile(config)
+			FileUtilities.createDirectory(outputDirectory.asFile, log)
+			compiler(label, sourcePaths, Path.makeString(classpath.get), outputDirectory, options, javaOptions, compileOrder, log)
+		}
+		else
+		{
+			log.info("Compilation up to date.")
+			None
+		}
+	}
+}
+
+// The following code is based on scala.tools.nsc.Main and scala.tools.nsc.ScalaDoc
+// Copyright 2005-2008 LAMP/EPFL
+// Original author: Martin Odersky
+
+final class Compile(maximumErrors: Int) extends CompilerBase
+{
+	protected def process(arguments: List[String], log: Logger) =
+	{
+		import scala.tools.nsc.{CompilerCommand, FatalError, Global, Settings, reporters, util}
+		import util.FakePos
+		var reporter = new LoggerReporter(maximumErrors, log)
+		val settings = new Settings(reporter.error)
+		val command = new CompilerCommand(arguments, settings, error, false)
+		
+		object compiler extends Global(command.settings, reporter)
+		if(!reporter.hasErrors)
+		{
+			val run = new compiler.Run
+			run compile command.files
+			reporter.printSummary()
+		}
+		!reporter.hasErrors
+	}
+	override protected def processJava(args: List[String], log: Logger) =
+		(Process("javac", args) ! log) == 0
+}
+final class Scaladoc(maximumErrors: Int) extends CompilerCore
+{
+	protected def process(arguments: List[String], log: Logger) =
+	{
+		import scala.tools.nsc.{doc, CompilerCommand, FatalError, Global, reporters, util}
+		import util.FakePos
+		val reporter = new LoggerReporter(maximumErrors, log)
+		val docSettings: doc.Settings = new doc.Settings(reporter.error)
+		val command = new CompilerCommand(arguments, docSettings, error, false)
+		object compiler extends Global(command.settings, reporter)
+		{
+			override val onlyPresentation = true
+		}
+		if(!reporter.hasErrors)
+		{
+			val run = new compiler.Run
+			run compile command.files
+			val generator = new doc.DefaultDocDriver
+			{
+				lazy val global: compiler.type = compiler
+				lazy val settings = docSettings
+			}
+			generator.process(run.units)
+			reporter.printSummary()
+		}
+		!reporter.hasErrors
+	}
+	def actionStartMessage(label: String) = "Generating API documentation for " + label + " sources..."
+	val actionNothingToDoMessage = "No sources specified."
+	val actionSuccessfulMessage = "API documentation generation successful."
+	def actionUnsuccessfulMessage = "API documentation generation unsuccessful."
+}
+
+// The following code is based on scala.tools.nsc.reporters.{AbstractReporter, ConsoleReporter}
+// Copyright 2002-2008 LAMP/EPFL
+// Original author: Martin Odersky
+final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.nsc.reporters.Reporter
+{
+	import scala.tools.nsc.util.{FakePos,Position}
+	private val positions = new scala.collection.mutable.HashMap[Position, Severity]
+	
+	def error(msg: String) { error(FakePos("scalac"), msg) }
+
+	def printSummary()
+	{
+		if(WARNING.count > 0)
+			log.warn(countElementsAsString(WARNING.count, "warning") + " found")
+		if(ERROR.count > 0)
+			log.error(countElementsAsString(ERROR.count, "error") + " found")
+	}
+	
+	def display(pos: Position, msg: String, severity: Severity)
+	{
+		severity.count += 1
+		if(severity != ERROR || maximumErrors < 0 || severity.count <= maximumErrors)
+			print(severityToLevel(severity), pos, msg)
+	}
+	private def severityToLevel(severity: Severity): Level.Value =
+		severity match
+		{
+			case ERROR => Level.Error
+			case WARNING => Level.Warn
+			case INFO => Level.Info
+		}
+	
+	private def print(level: Level.Value, posIn: Position, msg: String)
+	{
+		if(posIn == null)
+			log.log(level, msg)
+		else
+		{
+			val pos = posIn.inUltimateSource(posIn.source.getOrElse(null))
+			def message =
+			{
+				val sourcePrefix =
+					pos match
+					{
+						case FakePos(msg) => msg + " "
+						case _ => pos.source.map(_.file.path).getOrElse("")
+					}
+				val lineNumberString = pos.line.map(line => ":" + line + ":").getOrElse(":") + " "
+				sourcePrefix + lineNumberString + msg
+			}
+			log.log(level, message)
+			if (!pos.line.isEmpty)
+			{
+				log.log(level, pos.lineContent.stripLineEnd) // source line with error/warning
+				for(column <- pos.column if column > 0) // pointer to the column position of the error/warning
+					log.log(level, (" " * (column-1)) + '^')
+			}
+		}
+	}
+	override def reset =
+	{
+		super.reset
+		positions.clear
+	}
+
+	protected def info0(pos: Position, msg: String, severity: Severity, force: Boolean)
+	{
+		severity match
+		{
+			case WARNING | ERROR =>
+			{
+				if(!testAndLog(pos, severity))
+					display(pos, msg, severity)
+			}
+			case _ => display(pos, msg, severity)
+		}
+	}
+	
+	private def testAndLog(pos: Position, severity: Severity): Boolean =
+	{
+		if(pos == null || pos.offset.isEmpty)
+			false
+		else if(positions.get(pos).map(_ >= severity).getOrElse(false))
+			true
+		else
+		{
+			positions(pos) = severity
+			false
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
new file mode 100644
index 000000000..fe757a469
--- /dev/null
+++ b/src/main/scala/sbt/Conditional.scala
@@ -0,0 +1,381 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+trait Conditional[Source, Product, External] extends NotNull
+{
+	type AnalysisType <: TaskAnalysis[Source, Product, External]
+	val analysis: AnalysisType = loadAnalysis
+	
+	protected def loadAnalysis: AnalysisType
+	protected def log: Logger
+
+	protected def productType: String
+	protected def productTypePlural: String
+	
+	protected def sourcesToProcess: Iterable[Source]
+	
+	protected def sourceExists(source: Source): Boolean
+	protected def sourceLastModified(source: Source): Long
+	
+	protected def productExists(product: Product): Boolean
+	protected def productLastModified(product: Product): Long
+	
+	protected def externalInfo(externals: Iterable[External]): Iterable[(External, ExternalInfo)]
+	
+	protected def execute(cAnalysis: ConditionalAnalysis): Option[String]
+	
+	final case class ExternalInfo(available: Boolean, lastModified: Long) extends NotNull
+	trait ConditionalAnalysis extends NotNull
+	{
+		def dirtySources: Iterable[Source]
+		def cleanSources: Iterable[Source]
+		def directlyModifiedSourcesCount: Int
+		def invalidatedSourcesCount: Int
+		def removedSourcesCount: Int
+	}
+	
+	final def run =
+	{
+		val result = execute(analyze)
+		processingComplete(result.isEmpty)
+		result
+	}
+	private def analyze =
+	{
+		import scala.collection.mutable.HashSet
+		
+		val sourcesSnapshot = sourcesToProcess
+		val removedSources = new HashSet[Source]
+		removedSources ++= analysis.allSources
+		removedSources --= sourcesSnapshot
+		val removedCount = removedSources.size
+		for(removed <- removedSources)
+			analysis.removeDependent(removed)
+		
+		val unmodified = new HashSet[Source]
+		val modified = new HashSet[Source]
+		
+		for(source <- sourcesSnapshot)
+		{
+			if(isSourceModified(source))
+			{
+				log.debug("Source " + source + " directly modified.")
+				modified += source
+			}
+			else
+			{
+				log.debug("Source " + source + " unmodified.")
+				unmodified += source
+			}
+		}
+		val directlyModifiedCount = modified.size
+		for((external, info) <- externalInfo(analysis.allExternals))
+		{
+			val dependentSources = analysis.externalDependencies(external).getOrElse(Set.empty)
+			if(info.available)
+			{
+				val dependencyLastModified = info.lastModified
+				for(dependentSource <- dependentSources; dependentProducts <- analysis.products(dependentSource))
+				{
+					dependentProducts.find(p => productLastModified(p) < dependencyLastModified) match
+					{
+						case Some(modifiedProduct) =>
+						{
+							log.debug(productType + " " + modifiedProduct + " older than external dependency " + external)
+							unmodified -= dependentSource
+							modified += dependentSource
+						}
+						case None => ()
+					}
+				}
+			}
+			else
+			{
+				log.debug("External dependency " + external + " not found.")
+				unmodified --= dependentSources
+				modified ++= dependentSources
+				analysis.removeExternalDependency(external)
+			}
+		}
+		
+		val handled = new scala.collection.mutable.HashSet[Source]
+		val transitive = !java.lang.Boolean.getBoolean("sbt.intransitive")
+		def markModified(changed: Iterable[Source]) { for(c <- changed if !handled.contains(c)) markSourceModified(c) }
+		def markSourceModified(src: Source)
+		{
+			unmodified -= src
+			modified += src
+			handled += src
+			if(transitive)
+				markDependenciesModified(src)
+		}
+		def markDependenciesModified(src: Source) { analysis.removeDependencies(src).map(markModified) }
+
+		markModified(modified.toList)
+		if(transitive)
+			removedSources.foreach(markDependenciesModified)
+		
+		for(changed <- removedSources ++ modified)
+			analysis.removeSource(changed)
+		
+		new ConditionalAnalysis
+		{
+			def dirtySources = wrap.Wrappers.readOnly(modified)
+			def cleanSources = wrap.Wrappers.readOnly(unmodified)
+			def directlyModifiedSourcesCount = directlyModifiedCount
+			def invalidatedSourcesCount = dirtySources.size - directlyModifiedCount
+			def removedSourcesCount = removedCount
+			override def toString =
+			{
+				"  Source analysis: " + directlyModifiedSourcesCount + " new/modified, " +
+					invalidatedSourcesCount + " indirectly invalidated, " +
+					removedSourcesCount + " removed."
+			}
+		}
+	}
+	
+	protected def checkLastModified = true
+	protected def noProductsImpliesModified = true
+	protected def isSourceModified(source: Source) =
+	{
+		analysis.products(source) match
+		{
+			case None =>
+			{
+				log.debug("New file " + source)
+				true
+			}
+			case Some(sourceProducts) =>
+			{
+				val sourceModificationTime = sourceLastModified(source)
+				def isOutofdate(p: Product) =
+					!productExists(p) || (checkLastModified && productLastModified(p) < sourceModificationTime)
+				
+				sourceProducts.find(isOutofdate) match
+				{
+					case Some(modifiedProduct) =>
+						log.debug("Outdated " + productType + ": " + modifiedProduct + " for source " + source)
+						true
+					case None =>
+						if(noProductsImpliesModified && sourceProducts.isEmpty)
+						{
+							// necessary for change detection that depends on last modified
+							log.debug("Source " + source + " has no products, marking it modified.")
+							true
+						}
+						else
+							false
+				}
+			}
+		}
+	}
+	protected def processingComplete(success: Boolean)
+	{
+		if(success)
+		{
+			analysis.save()
+			log.info("  Post-analysis: " + analysis.allProducts.toSeq.length + " " + productTypePlural + ".")
+		}
+		else
+			analysis.revert()
+	}
+}
+
+abstract class AbstractCompileConfiguration extends NotNull
+{
+	def label: String
+	def sources: PathFinder
+	def outputDirectory: Path
+	def classpath: PathFinder
+	def analysisPath: Path
+	def projectPath: Path
+	def log: Logger
+	def options: Seq[String]
+	def javaOptions: Seq[String]
+	def maxErrors: Int
+	def compileOrder: CompileOrder.Value
+}
+abstract class CompileConfiguration extends AbstractCompileConfiguration
+{
+	def testDefinitionClassNames: Iterable[String]
+}
+import java.io.File
+class CompileConditional(override val config: CompileConfiguration) extends AbstractCompileConditional(config)
+{
+	import config._
+	type AnalysisType = CompileAnalysis
+	protected def constructAnalysis(analysisPath: Path, projectPath: Path, log: Logger) =
+		new CompileAnalysis(analysisPath, projectPath, log)
+	protected def analysisCallback = new CompileAnalysisCallback
+	protected class CompileAnalysisCallback extends BasicCompileAnalysisCallback(projectPath, testDefinitionClassNames, analysis)
+	{
+		def foundSubclass(sourcePath: Path, subclassName: String, superclassName: String, isModule: Boolean)
+		{
+			analysis.addTest(sourcePath, TestDefinition(isModule, subclassName, superclassName))
+		}
+	}
+}
+abstract class AbstractCompileConditional(val config: AbstractCompileConfiguration) extends Conditional[Path, Path, File]
+{
+	import config._
+	type AnalysisType <: BasicCompileAnalysis
+	protected def loadAnalysis =
+	{
+		val a = constructAnalysis(analysisPath, projectPath, log)
+		for(errorMessage <- a.load())
+			error(errorMessage)
+		a
+	}
+	protected def constructAnalysis(analysisPath: Path, projectPath: Path, log: Logger): AnalysisType
+	
+	protected def log = config.log
+	
+	protected def productType = "class"
+	protected def productTypePlural = "classes"
+	protected def sourcesToProcess = sources.get
+	
+	protected def sourceExists(source: Path) = source.asFile.exists
+	protected def sourceLastModified(source: Path) = source.asFile.lastModified
+	
+	protected def productExists(product: Path) = product.asFile.exists
+	protected def productLastModified(product: Path) = product.asFile.lastModified
+	
+	protected def externalInfo(externals: Iterable[File]) =
+	{
+		val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get)
+		for(external <- externals) yield
+		{
+			val available = external.exists && ClasspathUtilities.onClasspath(classpathJars, classpathDirs, external)
+			if(!available)
+				log.debug("External " + external + (if(external.exists) " not on classpath." else " does not exist."))
+			(external, ExternalInfo(available, external.lastModified))
+		}
+	}
+	
+	import ChangeDetection.{LastModifiedOnly, HashOnly, HashAndLastModified, HashAndProductsExist}
+	protected def changeDetectionMethod: ChangeDetection.Value = HashAndProductsExist
+	override protected def checkLastModified = changeDetectionMethod != HashAndProductsExist
+	override protected def noProductsImpliesModified = changeDetectionMethod == LastModifiedOnly
+	override protected def isSourceModified(source: Path) =
+		changeDetectionMethod match
+		{
+			case HashAndLastModified | HashAndProductsExist =>
+				// behavior will differ because of checkLastModified
+				// hash modified must come first so that the latest hash is calculated for every source
+				hashModified(source) || super.isSourceModified(source)
+			case HashOnly => hashModified(source)
+			case LastModifiedOnly => super.isSourceModified(source)
+		}
+	
+	import scala.collection.mutable.{Buffer, ListBuffer}
+	private val newHashes: Buffer[(Path, Option[Array[Byte]])] = new ListBuffer
+	private def warnHashError(source: Path, message: String)
+	{
+		log.warn("Error computing hash for source " + source + ": " + message)
+		newHashes += ((source, None))
+	}
+	protected def hashModified(source: Path) =
+	{
+		source.isDirectory ||
+		(analysis.hash(source) match
+		{
+			case None =>
+				log.debug("Source " + source + " had no hash, marking modified.")
+				Hash(source, log).fold(err => warnHashError(source, err), newHash => newHashes += ((source, Some(newHash))))
+				true
+			case Some(oldHash) =>
+			{
+				Hash(source, log) match
+				{
+					case Left(err) =>
+						warnHashError(source, err)
+						log.debug("Assuming source is modified because of error.")
+						true
+					case Right(newHash) =>
+						newHashes += ((source, Some(newHash)))
+						val different = !(oldHash deepEquals newHash)
+						if(different)
+							log.debug("Hash for source " + source + " changed (was " + Hash.toHex(oldHash) +
+							", is now " + Hash.toHex(newHash) + "), marking modified.")
+						different
+				}
+			}
+		})
+	}
+	protected def execute(executeAnalysis: ConditionalAnalysis) =
+	{
+		log.info(executeAnalysis.toString)
+		finishHashes()
+		import executeAnalysis.dirtySources
+		
+		// the output directory won't show up in the classpath unless it exists, so do this before classpath.get
+		val outputDir = outputDirectory.asFile
+		FileUtilities.createDirectory(outputDir, log)
+		
+		val cp = classpath.get
+		if(!dirtySources.isEmpty)
+			checkClasspath(cp)
+		val classpathString = Path.makeString(cp)
+		val id = AnalysisCallback.register(analysisCallback)
+		val allOptions = (("-Xplugin:" + FileUtilities.sbtJar.getAbsolutePath) ::
+			("-P:sbt-analyzer:callback:" + id.toString) :: Nil) ++ options
+		val r = (new Compile(config.maxErrors))(label, dirtySources, classpathString, outputDirectory, allOptions, javaOptions, compileOrder, log)
+		AnalysisCallback.unregister(id)
+		if(log.atLevel(Level.Debug))
+		{
+			/** This checks that the plugin accounted for all classes in the output directory.*/
+			val classes = scala.collection.mutable.HashSet(analysis.allProducts.toSeq: _*)
+			var missed = 0
+			for(c <- (outputDirectory ** GlobFilter("*.class")).get)
+			{
+				if(!classes.contains(c))
+				{
+					missed += 1
+					log.debug("Missed class: " + c)
+				}
+			}
+			log.debug("Total missed classes: " + missed)
+		}
+		r
+	}
+	private def finishHashes()
+	{
+		if(changeDetectionMethod == LastModifiedOnly)
+			analysis.clearHashes()
+		else
+		{
+			for((path, hash) <- newHashes)
+			{
+				hash match
+				{
+					case None => analysis.clearHash(path)
+					case Some(hash) => analysis.setHash(path, hash)
+				}
+			}
+		}
+		newHashes.clear()
+	}
+	private def checkClasspath(cp: Iterable[Path])
+	{
+		import scala.collection.mutable.{HashMap, HashSet, Set}
+		val collisions = new HashMap[String, Set[Path]]
+		for(jar <- cp if ClasspathUtilities.isArchive(jar))
+			collisions.getOrElseUpdate(jar.asFile.getName, new HashSet[Path]) += jar
+		for((name, jars) <- collisions)
+		{
+			if(jars.size > 1)
+			{
+				log.warn("Possible duplicate classpath locations for jar " + name + ": ")
+				for(jar <- jars) log.warn("\t" + jar.absolutePath)
+			}
+		}
+	}
+	
+	protected def analysisCallback: AnalysisCallback
+}
+object ChangeDetection extends Enumeration
+{
+	val LastModifiedOnly, HashOnly, HashAndLastModified, HashAndProductsExist = Value
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Control.scala b/src/main/scala/sbt/Control.scala
new file mode 100644
index 000000000..8117fe29a
--- /dev/null
+++ b/src/main/scala/sbt/Control.scala
@@ -0,0 +1,73 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+/** The trap methods execute the provided code in a try block and handle a thrown exception.*/
+object Control
+{
+	def trap[T](errorMessagePrefix: => String, log: Logger)(execute: => Either[String, T]): Either[String, T] =
+		try { execute }
+		catch { case e => log.trace(e); Left(errorMessagePrefix + e.toString) }
+		
+	def trapAndFinally[T](errorMessagePrefix: => String, log: Logger)(execute: => Either[String, T])(doFinally: => Unit): Either[String, T] =
+		try { execute }
+		catch { case e => log.trace(e); Left(errorMessagePrefix + e.toString) }
+		finally { trapAndLog(log)(doFinally) }
+		
+	def trapUnit(errorMessagePrefix: => String, log: Logger)(execute: => Option[String]): Option[String] =
+		try { execute }
+		catch { case e => log.trace(e); Some(errorMessagePrefix + e.toString) }
+		
+	def trapUnitAndFinally(errorMessagePrefix: => String, log: Logger)(execute: => Option[String])(doFinally: => Unit): Option[String] =
+		try { execute }
+		catch { case e => log.trace(e); Some(errorMessagePrefix + e.toString) }
+		finally { trapAndLog(log)(doFinally) }
+		
+	def trap(execute: => Unit)
+	{
+		try { execute }
+		catch { case e: Exception => () }
+	}
+	def trapAndLog(log: Logger)(execute: => Unit)
+	{
+		try { execute }
+		catch { case e => log.trace(e); log.error(e.toString) }
+	}
+	def convertException[T](t: => T): Either[Exception, T] =
+	{
+		try { Right(t) }
+		catch { case e: Exception => Left(e) }
+	}
+	def convertErrorMessage[T](log: Logger)(t: => T): Either[String, T] =
+	{
+		try { Right(t) }
+		catch { case e: Exception => log.trace(e); Left(e.toString) }
+	}
+	
+	def getOrError[T](result: Either[String, T]): T = result.fold(error, x=>x)
+	final def lazyFold[T](list: List[T])(f: T => Option[String]): Option[String] =
+		list match
+		{
+			case Nil => None
+			case head :: tail =>
+				f(head) match
+				{
+					case None => lazyFold(tail)(f)
+					case x => x
+				}
+		}
+	final def lazyFold[T, S](list: List[T], value: S)(f: (S,T) => Either[String, S]): Either[String, S] =
+		list match
+		{
+			case Nil => Right(value)
+			case head :: tail =>
+				f(value, head) match
+				{
+					case Right(newValue) => lazyFold(tail, newValue)(f)
+					case x => x
+				}
+		}
+	def thread[T](e: Either[String, T])(f: T => Option[String]): Option[String] =
+		e.right.flatMap( t => f(t).toLeft(()) ).left.toOption
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Dag.scala b/src/main/scala/sbt/Dag.scala
new file mode 100644
index 000000000..8a18491e6
--- /dev/null
+++ b/src/main/scala/sbt/Dag.scala
@@ -0,0 +1,30 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 David MacIver
+ */
+package sbt;
+
+import scala.collection.mutable;
+
+trait Dag[Node <: Dag[Node]]{
+	self : Node =>
+
+	def dependencies : Iterable[Node]
+
+	def topologicalSort = {
+		val discovered = new mutable.HashSet[Node];
+		val finished = new wrap.MutableSetWrapper(new java.util.LinkedHashSet[Node])
+
+		def visit(dag : Node){
+			if (!discovered(dag)) {
+				discovered(dag) = true; 
+				dag.dependencies.foreach(visit);
+				finished += dag;
+			}
+		}
+
+		visit(self);
+	
+		finished.toList;
+	}
+}
+
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
new file mode 100644
index 000000000..554f98472
--- /dev/null
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -0,0 +1,458 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah, David MacIver
+ */
+package sbt
+
+/** The default project when no project is explicitly configured and the common base class for
+* configuring a project.*/
+class DefaultProject(val info: ProjectInfo) extends BasicScalaProject with MavenStyleScalaPaths
+class DefaultWebProject(val info: ProjectInfo) extends BasicWebScalaProject with MavenStyleWebScalaPaths
+
+
+import BasicScalaProject._
+import ScalaProject.{optionsAsString, javaOptionsAsString}
+import java.io.File
+import java.util.jar.Attributes
+
+/** This class defines concrete instances of actions from ScalaProject using overridable paths,
+* options, and configuration. */
+abstract class BasicScalaProject extends ScalaProject with BasicDependencyProject with ScalaPaths
+{
+	/** The explicitly specified class to be run by the 'run' action.
+	* See http://code.google.com/p/simple-build-tool/wiki/RunningProjectCode for details.*/
+	def mainClass: Option[String] = None
+	/** Gets the main class to use.  This is used by package and run to determine which main
+	* class to run or include as the Main-Class attribute.
+	* If `mainClass` is explicitly specified, it is used.  Otherwise, the main class is selected from
+	* the classes with a main method as automatically detected by the analyzer plugin.
+	* `promptIfMultipleChoices` controls the behavior when multiple main classes are detected.
+	* If true, it prompts the user to select which main class to use.  If false, it prints a warning
+	* and returns no main class.*/
+	def getMainClass(promptIfMultipleChoices: Boolean) =
+		mainClass orElse
+		{
+			val applications = mainCompileConditional.analysis.allApplications.toList
+			impl.SelectMainClass(promptIfMultipleChoices, applications) orElse
+			{
+				if(!promptIfMultipleChoices && !applications.isEmpty)
+					warnMultipleMainClasses(log)
+				None
+			}
+		}
+	/** Specifies the value of the `Class-Path` attribute in the manifest of the main jar. */
+	def manifestClassPath: Option[String] = None
+	def dependencies = info.dependencies ++ subProjects.values.toList
+
+	val mainCompileConditional = new CompileConditional(mainCompileConfiguration)
+	val testCompileConditional = new CompileConditional(testCompileConfiguration)
+	
+	def compileOrder = CompileOrder.Mixed
+
+	/** The main artifact produced by this project. To redefine the main artifact, override `defaultMainArtifact`
+	* Additional artifacts are defined by `val`s of type `Artifact`.*/
+	lazy val mainArtifact = defaultMainArtifact
+	/** Defines the default main Artifact assigned to `mainArtifact`.  By default, this is a jar file with name given
+	* by `artifactID`.*/
+	protected def defaultMainArtifact = Artifact(artifactID, "jar", "jar")
+	
+	import Project._
+	
+	/** The options provided to the 'compile' action to pass to the Scala compiler.*/
+	def compileOptions: Seq[CompileOption] = Deprecation :: Nil
+	/** The options provided to the 'compile' action to pass to the Java compiler. */
+	def javaCompileOptions: Seq[JavaCompileOption] = Nil
+	/** The options provided to the 'test-compile' action, defaulting to those for the 'compile' action.*/
+	def testCompileOptions: Seq[CompileOption] = compileOptions
+	/** The options provided to the 'test-compile' action to pass to the Java compiler. */
+	def testJavaCompileOptions: Seq[JavaCompileOption] = javaCompileOptions
+	
+	/** The options provided to the 'doc' and 'docTest' actions.*/
+	def documentOptions: Seq[ScaladocOption] =
+		LinkSource ::
+		documentTitle(name + " " + version + " API") ::
+		windowTitle(name + " " + version + " API") ::
+		Nil
+	/** The options provided to the 'test' action..*/
+	def testOptions: Seq[TestOption] =
+		TestListeners(testListeners) ::
+		TestFilter(includeTest) ::
+		Nil
+	/** The options provided to the clean action.  You can add files to be removed and files to be preserved here.*/
+	def cleanOptions: Seq[CleanOption] =
+		ClearAnalysis(mainCompileConditional.analysis) ::
+		ClearAnalysis(testCompileConditional.analysis) ::
+		historyPath.map(history => Preserve(history)).toList
+		
+	def packageOptions: Seq[PackageOption] =
+		manifestClassPath.map(cp => ManifestAttributes( (Attributes.Name.CLASS_PATH, cp) )).toList :::
+		getMainClass(false).map(MainClass(_)).toList
+	
+	private def succeededTestPath = testAnalysisPath / "succeeded-tests"
+	private def quickOptions(failedOnly: Boolean) =
+	{
+		val path = succeededTestPath
+		val analysis = testCompileConditional.analysis
+		TestFilter(new impl.TestQuickFilter(analysis, failedOnly, path, log))  :: TestListeners(new impl.TestStatusReporter(path, log) :: Nil) :: Nil
+	}
+	
+	protected def includeTest(test: String): Boolean = true
+
+	/** This is called to create the initial directories when a user makes a new project from
+	* sbt.*/
+	override final def initializeDirectories()
+	{
+		FileUtilities.createDirectories(directoriesToCreate.map(_.asFile), log) match
+		{
+			case Some(errorMessage) => log.error("Could not initialize directory structure: " + errorMessage)
+			case None => log.success("Successfully initialized directory structure.")
+		}
+	}
+	import Configurations._
+	/** The managed configuration to use when determining the classpath for a Scala interpreter session.*/
+	def consoleConfiguration = Test
+	
+	/** A PathFinder that provides the classpath to pass to scaladoc.  It is the same as the compile classpath
+	* by default. */
+	def docClasspath = compileClasspath
+	/** A PathFinder that provides the classpath to pass to the compiler.*/
+	def compileClasspath = fullClasspath(Compile) +++ optionalClasspath
+	/** A PathFinder that provides the classpath to use when unit testing.*/
+	def testClasspath = fullClasspath(Test) +++ optionalClasspath
+	/** A PathFinder that provides the classpath to use when running the class specified by 'getMainClass'.*/
+	def runClasspath = fullClasspath(Runtime) +++ optionalClasspath
+	/** A PathFinder that provides the classpath to use for a Scala interpreter session.*/
+	def consoleClasspath = fullClasspath(consoleConfiguration) +++ optionalClasspath
+	/** A PathFinder that corresponds to Maven's optional scope.  It includes any managed libraries in the
+	* 'optional' configuration for this project only.*/
+	def optionalClasspath = managedClasspath(Optional)
+	/** A PathFinder that contains the jars that should be included in a comprehensive package.  This is
+	* by default the 'runtime' classpath excluding the 'provided' classpath.*/
+	def publicClasspath = runClasspath --- fullClasspath(Provided)
+
+	/** This returns the unmanaged classpath for only this project for the given configuration.  It by
+	* default includes the main compiled classes for this project and the libraries in this project's
+	* unmanaged library directory (lib) and the managed directory for the specified configuration.  It
+	* also adds the resource directories appropriate to the configuration.*/
+	def fullUnmanagedClasspath(config: Configuration) =
+	{
+		config match
+		{
+			case CompilerPlugin => unmanagedClasspath
+			case Runtime => runUnmanagedClasspath
+			case Test => testUnmanagedClasspath
+			case _ => mainUnmanagedClasspath
+		}
+	}
+	/** The unmanaged base classpath.  By default, the unmanaged classpaths for test and run include this classpath. */
+	protected def mainUnmanagedClasspath = mainCompilePath +++ mainResourceClasspath +++ unmanagedClasspath
+	/** The unmanaged classpath for the run configuration. By default, it includes the base classpath returned by
+	* `mainUnmanagedClasspath`.*/
+	protected def runUnmanagedClasspath = mainUnmanagedClasspath +++ mainDependencies.scalaCompiler
+	/** The unmanaged classpath for the test configuration.  By default, it includes the run classpath, which includes the base
+	* classpath returned by `mainUnmanagedClasspath`.*/
+	protected def testUnmanagedClasspath = testCompilePath +++ testResourceClasspath  +++ testDependencies.scalaCompiler +++ runUnmanagedClasspath
+	
+	/** @deprecated Use `mainDependencies.scalaJars`*/
+	@deprecated protected final def scalaJars: Iterable[File] = mainDependencies.scalaJars.get.map(_.asFile)
+	/** An analysis of the jar dependencies of the main Scala sources.  It is only valid after main source compilation.
+	* See the LibraryDependencies class for details. */
+	final def mainDependencies = new LibraryDependencies(this, mainCompileConditional)
+	/** An analysis of the jar dependencies of the test Scala sources.  It is only valid after test source compilation.
+	* See the LibraryDependencies class for details. */
+	final def testDependencies = new LibraryDependencies(this, testCompileConditional)
+
+	/** The list of test frameworks to use for testing.  Note that adding frameworks to this list
+	* for an active project currently requires an explicit 'clean' to properly update the set of tests to
+	* run*/
+	def testFrameworks: Iterable[TestFramework] = ScalaCheckFramework :: SpecsFramework :: ScalaTestFramework :: Nil
+	/** The list of listeners for testing. */
+	def testListeners: Seq[TestReportListener] = new LogTestReportListener(log) :: Nil
+	
+	def mainLabel = "main"
+	def testLabel = "test"
+	
+	def mainCompileConfiguration = new MainCompileConfig
+	def testCompileConfiguration = new TestCompileConfig
+	abstract class BaseCompileConfig extends CompileConfiguration
+	{
+		def log = BasicScalaProject.this.log
+		def projectPath = info.projectPath
+		def baseCompileOptions: Seq[CompileOption]
+		lazy val localBaseOptions = baseCompileOptions
+		def options = optionsAsString(localBaseOptions.filter(!_.isInstanceOf[MaxCompileErrors]))
+		def maxErrors = maximumErrors(localBaseOptions)
+		def compileOrder = BasicScalaProject.this.compileOrder
+	}
+	class MainCompileConfig extends BaseCompileConfig
+	{
+		def baseCompileOptions = compileOptions
+		def label = mainLabel
+		def sources = mainSources
+		def outputDirectory = mainCompilePath
+		def classpath = compileClasspath
+		def analysisPath = mainAnalysisPath
+		def testDefinitionClassNames = Nil
+		def javaOptions = javaOptionsAsString(javaCompileOptions)
+	}
+	class TestCompileConfig extends BaseCompileConfig
+	{
+		def baseCompileOptions = testCompileOptions
+		def label = testLabel
+		def sources = testSources
+		def outputDirectory = testCompilePath
+		def classpath = testClasspath
+		def analysisPath = testAnalysisPath
+		def testDefinitionClassNames = testFrameworks.map(_.testSuperClassName)
+		def javaOptions = javaOptionsAsString(testJavaCompileOptions)
+	}
+	
+	/** Configures forking the compiler and runner.  Use ForkScalaCompiler, ForkScalaRun or mix together.*/
+	def fork: Option[ForkScala] = None
+	private def doCompile(conditional: CompileConditional) =
+	{
+		fork match
+		{
+			case Some(fc: ForkScalaCompiler) => ForkCompile(fc, conditional)
+			case _ => conditional.run
+		}
+	}
+	private def getRunner =
+	{
+		fork match
+		{
+			case Some(fr: ForkScalaRun) => new ForkRun(fr)
+			case _ => Run
+		}
+	}
+	
+	protected def compileAction = task { doCompile(mainCompileConditional) } describedAs MainCompileDescription
+	protected def testCompileAction = task { doCompile(testCompileConditional) } dependsOn compile describedAs TestCompileDescription
+	protected def cleanAction = cleanTask(outputPath, cleanOptions) describedAs CleanDescription
+	protected def runAction = task { args => runTask(getMainClass(true), runClasspath, args, getRunner) dependsOn(compile) } describedAs RunDescription
+	protected def consoleQuickAction = consoleTask(consoleClasspath, getRunner) describedAs ConsoleQuickDescription
+	protected def consoleAction = consoleTask(consoleClasspath, getRunner).dependsOn(testCompile) describedAs ConsoleDescription
+	protected def docAction = scaladocTask(mainLabel, mainSources, mainDocPath, docClasspath, documentOptions).dependsOn(compile) describedAs DocDescription
+	protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription
+	protected def testAction = defaultTestTask(testOptions)
+	protected def testOnlyAction = testQuickMethod(testCompileConditional.analysis, testOptions)(options =>
+		defaultTestTask(options)) describedAs(TestOnlyDescription)
+	protected def testQuickAction = defaultTestQuickMethod(false) describedAs(TestQuickDescription)
+	protected def testFailedAction = defaultTestQuickMethod(true) describedAs(TestFailedDescription)
+	protected def defaultTestQuickMethod(failedOnly: Boolean) =
+		testQuickMethod(testCompileConditional.analysis, testOptions)(options => defaultTestTask(quickOptions(failedOnly) ::: options.toList))
+	protected def defaultTestTask(testOptions: => Seq[TestOption]) =
+		testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile) describedAs TestDescription
+		
+	override protected def makePomAction = super.makePomAction dependsOn(`package`)
+	override protected def deliverLocalAction = super.deliverLocalAction dependsOn(`package`)
+	override protected def deliverAction = super.deliverAction dependsOn(`package`)
+	
+	protected def packageAction = packageTask(packagePaths, jarPath, packageOptions).dependsOn(compile) describedAs PackageDescription
+	protected def packageTestAction = packageTask(packageTestPaths, packageTestJar).dependsOn(testCompile) describedAs TestPackageDescription
+	protected def packageDocsAction = packageTask(mainDocPath ##, packageDocsJar, Recursive).dependsOn(doc) describedAs DocPackageDescription
+	protected def packageSrcAction = packageTask(packageSourcePaths, packageSrcJar) describedAs SourcePackageDescription
+	protected def packageTestSrcAction = packageTask(packageTestSourcePaths, packageTestSrcJar) describedAs TestSourcePackageDescription
+	protected def packageProjectAction = zipTask(packageProjectPaths, packageProjectZip) describedAs ProjectPackageDescription
+	
+	protected def docAllAction = (doc && docTest) describedAs DocAllDescription
+	protected def packageAllAction = task { None } dependsOn(`package`, packageTest, packageSrc, packageTestSrc, packageDocs) describedAs PackageAllDescription
+	protected def graphAction = graphTask(graphPath, mainCompileConditional.analysis).dependsOn(compile)
+	protected def incrementVersionAction = task { incrementVersionNumber(); None } describedAs IncrementVersionDescription
+	protected def releaseAction = (test && packageAll && incrementVersion) describedAs ReleaseDescription
+	
+	lazy val compile = compileAction
+	lazy val testCompile = testCompileAction
+	lazy val clean = cleanAction
+	lazy val run = runAction
+	lazy val consoleQuick = consoleQuickAction
+	lazy val console = consoleAction
+	lazy val doc = docAction
+	lazy val docTest = docTestAction
+	lazy val test = testAction
+	lazy val `package` = packageAction
+	lazy val packageTest = packageTestAction
+	lazy val packageDocs = packageDocsAction
+	lazy val packageSrc = packageSrcAction
+	lazy val packageTestSrc = packageTestSrcAction
+	lazy val packageProject = packageProjectAction
+	lazy val docAll = docAllAction
+	lazy val packageAll = packageAllAction
+	lazy val graph = graphAction
+	lazy val incrementVersion = incrementVersionAction
+	lazy val release = releaseAction
+
+	lazy val testQuick = testQuickAction
+	lazy val testFailed = testFailedAction
+	lazy val testOnly = testOnlyAction
+	
+	def jarsOfProjectDependencies = Path.lazyPathFinder {
+		topologicalSort.dropRight(1) flatMap { p =>
+			p match
+			{
+				case bpp: BasicScalaPaths => List(bpp.jarPath)
+				case _ => Nil
+			}
+		}
+	}
+	override def deliverScalaDependencies: Iterable[ModuleID] =
+	{
+		val snapshot = mainDependencies.snapshot
+		mapScalaModule(snapshot.scalaLibrary, ManageDependencies.ScalaLibraryID) ++
+		mapScalaModule(snapshot.scalaCompiler, ManageDependencies.ScalaCompilerID)
+	}
+	override def watchPaths = mainSources +++ testSources +++ mainResources +++ testResources
+}
+abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProject with WebScalaPaths
+{
+	import BasicWebScalaProject._
+	override def watchPaths = super.watchPaths +++ webappResources
+	
+	lazy val prepareWebapp = prepareWebappAction
+	protected def prepareWebappAction =
+		prepareWebappTask(webappResources, temporaryWarPath, webappClasspath, mainDependencies.scalaJars) dependsOn(compile)
+	
+	def webappClasspath = publicClasspath
+	def jettyRunClasspath = testClasspath
+	def jettyWebappPath = temporaryWarPath
+	lazy val jettyRun = jettyRunAction
+	protected def jettyRunAction =
+		jettyRunTask(jettyWebappPath, jettyContextPath, jettyPort, jettyRunClasspath, "test", scanDirectories.map(_.asFile), scanInterval) dependsOn(prepareWebapp) describedAs(JettyRunDescription)
+		
+	/** The directories that should be watched to determine if the web application needs to be reloaded..*/
+	def scanDirectories: Seq[Path] = jettyWebappPath :: Nil
+	/** The time in seconds between scans that check whether the web application should be reloaded.*/
+	def scanInterval: Int = 3
+	/** The port that Jetty runs on. */
+	def jettyPort: Int = JettyRun.DefaultPort
+
+	lazy val jettyRestart = jettyStop && jettyRun
+	lazy val jettyStop = jettyStopAction
+	protected def jettyStopAction = jettyStopTask describedAs(JettyStopDescription)
+	
+	/** The clean action for a web project is modified so that it first stops jetty if it is running,
+	* since the webapp directory will be removed by the clean.*/
+	override def cleanAction = super.cleanAction dependsOn jettyStop
+	
+	/** Redefine the `package` action to make a war file.*/
+	override protected def packageAction = packageTask(descendents(temporaryWarPath ##, "*"), warPath, Nil) dependsOn(prepareWebapp) describedAs PackageWarDescription
+
+	/** Redefine the default main artifact to be a war file.*/
+	override protected def defaultMainArtifact = Artifact(artifactID, "war", "war")
+}
+
+object BasicScalaProject
+{
+	val CleanDescription =
+		"Deletes all generated files (the target directory)."
+	val MainCompileDescription =
+		"Compiles main sources."
+	val TestCompileDescription =
+		"Compiles test sources."
+	val TestDescription =
+		"Runs all tests detected during compilation."
+	val TestOnlyDescription =
+		"Runs the tests provided as arguments."
+	val TestFailedDescription =
+		"Runs the tests provided as arguments if they have not succeeded."
+	val TestQuickDescription =
+		"Runs the tests provided as arguments if they have not succeeded or their dependencies changed."
+	val DocDescription =
+		"Generates API documentation for main Scala source files using scaladoc."
+	val TestDocDescription =
+		"Generates API documentation for test Scala source files using scaladoc."
+	val RunDescription =
+		"Runs the main class for the project with the provided arguments."
+	val ConsoleDescription =
+		"Starts the Scala interpreter with the project classes on the classpath."
+	val ConsoleQuickDescription =
+		"Starts the Scala interpreter with the project classes on the classpath without running compile first."
+	val PackageDescription =
+		"Creates a jar file containing main classes and resources."
+	val TestPackageDescription =
+		"Creates a jar file containing test classes and resources."
+	val DocPackageDescription =
+		"Creates a jar file containing generated API documentation."
+	val SourcePackageDescription =
+		"Creates a jar file containing all main source files and resources."
+	val TestSourcePackageDescription =
+		"Creates a jar file containing all test source files and resources."
+	val ProjectPackageDescription =
+		"Creates a zip file containing the entire project, excluding generated files."
+	val PackageAllDescription =
+		"Executes all package tasks except package-project."
+	val DocAllDescription =
+		"Generates both main and test documentation."
+	val IncrementVersionDescription =
+		"Increments the micro part of the version (the third number) by one. (This is only valid for versions of the form #.#.#-*)"
+	val ReleaseDescription =
+		"Compiles, tests, generates documentation, packages, and increments the version."
+		
+	private def warnMultipleMainClasses(log: Logger) =
+	{
+		log.warn("No Main-Class attribute will be added automatically added:")
+		log.warn("Multiple classes with a main method were detected.  Specify main class explicitly with:")
+		log.warn("     override mainClass = Some(\"className\")")
+	}
+	private def mapScalaModule(in: Iterable[_], id: String) =
+	{
+		ScalaVersion.current.toList.flatMap { scalaVersion => 
+			in.map(jar => ModuleID(ManageDependencies.ScalaOrganization, id, scalaVersion))
+		}
+	}
+}
+object BasicWebScalaProject
+{
+	val PackageWarDescription =
+		"Creates a war file."
+	val JettyStopDescription =
+		"Stops the Jetty server that was started with the jetty-run action."
+	val JettyRunDescription =
+		"Starts the Jetty server and serves this project as a web application."
+}
+/** Analyzes the dependencies of a project after compilation.  All methods except `snapshot` return a
+* `PathFinder`.  The underlying calculations are repeated for each call to PathFinder.get. */
+final class LibraryDependencies(project: Project, conditional: CompileConditional) extends NotNull
+{
+	/** Library jars located in unmanaged or managed dependency paths.*/
+	def libraries: PathFinder = pathFinder(snapshot.libraries)
+	/** Library jars located outside of the project.*/
+	def external: PathFinder = pathFinder(snapshot.external)
+	/** The Scala library jar.*/
+	def scalaLibrary: PathFinder = pathFinder(snapshot.scalaLibrary)
+	/** The Scala compiler jar.*/
+	def scalaCompiler: PathFinder = pathFinder(snapshot.scalaCompiler)
+	/** All jar dependencies.*/
+	def all: PathFinder = pathFinder(snapshot.all)
+	/** The Scala library and compiler jars.*/
+	def scalaJars: PathFinder = pathFinder(snapshot.scalaJars)
+
+	/** Returns an object that has all analyzed dependency information frozen at the time of this method call. */
+	def snapshot = new Dependencies
+	
+	private def rootProjectDirectory = project.rootProject.info.projectPath
+
+	final class Dependencies
+	{
+		import LibraryDependencies._
+		val all = conditional.analysis.allExternals.filter(ClasspathUtilities.isArchive).map(_.getAbsoluteFile)
+		private[this] val (internal, externalAll) = all.toList.partition(jar => Path.relativize(rootProjectDirectory, jar).isDefined)
+		private[this] val (bootScalaJars, librariesNoScala) = internal.partition(isScalaJar)
+		private[this] val (externalScalaJars, externalNoScala) = externalAll.partition(isScalaJar)
+		val scalaJars = externalScalaJars ::: bootScalaJars
+		val (scalaLibrary, scalaCompiler) = scalaJars.partition(isScalaLibraryJar)
+		def external = externalNoScala
+		def libraries = librariesNoScala
+	}
+
+	private def pathFinder(it: => Iterable[File]) = Path.lazyPathFinder(it.map(Path.fromFile))
+}
+private object LibraryDependencies
+{
+	private def ScalaLibraryPrefix = ManageDependencies.ScalaLibraryID
+	private def ScalaCompilerPrefix = ManageDependencies.ScalaCompilerID
+	private def ScalaJarPrefixes = List(ScalaCompilerPrefix, ScalaLibraryPrefix)
+	private def isScalaJar(file: File) = ClasspathUtilities.isArchive(file) &&  ScalaJarPrefixes.exists(isNamed(file))
+	private def isScalaLibraryJar(file: File) = isNamed(file)(ScalaLibraryPrefix)
+	private def isNamed(file: File)(name: String) = file.getName.startsWith(name)
+	
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/DotGraph.scala b/src/main/scala/sbt/DotGraph.scala
new file mode 100644
index 000000000..18168ced9
--- /dev/null
+++ b/src/main/scala/sbt/DotGraph.scala
@@ -0,0 +1,47 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.{File, Writer}
+
+object DotGraph
+{
+	def apply(analysis: BasicCompileAnalysis, outputDirectory: Path, log: Logger) =
+	{
+		val outputDir = outputDirectory.asFile
+		
+		def generateGraph[Key, Value](fileName: String, graphName: String, graph: Iterable[(Key, scala.collection.Set[Value])],
+			keyToString: Key => String, valueToString: Value => String) =
+		{
+			FileUtilities.write(new File(outputDir, fileName), log)
+			{
+				(writer: Writer) =>
+				{
+					def writeLine(line: String) = FileUtilities.writeLine(writer, line)
+					writeLine("digraph " + graphName + " {")
+					for( (dependsOn, dependants) <- graph; dependant <- dependants)
+						writeLine(valueToString(dependant) + " -> " + keyToString(dependsOn))
+					writeLine("}")
+					None
+				}
+			}
+		}
+		FileUtilities.createDirectory(outputDir, log) orElse
+		generateGraph(BasicAnalysis.DependenciesFileName, "dependencies", analysis.allDependencies,
+			sourceToString, sourceToString) orElse
+		generateGraph(BasicAnalysis.ExternalDependenciesFileName, "externalDependencies", analysis.allExternalDependencies,
+			fileToString, sourceToString)
+	}
+	private def sourceToString(source: Path) = fileToString(source.asFile)
+	private def fileToString(file: File) =
+	{
+		val rawName = file.getName
+		val name =
+			if(rawName.endsWith(".scala"))
+				rawName.substring(0, rawName.length - ".scala".length)
+			else
+				rawName
+		"\"" + name + "\""
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Environment.scala b/src/main/scala/sbt/Environment.scala
new file mode 100644
index 000000000..3f35f0a55
--- /dev/null
+++ b/src/main/scala/sbt/Environment.scala
@@ -0,0 +1,345 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah, David MacIver
+ */
+package sbt
+
+import impl.PropertiesUtilities
+import scala.reflect.Manifest
+
+trait Environment
+{
+	abstract class Property[T] extends NotNull
+	{
+		/** Explicitly sets the value of this property to 'v'.*/
+		def update(v: T): Unit
+		/** Returns the current value of this property or throws an exception if the value could not be obtained.*/
+		def value: T = resolve.value
+		/** Returns the current value of this property in an 'Option'.  'None' is used to indicate that the
+		* value could not obtained.*/
+		def get: Option[T] = resolve.toOption
+		/** Returns full information about this property's current value. */
+		def resolve: PropertyResolution[T]
+		
+		def foreach(f: T => Unit): Unit = resolve.foreach(f)
+	}
+	
+	/** Creates a system property with the given name and no default value.*/
+	def system[T](propName: String)(implicit format: Format[T]): Property[T]
+	/** Creates a system property with the given name and the given default value to use if no value is explicitly specified.*/
+	def systemOptional[T](propName: String, defaultValue: => T)(implicit format: Format[T]): Property[T]
+	/** Creates a user-defined property that has no default value.  The property will try to inherit its value
+	* from a parent environment (if one exists) if its value is not explicitly specified.  An explicitly specified
+	* value will persist between builds if the object returned by this method is assigned to a 'val' in this
+	* 'Environment'.*/
+	def property[T](implicit manifest: Manifest[T], format: Format[T]): Property[T]
+	/** Creates a user-defined property that has no default value.  The property will try to inherit its value
+	* from a parent environment (if one exists) if its value is not explicitly specified.  An explicitly specified
+	* value will persist between builds if the object returned by this method is assigned to a 'val' in this
+	* 'Environment'.  The given 'format' is used to convert an instance of 'T' to and from the 'String' representation
+	* used for persistence.*/
+	def propertyF[T](format: Format[T])(implicit manifest: Manifest[T]): Property[T] = property(manifest, format)
+	/** Creates a user-defined property with no default value and no value inheritance from a parent environment.
+	* Its value will persist between builds if the returned object is assigned to a 'val' in this 'Environment'.*/
+	def propertyLocal[T](implicit manifest: Manifest[T], format: Format[T]): Property[T]
+	/** Creates a user-defined property with no default value and no value inheritance from a parent environment.
+	* The property's value will persist between builds if the object returned by this method is assigned to a
+	* 'val' in this 'Environment'.  The given 'format' is used to convert an instance of 'T' to and from the
+	* 'String' representation used for persistence.*/
+	def propertyLocalF[T](format: Format[T])(implicit manifest: Manifest[T]): Property[T] = propertyLocal(manifest, format)
+	/** Creates a user-defined property that uses the given default value if no value is explicitly specified for this property.  The property's value will persist between builds
+	* if the object returned by this method is assigned to a 'val' in this 'Environment'.*/
+	def propertyOptional[T](defaultValue: => T)(implicit manifest: Manifest[T], format: Format[T]): Property[T]
+	/** Creates a user-defined property with no value inheritance from a parent environment but with the given default
+	* value if no value is explicitly specified for this property.  The property's value will persist between builds
+	* if the object returned by this method is assigned to a 'val' in this 'Environment'.  The given 'format' is used
+	* to convert an instance of 'T' to and from the 'String' representation used for persistence.*/
+	def propertyOptionalF[T](defaultValue: => T, format: Format[T])(implicit manifest: Manifest[T]): Property[T] =
+		propertyOptional(defaultValue)(manifest, format)
+}
+
+import scala.collection.Map
+trait BasicEnvironment extends Environment
+{
+	protected def log: Logger
+	/** The location of the properties file that backs the user-defined properties. */
+	def envBackingPath: Path
+	/** The environment from which user-defined properties inherit (if enabled). */
+	protected def parentEnvironment: Option[BasicEnvironment] = None
+	/** The identifier used in messages to refer to this environment. */
+	def environmentLabel = envBackingPath.absolutePath
+	
+	private[this] var isModified = false
+	private[sbt] def setEnvironmentModified(modified: Boolean) { synchronized { isModified = modified } }
+	private[this] def isEnvironmentModified = synchronized { isModified }
+	
+	
+	implicit val IntFormat: Format[Int] = new SimpleFormat[Int] { def fromString(s: String) = java.lang.Integer.parseInt(s) }
+	implicit val LongFormat: Format[Long] = new SimpleFormat[Long] { def fromString(s: String) = java.lang.Long.parseLong(s) }
+	implicit val DoubleFormat: Format[Double] = new SimpleFormat[Double] { def fromString(s: String) = java.lang.Double.parseDouble(s) }
+	implicit val BooleanFormat: Format[Boolean] = new SimpleFormat[Boolean] { def fromString(s: String) = java.lang.Boolean.valueOf(s).booleanValue }
+	implicit val StringFormat: Format[String] = Format.string
+	val NonEmptyStringFormat: Format[String] = new SimpleFormat[String]
+	{
+		def fromString(s: String) =
+		{
+			val trimmed = s.trim
+			if(trimmed.isEmpty)
+				error("The empty string is not allowed.")
+			trimmed
+		}
+	}
+	implicit val VersionFormat: Format[Version] =
+		new SimpleFormat[Version]
+		{
+			def fromString(s: String) = Version.fromString(s).fold(msg => error(msg), x => x)
+		}
+	implicit val FileFormat = Format.file
+	
+	
+	/** Implementation of 'Property' for user-defined properties. */
+	private[sbt] class UserProperty[T](lazyDefaultValue: => Option[T], format: Format[T], inheritEnabled: Boolean,
+		inheritFirst: Boolean, private[BasicEnvironment] val manifest: Manifest[T]) extends Property[T]
+	{
+		/** The name of this property is used for persistence in the properties file and as an identifier in messages.*/
+		lazy val name = propertyMap.find( p => p._2 eq this ).map(_._1)
+		/** Gets the name of this property or an alternative if the name is not available.*/
+		private def nameString = name.getOrElse("<unnamed>")
+		/** The lazily evaluated default value for this property.*/
+		private lazy val defaultValue = lazyDefaultValue
+		/** The explicitly set value for this property.*/
+		private[BasicEnvironment] var explicitValue =
+		{
+			def initialValue = for(n <- name; stringValue <- initialValues.get(n)) yield format.fromString(stringValue)
+			new LazyVar[Option[T]](initialValue) // ensure propertyMap is initialized before a read occurs
+		}
+		def update(v: T): Unit = synchronized { explicitValue() = Some(v); setEnvironmentModified(true) }
+		def resolve: PropertyResolution[T] =
+			synchronized
+			{
+				if(inheritFirst) resolveInheritFirst
+				else resolveDefaultFirst
+			}
+		private def resolveInheritFirst =
+			explicitValue() match
+			{
+				case Some(v) => DefinedValue(v, false, false)
+				case None =>
+					val inherited = inheritedValue
+					 // note that the following means the default value will not be used if an exception occurs inheriting
+					inherited orElse
+					{
+						defaultValue match
+						{
+							case Some(v) => DefinedValue(v, false, true)
+							case None => inherited
+						}
+					}
+			}
+		private def resolveDefaultFirst =
+			(explicitValue() orElse defaultValue) match
+			{
+				case Some(v) => DefinedValue(v, false, explicitValue().isEmpty)
+				case None => inheritedValue
+			}
+		
+		private def inheritedValue: PropertyResolution[T] =
+		{
+			val propOption = if(inheritEnabled) parentProperty else None
+			propOption match
+			{
+				case Some(prop) => tryToInherit(prop)
+				case None => UndefinedValue(nameString, environmentLabel)
+			}
+		}
+		private def parentProperty = for(parent <- parentEnvironment; n <- name; prop <- parent.propertyMap.get(n)) yield prop
+		
+		private def tryToInherit[R](prop: BasicEnvironment#UserProperty[R]): PropertyResolution[T] =
+		{
+			if(prop.manifest <:< manifest)
+				markInherited(prop.resolve.asInstanceOf[PropertyResolution[T]])
+			else
+				ResolutionException("Could not inherit property '" + nameString + "' from '" + environmentLabel + "':\n" +
+					"\t Property had type " + prop.manifest + ", expected type " + manifest, None)
+		}
+		private def markInherited(result: PropertyResolution[T]) =
+			result match
+			{
+				case DefinedValue(v, isInherited, isDefault) => DefinedValue(v, true, isDefault)
+				case x => x
+			}
+			
+		override def toString = nameString + "=" + resolve
+		
+		/** Gets the explicitly set value converted to a 'String'.*/
+		private[sbt] def getStringValue: Option[String] = explicitValue().map(format.toString)
+		/** Explicitly sets the value for this property by converting the given string value.*/
+		private[sbt] def setStringValue(s: String) { update(format.fromString(s)) }
+	}
+	/** Implementation of 'Property' for system properties (i.e. System.getProperty/setProperty) */
+	private class SystemProperty[T](val name: String, lazyDefaultValue: => Option[T], val format: Format[T]) extends Property[T]
+	{
+		def resolve =
+		{
+			val rawValue = System.getProperty(name)
+			if(rawValue == null)
+				notFound
+			else
+			{
+				Control.convertException(format.fromString(rawValue)) match
+				{
+					case Left(e) => ResolutionException("Error parsing system property '" + name + "': " + e.toString, Some(e))
+					case Right(x) => DefinedValue(x, false, false)
+				}
+			}
+		}
+		/** Handles resolution when the property has no explicit value.  If there is a default value, that is returned,
+		* otherwise, UndefinedValue is returned.*/
+		private def notFound =
+		{
+			defaultValue match
+			{
+				case Some(dv) =>
+				{
+					log.debug("System property '" + name + "' does not exist, using provided default.")
+					DefinedValue(dv, false, true)
+				}
+				case None => UndefinedValue(name, environmentLabel)
+			}
+		}
+		protected lazy val defaultValue = lazyDefaultValue
+		def update(t: T)
+		{
+			for(e <- Control.convertException(System.setProperty(name, format.toString(t))).left)
+			{
+				log.trace(e)
+				log.warn("Error setting system property '" + name + "': " + e.toString)
+			}
+		}
+		override def toString = name + "=" + resolve
+	}
+	
+	def system[T](propertyName: String)(implicit format: Format[T]): Property[T] =
+		new SystemProperty[T](propertyName, None, format)
+	def systemOptional[T](propertyName: String, defaultValue: => T)(implicit format: Format[T]): Property[T] =
+		new SystemProperty[T](propertyName, Some(defaultValue), format)
+	
+	def property[T](implicit manifest: Manifest[T], format: Format[T]): Property[T] =
+		new UserProperty[T](None, format, true, false, manifest)
+	def propertyLocal[T](implicit manifest: Manifest[T], format: Format[T]): Property[T] =
+		new UserProperty[T](None, format, false, false, manifest)
+	def propertyOptional[T](defaultValue: => T)(implicit manifest: Manifest[T], format: Format[T]): Property[T] =
+		propertyOptional(defaultValue, false)(manifest, format)
+	def propertyOptional[T](defaultValue: => T, inheritFirst: Boolean)(implicit manifest: Manifest[T], format: Format[T]): Property[T] =
+		new UserProperty[T](Some(defaultValue), format, true, inheritFirst, manifest)
+	
+	private type AnyUserProperty = UserProperty[_]
+	/** Maps property name to property.  The map is constructed by reflecting vals defined on this object,
+	* so it should not be referenced during initialization or else subclass properties will be missed.**/
+	private lazy val propertyMap: Map[String, AnyUserProperty] =
+	{
+		log.debug("Discovering properties")
+		val propertyMap = new scala.collection.mutable.HashMap[String, AnyUserProperty]
+		// AnyProperty is required because the return type of the property*[T] methods is Property[T]
+		// and so the vals we are looking for have type Property[T] and not UserProperty[T]
+		// We then only keep instances of UserProperty
+		val vals = Environment.reflectiveMappings(this, classOf[Property[_]])
+		for( (name, property: AnyUserProperty) <- vals)
+			propertyMap(name) = property
+		propertyMap.readOnly
+	}
+	private val initialValues: Map[String, String] =
+	{
+		val map = new scala.collection.mutable.HashMap[String, String]
+		for(errorMsg <- impl.MapUtilities.read(map, envBackingPath, log))
+			log.error("Error loading properties from " + environmentLabel + " : " + errorMsg)
+		map.readOnly
+	}
+	
+	def propertyNames: Iterable[String] = propertyMap.keys.toList
+	def getPropertyNamed(name: String): Option[UserProperty[_]] = propertyMap.get(name)
+	def propertyNamed(name: String): UserProperty[_] = propertyMap(name)
+	def saveEnvironment(): Option[String] =
+	{
+		if(isEnvironmentModified)
+		{
+			val properties = new java.util.Properties
+			for( (name, variable) <- propertyMap; stringValue <- variable.getStringValue)
+				properties.setProperty(name, stringValue)
+			val result = PropertiesUtilities.write(properties, "Project properties", envBackingPath, log)
+			setEnvironmentModified(false)
+			result
+		}
+		else
+			None
+	}
+	private[sbt] def uninitializedProperties: Iterable[(String, Property[_])] = propertyMap.filter(_._2.get.isEmpty)
+}
+private object Environment
+{
+	def reflectiveMappings[T](obj: AnyRef, clazz: Class[T]): Map[String, T] =
+	{
+		val mappings = new scala.collection.mutable.OpenHashMap[String, T]
+		for ((name, value) <- ReflectUtilities.allValsC(obj, clazz))
+			mappings(ReflectUtilities.transformCamelCase(name, '.')) = value
+		mappings
+	}
+}
+
+sealed trait PropertyResolution[+T] extends NotNull
+{
+	def value: T
+	def orElse[R >: T](r: => PropertyResolution[R]): PropertyResolution[R]
+	def toOption: Option[T]
+	def foreach(f: T => Unit): Unit
+	def map[R](f: T => R): PropertyResolution[R]
+	def flatMap[R](f: T => PropertyResolution[R]): PropertyResolution[R]
+}
+sealed trait NoPropertyValue extends PropertyResolution[Nothing]
+{ self: RuntimeException with PropertyResolution[Nothing] =>
+
+	def value = throw this
+	def toOption = None
+	def map[R](f: Nothing => R): PropertyResolution[R] = this
+	def flatMap[R](f: Nothing => PropertyResolution[R]): PropertyResolution[R] = this
+	def foreach(f: Nothing => Unit) {}
+}
+final case class ResolutionException(message: String, exception: Option[Throwable])
+	extends RuntimeException(message, exception.getOrElse(null)) with NoPropertyValue
+{
+	def orElse[R](r: => PropertyResolution[R]) = this
+}
+final case class UndefinedValue(name: String, environmentLabel: String)
+	extends RuntimeException("Value for property '" + name + "' from " + environmentLabel + " is undefined.") with NoPropertyValue
+{
+	def orElse[R](r: => PropertyResolution[R]) =
+		r match
+		{
+			case u: UndefinedValue => this
+			case _ => r
+		}
+}
+final case class DefinedValue[T](value: T, isInherited: Boolean, isDefault: Boolean) extends PropertyResolution[T]
+{
+	def toOption = Some(value)
+	def orElse[R >: T](r: => PropertyResolution[R]) = this
+	def map[R](f: T => R) = DefinedValue[R](f(value), isInherited, isDefault)
+	def flatMap[R](f: T => PropertyResolution[R]) = f(value)
+	def foreach(f: T => Unit) { f(value) }
+}
+private final class LazyVar[T](initialValue: => T) extends NotNull
+{
+	private[this] var value: Option[T] = None
+	def apply() =
+		synchronized
+		{
+			value match
+			{
+				case Some(v) => v
+				case None =>
+					val newValue = initialValue
+					value = Some(newValue)
+					newValue
+			}
+		}
+	def update(newValue: T) = synchronized { value = Some(newValue) }
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ExitHook.scala b/src/main/scala/sbt/ExitHook.scala
new file mode 100644
index 000000000..bce31c74c
--- /dev/null
+++ b/src/main/scala/sbt/ExitHook.scala
@@ -0,0 +1,43 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt
+
+/** Defines a function to call as sbt exits.*/
+trait ExitHook extends NotNull
+{
+	/** Provides a name for this hook to be used to provide feedback to the user. */
+	def name: String
+	/** Subclasses should implement this method, which is called when this hook is executed. */
+	def runBeforeExiting(): Unit
+}
+
+object ExitHooks
+{
+	/** This is a list of hooks to call when sbt is finished executing.*/
+	private val exitHooks = new scala.collection.mutable.HashSet[ExitHook]
+	/** Adds a hook to call before sbt exits. */
+	private[sbt] def register(hook: ExitHook) { exitHooks += hook }
+	/** Removes a hook. */
+	private[sbt] def unregister(hook: ExitHook) { exitHooks -= hook }
+	/** Calls each registered exit hook, trapping any exceptions so that each hook is given a chance to run. */
+	private[sbt] def runExitHooks(log: Logger)
+	{
+		for(hook <- exitHooks.toList)
+		{
+			try
+			{
+				log.debug("Running exit hook '" + hook.name + "'...")
+				hook.runBeforeExiting()
+			}
+			catch
+			{
+				case e =>
+				{
+					log.trace(e);
+					log.error("Error running exit hook '" + hook.name + "': " + e.toString)
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/FileTask.scala b/src/main/scala/sbt/FileTask.scala
new file mode 100644
index 000000000..80ba1f9d6
--- /dev/null
+++ b/src/main/scala/sbt/FileTask.scala
@@ -0,0 +1,108 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+import scala.collection.{mutable, Map, Set}
+
+sealed trait ProductsSources extends NotNull
+{
+	def products: Iterable[Path]
+	def sources: Iterable[Path]
+}
+sealed trait ProductsWrapper extends NotNull
+{
+	def from(sources: => Iterable[Path]): ProductsSources = from(Path.lazyPathFinder(sources))
+	def from(sources: PathFinder): ProductsSources
+}
+/** Provides methods to define tasks with basic conditional execution based on the sources
+* and products of the task. */
+trait FileTasks extends Project
+{
+	implicit def wrapProduct(product: => Path): ProductsWrapper = FileTasks.wrapProduct(product)
+	implicit def wrapProducts(productsList: => Iterable[Path]): ProductsWrapper = FileTasks.wrapProducts(productsList)
+	/** Runs 'action' if the given products are out of date with respect to the given sources. */
+	def fileTask(label: String, files: ProductsSources)(action: => Option[String]): Task =
+		task { FileTasks.runOption(label, files, log)(action) }
+	/** Runs 'action' if any of the given products do not exist. */
+	def fileTask(label: String, products: => Iterable[Path])(action: => Option[String]): Task =
+		task { FileTasks.existenceCheck[Option[String]](label, products, log)(action)(None) }
+		
+	/** Creates a new task that performs 'action' only when the given products are out of date with respect to the given sources.. */
+	def fileTask(files: ProductsSources)(action: => Option[String]): Task = fileTask("", files)(action)
+	/** Creates a new task that performs 'action' only when at least one of the given products does not exist.. */
+	def fileTask(products: => Iterable[Path])(action: => Option[String]): Task = fileTask("", products)(action)
+	
+}
+object FileTasks
+{
+	implicit def wrapProduct(product: => Path): ProductsWrapper = wrapProducts(product :: Nil)
+	implicit def wrapProducts(productsList: => Iterable[Path]): ProductsWrapper =
+		new ProductsWrapper
+		{
+			def from(sourceFinder: PathFinder) =
+				new ProductsSources
+				{
+					def products = productsList
+					def sources = sourceFinder.get
+				}
+		}
+	/** Runs 'ifOutofdate' if the given products are out of date with respect to the given sources.*/
+	def runOption(label: String, files: ProductsSources, log: Logger)(ifOutofdate: => Option[String]): Option[String] =
+	{
+		val result = apply[Option[String]](label, files, log)(ifOutofdate)(None)
+		if(result.isDefined)
+			FileUtilities.clean(files.products, true, log)
+		result
+	}
+	/** Returns 'ifOutofdate' if the given products are out of date with respect to the given sources.  Otherwise, returns ifUptodate. */
+	def apply[T](label: String, files: ProductsSources, log: Logger)(ifOutofdate: => T)(ifUptodate: => T): T =
+	{
+		val products = files.products
+		existenceCheck[T](label, products, log)(ifOutofdate)
+		{
+			val sources = files.sources
+			if(sources.isEmpty)
+			{
+				log.debug("Running " + label + " task because no sources exist.")
+				ifOutofdate
+			}
+			else
+			{
+				val oldestProductModifiedTime = mapLastModified(products).reduceLeft(_ min _)
+				val newestSourceModifiedTime = mapLastModified(sources).reduceLeft(_ max _)
+				if(oldestProductModifiedTime < newestSourceModifiedTime)
+				{
+					if(log.atLevel(Level.Debug))
+					{
+						log.debug("Running " + label + " task because the following sources are newer than at least one product: ")
+						logDebugIndented(sources.filter(_.lastModified > oldestProductModifiedTime), log)
+						log.debug(" The following products are older than at least one source: ")
+						logDebugIndented(products.filter(_.lastModified < newestSourceModifiedTime), log)
+					}
+					ifOutofdate
+				}
+				else
+					ifUptodate
+			}
+		}
+	}
+	/** Checks that all 'products' exist.  If they do, 'ifAllExists' is returned, otherwise 'products' is returned.*/
+	private def existenceCheck[T](label: String, products: Iterable[Path], log: Logger)(action: => T)(ifAllExist: => T) =
+	{
+		val nonexisting = products.filter(!_.exists)
+		if(nonexisting.isEmpty)
+			ifAllExist
+		else
+		{
+			if(log.atLevel(Level.Debug))
+			{
+				log.debug("Running " + label + " task because at least one product does not exist:")
+				logDebugIndented(nonexisting, log)
+			}
+			action
+		}
+	}
+	private def logDebugIndented[T](it: Iterable[T], log: Logger) { it.foreach(x => log.debug("\t" + x)) }
+	private def mapLastModified(paths: Iterable[Path]): Iterable[Long] = paths.map(_.lastModified)
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
new file mode 100644
index 000000000..a13cefad5
--- /dev/null
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -0,0 +1,892 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah, Nathan Hamblen
+ */
+package sbt
+
+import java.io.{Closeable, File, FileInputStream, FileOutputStream, InputStream, OutputStream}
+import java.io.{ByteArrayOutputStream, InputStreamReader, OutputStreamWriter}
+import java.io.{BufferedReader, BufferedWriter, FileReader, FileWriter, Reader, Writer}
+import java.util.zip.{GZIPInputStream, GZIPOutputStream}
+import java.net.URL
+import java.nio.charset.{Charset, CharsetDecoder, CharsetEncoder}
+import java.nio.channels.FileChannel
+import java.util.jar.{Attributes, JarEntry, JarFile, JarInputStream, JarOutputStream, Manifest}
+import java.util.zip.{GZIPOutputStream, ZipEntry, ZipFile, ZipInputStream, ZipOutputStream}
+
+import OpenResource._
+
+final class Preserved private[sbt](toRestore: scala.collection.Map[File, Path], temp: File) extends NotNull
+{
+	def restore(log: Logger) =
+	{
+		try
+		{
+			Control.lazyFold(toRestore.toList) { case (src, dest) =>
+				FileUtilities.copyFile(src, dest.asFile, log)
+			}
+		}
+		finally { FileUtilities.clean(Path.fromFile(temp) :: Nil, true, log) }
+	}
+}
+
+/** A collection of file related methods. */
+object FileUtilities
+{
+	import wrap.Wrappers.readOnly
+	/** The size of the byte or char buffer used in various methods.*/
+	private val BufferSize = 8192
+	private val Newline = System.getProperty("line.separator")
+	/** A pattern used to split a String by path separator characters.*/
+	private val PathSeparatorPattern = java.util.regex.Pattern.compile(File.pathSeparator)
+
+	/** Splits a String around path separator characters. */
+	private[sbt] def pathSplit(s: String) = PathSeparatorPattern.split(s)
+
+	def preserve(paths: Iterable[Path], log: Logger): Either[String, Preserved] =
+	{
+		for(tmp <- createTemporaryDirectory(log).right) yield
+		{
+			val pathMap = new scala.collection.mutable.HashMap[File, Path]
+			val destinationDirectory = Path.fromFile(tmp)
+			for(source <- paths)
+			{
+				val toPath = Path.fromString(destinationDirectory, source.relativePath)
+				copyFile(source, toPath, log)
+				pathMap(toPath.asFile) = source
+			}
+			new Preserved(readOnly(pathMap), tmp)
+		}
+	}
+	
+	/** Gzips the file 'in' and writes it to 'out'.  'in' cannot be the same file as 'out'. */
+	def gzip(in: Path, out: Path, log: Logger): Option[String] =
+	{
+		require(in != out, "Input file cannot be the same as the output file.")
+		readStream(in.asFile, log) { inputStream =>
+			writeStream(out.asFile, log) { outputStream =>
+				gzip(inputStream, outputStream, log)
+			}
+		}
+	}
+	/** Gzips the InputStream 'in' and writes it to 'output'.  Neither stream is closed.*/
+	def gzip(input: InputStream, output: OutputStream, log: Logger): Option[String] =
+		gzipOutputStream.ioOption(output, "gzipping", log) { gzStream => transfer(input, gzStream, log) }
+
+	def gunzip(input: InputStream, output: OutputStream, log: Logger): Option[String] =
+		gzipInputStream.ioOption(input, "gunzipping", log) { gzStream => transfer(gzStream, output, log) }
+	/** Gunzips the file 'in' and writes it to 'out'.  'in' cannot be the same file as 'out'. */
+	def gunzip(in: Path, out: Path, log: Logger): Option[String] =
+	{
+		require(in != out, "Input file cannot be the same as the output file.")
+		readStream(in.asFile, log) { inputStream =>
+			writeStream(out.asFile, log) { outputStream =>
+				gunzip(inputStream, outputStream, log)
+			}
+		}
+	}
+	
+	/** Creates a jar file.
+	* @param sources The files to include in the jar file.  The path used for the jar is
+	* relative to the base directory for the source.  That is, the path in the jar for source
+	* <code>(basePath ##) / x / y</code> is <code>x / y</code>.
+	* @param outputJar The file to write the jar to.
+	* @param manifest The manifest for the jar.
+	* @param recursive If true, any directories in <code>sources</code> are recursively processed.  Otherwise,
+	* they are not
+	* @param log The Logger to use. */
+	def jar(sources: Iterable[Path], outputJar: Path, manifest: Manifest, recursive: Boolean, log: Logger) =
+		archive(sources, outputJar, Some(manifest), recursive, log)
+	@deprecated def pack(sources: Iterable[Path], outputJar: Path, manifest: Manifest, recursive: Boolean, log: Logger) =
+		jar(sources, outputJar, manifest, recursive, log)
+	/** Creates a zip file.
+	* @param sources The files to include in the jar file.  The path used for the jar is
+	* relative to the base directory for the source.  That is, the path in the jar for source
+	* <code>(basePath ##) / x / y</code> is <code>x / y</code>.
+	* @param outputZip The file to write the zip to.
+	* @param recursive If true, any directories in <code>sources</code> are recursively processed.  Otherwise,
+	* they are not
+	* @param log The Logger to use. */
+	def zip(sources: Iterable[Path], outputZip: Path, recursive: Boolean, log: Logger) =
+		archive(sources, outputZip, None, recursive, log)
+	
+	private def archive(sources: Iterable[Path], outputPath: Path, manifest: Option[Manifest], recursive: Boolean, log: Logger) =
+	{
+		log.info("Packaging " + outputPath + " ...")
+		val outputFile = outputPath.asFile
+		if(outputFile.isDirectory)
+			Some("Specified output file " + outputFile + " is a directory.")
+		else
+		{
+			val outputDir = outputFile.getParentFile
+			val result = createDirectory(outputDir, log) orElse
+				withZipOutput(outputFile, manifest, log)
+				{ output =>
+					val createEntry: (String => ZipEntry) = if(manifest.isDefined) new JarEntry(_) else new ZipEntry(_)
+					writeZip(sources, output, recursive, log)(createEntry)
+				}
+			if(result.isEmpty)
+				log.info("Packaging complete.")
+			result
+		}
+	}
+	
+	private def writeZip(sources: Iterable[Path], output: ZipOutputStream, recursive: Boolean, log: Logger)(createEntry: String => ZipEntry) =
+	{
+		def add(source: Path)
+		{
+			val sourceFile = source.asFile
+			if(sourceFile.isDirectory)
+			{
+				if(recursive)
+					wrapNull(sourceFile.listFiles).foreach(file => add(source / file.getName))
+			}
+			else if(sourceFile.exists)
+			{
+				val relativePath = source.relativePathString("/")
+				log.debug("\tAdding " + source + " as " + relativePath + " ...")
+				val nextEntry = createEntry(relativePath)
+				nextEntry.setTime(sourceFile.lastModified)
+				output.putNextEntry(nextEntry)
+				transferAndClose(new FileInputStream(sourceFile), output, log)
+			}
+			else
+				log.warn("\tSource " + source + " does not exist.")
+		}
+		sources.foreach(add)
+		output.closeEntry()
+		None
+	}
+	
+	private def withZipOutput(file: File, manifest: Option[Manifest], log: Logger)(f: ZipOutputStream => Option[String]): Option[String] =
+	{
+		writeStream(file, log)
+		{
+			fileOut =>
+			{
+				val (zipOut, ext) =
+					manifest match
+					{
+						case Some(mf) =>
+						{
+							import Attributes.Name.MANIFEST_VERSION
+							val main = mf.getMainAttributes
+							if(!main.containsKey(MANIFEST_VERSION))
+								main.put(MANIFEST_VERSION, "1.0")
+							(new JarOutputStream(fileOut, mf), "jar")
+						}
+						case None => (new ZipOutputStream(fileOut), "zip")
+					}
+				Control.trapUnitAndFinally("Error writing " + ext + ": ", log)
+					{ f(zipOut) } { zipOut.close }
+			}
+		}
+	}
+	import scala.collection.Set
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.*/
+	def unzip(from: Path, toDirectory: Path, log: Logger): Either[String, Set[Path]] =
+		unzip(from, toDirectory, AllPassFilter, log)
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.*/
+	def unzip(from: File, toDirectory: Path, log: Logger): Either[String, Set[Path]] =
+		unzip(from, toDirectory, AllPassFilter, log)
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.*/
+	def unzip(from: InputStream, toDirectory: Path, log: Logger): Either[String, Set[Path]] =
+		unzip(from, toDirectory, AllPassFilter, log)
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.*/
+	def unzip(from: URL, toDirectory: Path, log: Logger): Either[String, Set[Path]] =
+		unzip(from, toDirectory, AllPassFilter, log)
+	
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.
+	* Only the entries that match the given filter are extracted. */
+	def unzip(from: Path, toDirectory: Path, filter: NameFilter, log: Logger): Either[String, Set[Path]] =
+		unzip(from.asFile, toDirectory, filter, log)
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.
+	* Only the entries that match the given filter are extracted. */
+	def unzip(from: File, toDirectory: Path, filter: NameFilter, log: Logger): Either[String, Set[Path]] =
+		readStreamValue(from, log)(in => unzip(in, toDirectory, filter, log))
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.
+	* Only the entries that match the given filter are extracted. */
+	def unzip(from: URL, toDirectory: Path, filter: NameFilter, log: Logger): Either[String, Set[Path]] =
+		readStreamValue(from, log) { stream => unzip(stream, toDirectory, filter, log) }
+	/** Unzips the contents of the zip file <code>from</code> to the <code>toDirectory</code> directory.
+	* Only the entries that match the given filter are extracted. */
+	def unzip(from: InputStream, toDirectory: Path, filter: NameFilter, log: Logger): Either[String, Set[Path]] =
+	{
+		createDirectory(toDirectory, log) match
+		{
+			case Some(err) => Left(err)
+			case None => zipInputStream.io(from, "unzipping", log) { zipInput => extract(zipInput, toDirectory, filter, log) }
+		}
+	}
+	private def extract(from: ZipInputStream, toDirectory: Path, filter: NameFilter, log: Logger) =
+	{
+		val set = new scala.collection.mutable.HashSet[Path]
+		def next(): Option[String] =
+		{
+			val entry = from.getNextEntry
+			if(entry == null)
+				None
+			else
+			{
+				val name = entry.getName
+				val result =
+					if(filter.accept(name))
+					{
+						val target = Path.fromString(toDirectory, name)
+						log.debug("Extracting zip entry '" + name + "' to '" + target + "'")
+						val result =
+							if(entry.isDirectory)
+								createDirectory(target, log)
+							else
+							{
+								set += target
+								writeStream(target.asFile, log) { out => FileUtilities.transfer(from, out, log) }
+							}
+						//target.asFile.setLastModified(entry.getTime)
+						result
+					}
+					else
+					{
+						log.debug("Ignoring zip entry '" + name + "'")
+						None
+					}
+				from.closeEntry()
+				result match { case None => next(); case x => x }
+			}
+		}
+		next().toLeft(readOnly(set))
+	}
+	
+	/** Copies all bytes from the given input stream to the given output stream.
+	* Neither stream is closed.*/
+	def transfer(in: InputStream, out: OutputStream, log: Logger): Option[String] =
+		transferImpl(in, out, false, log)
+	/** Copies all bytes from the given input stream to the given output stream.  The
+	* input stream is closed after the method completes.*/
+	def transferAndClose(in: InputStream, out: OutputStream, log: Logger): Option[String] =
+		transferImpl(in, out, true, log)
+	private def transferImpl(in: InputStream, out: OutputStream, close: Boolean, log: Logger): Option[String] =
+	{
+		Control.trapUnitAndFinally("Error during transfer: ", log)
+		{
+			val buffer = new Array[Byte](BufferSize)
+			def read: None.type =
+			{
+				val byteCount = in.read(buffer)
+				if(byteCount >= 0)
+				{
+					out.write(buffer, 0, byteCount)
+					read
+				}
+				else
+					None
+			}
+			read
+		}
+		{ if(close) in.close }
+	}
+
+	/** Creates a file at the given location.*/
+	def touch(path: Path, log: Logger): Option[String] = touch(path.asFile, log)
+	/** Creates a file at the given location.*/
+	def touch(file: File, log: Logger): Option[String] =
+	{
+		Control.trapUnit("Could not create file " + file + ": ", log)
+		{
+			if(file.exists)
+			{
+				def updateFailBase = "Could not update last modified for file " + file
+				Control.trapUnit(updateFailBase + ": ", log)
+					{ if(file.setLastModified(System.currentTimeMillis)) None else Some(updateFailBase) }
+			}
+			else
+				createDirectory(file.getParentFile, log) orElse { file.createNewFile(); None }
+		}
+	}
+	/** Creates a directory at the given location.*/
+	def createDirectory(dir: Path, log: Logger): Option[String] = createDirectory(dir.asFile, log)
+	/** Creates a directory at the given location.*/
+	def createDirectory(dir: File, log: Logger): Option[String] =
+	{
+		Control.trapUnit("Could not create directory " + dir + ": ", log)
+		{
+			if(dir.exists)
+			{
+				if(dir.isDirectory)
+					None
+				else
+					Some(dir + " exists and is not a directory.")
+			}
+			else
+			{
+				dir.mkdirs()
+				log.debug("Created directory " + dir)
+				None
+			}
+		}
+	}
+	/** Creates directories at the given locations.*/
+	def createDirectories(d: Seq[Path], log: Logger): Option[String] = createDirectories(d.toList.map(_.asFile), log)
+	/** Creates directories at the given locations.*/
+	def createDirectories(d: List[File], log: Logger): Option[String] =
+		d match
+		{
+			case Nil => None
+			case head :: tail => createDirectory(head, log) orElse createDirectories(tail, log)
+		}
+	/** The maximum number of times a unique temporary filename is attempted to be created.*/
+	private val MaximumTries = 10
+	/** Creates a temporary directory and returns it.*/
+	def createTemporaryDirectory(log: Logger): Either[String, File] =
+	{
+		def create(tries: Int): Either[String, File] =
+		{
+			if(tries > MaximumTries)
+				Left("Could not create temporary directory.")
+			else
+			{
+				val randomName = "sbt_" + java.lang.Integer.toHexString(random.nextInt)
+				val f = new File(temporaryDirectory, randomName)
+				
+				if(createDirectory(f, log).isEmpty)
+					Right(f)
+				else
+					create(tries + 1)
+			}
+		}
+		create(0)
+	}
+
+	def withTemporaryDirectory(log: Logger)(action: File => Option[String]): Option[String] =
+		 doInTemporaryDirectory(log: Logger)(file => action(file).toLeft(())).left.toOption
+	/** Creates a temporary directory and provides its location to the given function.  The directory
+	* is deleted after the function returns.*/
+	def doInTemporaryDirectory[T](log: Logger)(action: File => Either[String, T]): Either[String, T] =
+	{
+		def doInDirectory(dir: File): Either[String, T] =
+		{
+			Control.trapAndFinally("", log)
+				{ action(dir) }
+				{ delete(dir, true, log) }
+		}
+		createTemporaryDirectory(log).right.flatMap(doInDirectory)
+	}
+	def withTemporaryFile[T](log: Logger, prefix: String, postfix: String)(action: File => Either[String, T]): Either[String, T] =
+	{
+		Control.trap("Error creating temporary file: ", log)
+		{
+			val file = File.createTempFile(prefix, postfix)
+			Control.trapAndFinally("", log)
+				{ action(file) }
+				{ file.delete() }
+		}
+	}
+	
+	/** Copies the files declared in <code>sources</code> to the <code>destinationDirectory</code>
+	* directory.  The source directory hierarchy is flattened so that all copies are immediate
+	* children of <code>destinationDirectory</code>.  Directories are not recursively entered.*/
+	def copyFlat(sources: Iterable[Path], destinationDirectory: Path, log: Logger) =
+	{
+		val targetSet = new scala.collection.mutable.HashSet[Path]
+		copyImpl(sources, destinationDirectory, log)
+		{
+			source =>
+			{
+				val from = source.asFile
+				val toPath = destinationDirectory / from.getName
+				targetSet += toPath
+				val to = toPath.asFile
+				if(!to.exists || from.lastModified > to.lastModified && !from.isDirectory)
+				{
+					log.debug("Copying " + source + " to " + toPath)
+					copyFile(from, to, log)
+				}
+				else
+					None
+			}
+		}.toLeft(readOnly(targetSet))
+	}
+	private def copyImpl(sources: Iterable[Path], destinationDirectory: Path, log: Logger)
+		(doCopy: Path => Option[String]): Option[String] =
+	{
+		val target = destinationDirectory.asFile
+		val creationError =
+			if(target.isDirectory)
+				None
+			else
+				createDirectory(target, log)
+		def copy(sources: List[Path]): Option[String] =
+		{
+			sources match
+			{
+				case src :: remaining =>
+				{
+					doCopy(src) match
+					{
+						case None => copy(remaining)
+						case error => error
+					}
+				}
+				case Nil => None
+			}
+		}
+		creationError orElse ( Control.trapUnit("", log) { copy(sources.toList) } )
+	}
+	/** Retrieves the content of the given URL and writes it to the given File. */
+	def download(url: URL, to: File, log: Logger) =
+	{
+		readStream(url, log) { inputStream =>
+			writeStream(to, log) { outputStream => 
+				transfer(inputStream, outputStream, log)
+			}
+		}
+	}
+	/** Copies the files declared in <code>sources</code> to the <code>destinationDirectory</code>
+	* directory.  Directories are not recursively entered.  The destination hierarchy matches the
+	* source paths relative to any base directories.  For example:
+	*
+	* A source <code>(basePath ##) / x / y</code> is copied to <code>destinationDirectory / x / y</code>.
+	* */
+	def copy(sources: Iterable[Path], destinationDirectory: Path, log: Logger) =
+	{
+		val targetSet = new scala.collection.mutable.HashSet[Path]
+		copyImpl(sources, destinationDirectory, log)
+		{
+			source =>
+			{
+				val from = source.asFile
+				val toPath = Path.fromString(destinationDirectory, source.relativePath)
+				targetSet += toPath
+				val to = toPath.asFile
+				if(!to.exists || from.lastModified > to.lastModified)
+				{
+					if(from.isDirectory)
+						createDirectory(to, log)
+					else
+					{
+						log.debug("Copying " + source + " to " + toPath)
+						copyFile(from, to, log)
+					}
+				}
+				else
+					None
+			}
+		}.toLeft(readOnly(targetSet))
+	}
+	
+	/** Copies the files declared in <code>sources</code> to the <code>targetDirectory</code>
+	* directory.  The source directory hierarchy is flattened so that all copies are immediate
+	* children of <code>targetDirectory</code>.  Directories are not recursively entered.*/
+	def copyFilesFlat(sources: Iterable[File], targetDirectory: Path, log: Logger) =
+	{
+		require(targetDirectory.asFile.isDirectory, "Target '" + targetDirectory + "' is not a directory.")
+		val byName = new scala.collection.mutable.HashMap[String, File]
+		for(source <- sources) byName.put(source.getName, source)
+		val uniquelyNamedSources = byName.values
+		val targetSet = new scala.collection.mutable.HashSet[Path]
+		def copy(source: File): Option[String] =
+		{
+			if(source.isDirectory)
+				copyAll(source.listFiles.toList)
+			else if(source.exists)
+			{
+				val targetPath = targetDirectory / source.getName
+				targetSet += targetPath
+				if(!targetPath.exists || source.lastModified > targetPath.lastModified)
+				{
+					log.debug("Copying " + source + " to " + targetPath)
+					copyFile(source, targetPath.asFile, log)
+				}
+				else
+					None
+			}
+			else
+				None
+		}
+		def copyAll(sources: List[File]): Option[String] =
+			sources match
+			{
+				case head :: tail =>
+					copy(head) match
+					{
+						case None => copyAll(tail)
+						case x => x
+					}
+				case Nil => None
+			}
+		
+		Control.trap("Error copying files: ", log) { copyAll(uniquelyNamedSources.toList).toLeft(readOnly(targetSet)) }
+	}
+	/** Copies <code>sourceFile</code> to <code>targetFile</code>.  If <code>targetFile</code>
+	* exists, it is overwritten.  Note that unlike higher level copies in FileUtilities, this
+	* method always performs the copy, even if sourceFile is older than targetFile.*/
+	def copyFile(sourceFile: Path, targetFile: Path, log: Logger): Option[String] =
+		copyFile(sourceFile.asFile, targetFile.asFile, log)
+	/** Copies <code>sourceFile</code> to <code>targetFile</code>.  If <code>targetFile</code>
+	* exists, it is overwritten.  Note that unlike higher level copies in FileUtilities, this
+	* method always performs the copy, even if sourceFile is older than targetFile.*/
+	def copyFile(sourceFile: File, targetFile: File, log: Logger): Option[String] =
+	{
+		require(sourceFile.exists, "Source file '" + sourceFile.getAbsolutePath + "' does not exist.")
+		require(!sourceFile.isDirectory, "Source file '" + sourceFile.getAbsolutePath + "' is a directory.")
+		readChannel(sourceFile, log)(
+			in => writeChannel(targetFile, log) {
+				out => {
+					val copied = out.transferFrom(in, 0, in.size)
+					if(copied == in.size)
+						None
+					else
+						Some("Could not copy '" + sourceFile + "' to '" + targetFile + "' (" + copied + "/" + in.size + " bytes copied)")
+				}
+			}
+		)
+	}
+	
+	/** Synchronizes the contents of the <code>sourceDirectory</code> directory to the
+	* <code>targetDirectory</code> directory.*/
+	def sync(sourceDirectory: Path, targetDirectory: Path, log: Logger): Option[String] =
+	{
+		copy(((sourceDirectory ##) ** AllPassFilter).get, targetDirectory, log).right.flatMap
+			{ copiedTo => prune(targetDirectory, copiedTo, log).toLeft(()) }.left.toOption
+	}
+	def prune(directory: Path, keepOnly: Iterable[Path], log: Logger): Option[String] =
+	{
+		val existing = ((directory ##) ** AllPassFilter).get
+		val toRemove = scala.collection.mutable.HashSet(existing.toSeq: _*)
+		toRemove --= keepOnly
+		if(log.atLevel(Level.Debug))
+			toRemove.foreach(r => log.debug("Pruning " + r))
+		clean(toRemove, true, log)
+	}
+	
+	/** Copies the contents of the <code>source</code> directory to the <code>target</code> directory .*/
+	def copyDirectory(source: Path, target: Path, log: Logger): Option[String] =
+		copyDirectory(source.asFile, target.asFile, log)
+	/** Copies the contents of the <code>source</code> directory to the <code>target</code> directory .*/
+	def copyDirectory(source: File, target: File, log: Logger): Option[String] =
+	{
+		require(source.isDirectory, "Source '" + source.getAbsolutePath + "' is not a directory.")
+		require(!target.exists, "Target '" + target.getAbsolutePath + "' already exists.")
+		def copyDirectory(sourceDir: File, targetDir: File): Option[String] =
+			createDirectory(targetDir, log) orElse copyContents(sourceDir, targetDir)
+		def copyContents(sourceDir: File, targetDir: File): Option[String] =
+			sourceDir.listFiles.foldLeft(None: Option[String])
+			{
+				(result, file) =>
+					result orElse
+					{
+						val targetFile = new File(targetDir, file.getName)
+						if(file.isDirectory)
+							copyDirectory(file, targetFile)
+						else
+							copyFile(file, targetFile, log)
+					}
+			}
+		copyDirectory(source, target)
+	}
+
+	
+	/** Deletes the given file recursively.*/
+	def clean(file: Path, log: Logger): Option[String] = clean(file :: Nil, log)
+	/** Deletes the given files recursively.*/
+	def clean(files: Iterable[Path], log: Logger): Option[String] = clean(files, false, log)
+	/** Deletes the given files recursively.  <code>quiet</code> determines the logging level.
+	* If it is true, each file in <code>files</code> is logged at the <code>info</code> level.
+	* If it is false, the <code>debug</code> level is used.*/
+	def clean(files: Iterable[Path], quiet: Boolean, log: Logger): Option[String] =
+		deleteFiles(files.map(_.asFile), quiet, log)
+			
+	private def deleteFiles(files: Iterable[File], quiet: Boolean, log: Logger): Option[String] =
+		((None: Option[String]) /: files)( (result, file) => result orElse delete(file, quiet, log))
+	private def delete(file: File, quiet: Boolean, log: Logger): Option[String] =
+	{
+		def logMessage(message: => String)
+		{
+			log.log(if(quiet) Level.Debug else Level.Info, message)
+		}
+		Control.trapUnit("Error deleting file " + file + ": ", log)
+		{
+			if(file.isDirectory)
+			{
+				logMessage("Deleting directory " + file)
+				deleteFiles(wrapNull(file.listFiles), true, log)
+				file.delete
+			}
+			else if(file.exists)
+			{
+				logMessage("Deleting file " + file)
+				file.delete
+			}
+			None
+		}
+	}
+	
+	/** Appends the given <code>String content</code> to the provided <code>file</code> using the default encoding.
+	* A new file is created if it does not exist.*/
+	def append(file: File, content: String, log: Logger): Option[String] = append(file, content, Charset.defaultCharset, log)
+	/** Appends the given <code>String content</code> to the provided <code>file</code> using the given encoding.
+	* A new file is created if it does not exist.*/
+	def append(file: File, content: String, charset: Charset, log: Logger): Option[String] =
+		write(file, content, charset, true, log)
+	
+	/** Writes the given <code>String content</code> to the provided <code>file</code> using the default encoding.
+	* If the file exists, it is overwritten.*/
+	def write(file: File, content: String, log: Logger): Option[String] = write(file, content, Charset.defaultCharset, log)
+	/** Writes the given <code>String content</code> to the provided <code>file</code> using the given encoding.
+	* If the file already exists, it is overwritten.*/
+	def write(file: File, content: String, charset: Charset, log: Logger): Option[String] =
+		write(file, content, charset, false, log)
+	private def write(file: File, content: String, charset: Charset, append: Boolean, log: Logger): Option[String] =
+	{
+		if(charset.newEncoder.canEncode(content))
+			write(file, charset, append, log) { w =>  w.write(content); None }
+		else
+			Some("String cannot be encoded by default charset.")
+	}
+	
+	/** Opens a <code>Writer</code> on the given file using the default encoding,
+	* passes it to the provided function, and closes the <code>Writer</code>.*/
+	def write(file: File, log: Logger)(f: Writer => Option[String]): Option[String] =
+		write(file, Charset.defaultCharset, log)(f)
+	/** Opens a <code>Writer</code> on the given file using the given encoding,
+	* passes it to the provided function, and closes the <code>Writer</code>.*/
+	def write(file: File, charset: Charset, log: Logger)(f: Writer => Option[String]): Option[String] =
+		write(file, charset, false, log)(f)
+	private def write(file: File, charset: Charset, append: Boolean, log: Logger)(f: Writer => Option[String]): Option[String] =
+		fileWriter(charset, append).ioOption(file, Writing, log)(f)
+		
+	/** Opens a <code>Reader</code> on the given file using the default encoding,
+	* passes it to the provided function, and closes the <code>Reader</code>.*/
+	def read(file: File, log: Logger)(f: Reader => Option[String]): Option[String] =
+		read(file, Charset.defaultCharset, log)(f)
+	/** Opens a <code>Reader</code> on the given file using the default encoding,
+	* passes it to the provided function, and closes the <code>Reader</code>.*/
+	def read(file: File, charset: Charset, log: Logger)(f: Reader => Option[String]): Option[String] =
+		fileReader(charset).ioOption(file, Reading, log)(f)
+	/** Opens a <code>Reader</code> on the given file using the default encoding,
+	* passes it to the provided function, and closes the <code>Reader</code>.*/
+	def readValue[R](file: File, log: Logger)(f: Reader => Either[String, R]): Either[String, R] =
+		readValue(file, Charset.defaultCharset, log)(f)
+	/** Opens a <code>Reader</code> on the given file using the given encoding,
+	* passes it to the provided function, and closes the <code>Reader</code>.*/
+	def readValue[R](file: File, charset: Charset, log: Logger)(f: Reader => Either[String, R]): Either[String, R] =
+		fileReader(charset).io(file, Reading, log)(f)
+		
+	/** Reads the contents of the given file into a <code>String</code> using the default encoding.
+	*  The resulting <code>String</code> is wrapped in <code>Right</code>.*/
+	def readString(file: File, log: Logger): Either[String, String] = readString(file, Charset.defaultCharset, log)
+	/** Reads the contents of the given file into a <code>String</code> using the given encoding.
+	*  The resulting <code>String</code> is wrapped in <code>Right</code>.*/
+	def readString(file: File, charset: Charset, log: Logger): Either[String, String] = readValue(file, charset, log)(readString)
+	
+	def readString(in: InputStream, log: Logger): Either[String, String] = readString(in, Charset.defaultCharset, log)
+	def readString(in: InputStream, charset: Charset, log: Logger): Either[String, String] =
+		streamReader.io((in, charset), Reading, log)(readString)
+	def readString(in: Reader, log: Logger): Either[String, String] =
+		Control.trapAndFinally("Error reading bytes from reader: ", log)
+			{ readString(in) }
+			{ in.close() }
+	private def readString(in: Reader): Either[String, String] =
+	{
+		val builder = new StringBuilder
+		val buffer = new Array[Char](BufferSize)
+		def readNext()
+		{
+			val read = in.read(buffer, 0, buffer.length)
+			if(read >= 0)
+			{
+				builder.append(buffer, 0, read)
+				readNext()
+			}
+			else
+				None
+		}
+		readNext()
+		Right(builder.toString)
+	}
+	/** Appends the given bytes to the given file. */
+	def append(file: File, bytes: Array[Byte], log: Logger): Option[String] =
+		writeBytes(file, bytes, true, log)
+	/** Writes the given bytes to the given file. If the file already exists, it is overwritten.*/
+	def write(file: File, bytes: Array[Byte], log: Logger): Option[String] =
+		writeBytes(file, bytes, false, log)
+	private def writeBytes(file: File, bytes: Array[Byte], append: Boolean, log: Logger): Option[String] =
+		writeStream(file, append, log) { out => out.write(bytes); None }
+	
+	/** Reads the entire file into a byte array. */
+	def readBytes(file: File, log: Logger): Either[String, Array[Byte]] = readStreamValue(file, log)(readBytes)
+	def readBytes(in: InputStream, log: Logger): Either[String, Array[Byte]] =
+		Control.trapAndFinally("Error reading bytes from input stream: ", log)
+			{ readBytes(in) }
+			{ in.close() }
+	private def readBytes(in: InputStream): Either[String, Array[Byte]] =
+	{
+		val out = new ByteArrayOutputStream
+		val buffer = new Array[Byte](BufferSize)
+		def readNext()
+		{
+			val read = in.read(buffer)
+			if(read >= 0)
+			{
+				out.write(buffer, 0, read)
+				readNext()
+			}
+		}
+		readNext()
+		Right(out.toByteArray)
+	}
+		
+	/** Opens an <code>OutputStream</code> on the given file with append=true and passes the stream
+	* to the provided function.  The stream is closed before this function returns.*/
+	def appendStream(file: File, log: Logger)(f: OutputStream => Option[String]): Option[String] =
+		fileOutputStream(true).ioOption(file, Appending, log)(f)
+	/** Opens an <code>OutputStream</code> on the given file and passes the stream
+	* to the provided function.  The stream is closed before this function returns.*/
+	def writeStream(file: File, log: Logger)(f: OutputStream => Option[String]): Option[String] =
+		fileOutputStream(false).ioOption(file, Writing, log)(f)
+	private def writeStream(file: File, append: Boolean, log: Logger)(f: OutputStream => Option[String]): Option[String] =
+		if(append) appendStream(file, log)(f) else writeStream(file, log)(f)
+	/** Opens an <code>InputStream</code> on the given file and passes the stream
+	* to the provided function.  The stream is closed before this function returns.*/
+	def readStream(file: File, log: Logger)(f: InputStream => Option[String]): Option[String] =
+		fileInputStream.ioOption(file, Reading, log)(f)
+	/** Opens an <code>InputStream</code> on the given file and passes the stream
+	* to the provided function.  The stream is closed before this function returns.*/
+	def readStreamValue[R](file: File, log: Logger)(f: InputStream => Either[String, R]): Either[String, R] =
+		fileInputStream.io(file, Reading, log)(f)
+	/** Opens an <code>InputStream</code> on the given <code>URL</code> and passes the stream
+	* to the provided function.  The stream is closed before this function returns.*/
+	def readStream(url: URL, log: Logger)(f: InputStream => Option[String]): Option[String] =
+		urlInputStream.ioOption(url, Reading, log)(f)
+	/** Opens an <code>InputStream</code> on the given <code>URL</code> and passes the stream
+	* to the provided function.  The stream is closed before this function returns.*/
+	def readStreamValue[R](url: URL, log: Logger)(f: InputStream => Either[String, R]): Either[String, R] =
+		urlInputStream.io(url, Reading, log)(f)
+		
+	/** Opens a <code>FileChannel</code> on the given file for writing and passes the channel
+	* to the given function.  The channel is closed before this function returns.*/
+	def writeChannel(file: File, log: Logger)(f: FileChannel => Option[String]): Option[String] =
+		fileOutputChannel.ioOption(file, Writing, log)(f)
+	/** Opens a <code>FileChannel</code> on the given file for reading and passes the channel
+	* to the given function.  The channel is closed before this function returns.*/
+	def readChannel(file: File, log: Logger)(f: FileChannel => Option[String]): Option[String] =
+		fileInputChannel.ioOption(file, Reading, log)(f)
+	/** Opens a <code>FileChannel</code> on the given file for reading and passes the channel
+	* to the given function.  The channel is closed before this function returns.*/
+	def readChannelValue[R](file: File, log: Logger)(f: FileChannel => Either[String, R]): Either[String, R] =
+		fileInputChannel.io(file, Reading, log)(f)
+	
+	private[sbt] def wrapNull(a: Array[File]): Array[File] =
+		if(a == null)
+			new Array[File](0)
+		else
+			a
+			
+	/** Writes the given string to the writer followed by a newline.*/
+	private[sbt] def writeLine(writer: Writer, line: String)
+	{
+		writer.write(line)
+		writer.write(Newline)
+	}
+	
+	/** The directory in which temporary files are placed.*/
+	val temporaryDirectory = new File(System.getProperty("java.io.tmpdir"))
+	def classLocation(cl: Class[_]): URL = cl.getProtectionDomain.getCodeSource.getLocation
+	def classLocationFile(cl: Class[_]): File = new File(classLocation(cl).toURI)
+	def classLocation[T](implicit mf: scala.reflect.Manifest[T]): URL = classLocation(mf.erasure)
+	def classLocationFile[T](implicit mf: scala.reflect.Manifest[T]): File = classLocationFile(mf.erasure)
+	
+	/** The location of the jar containing this class.*/
+	lazy val sbtJar: File = classLocationFile(getClass)
+	lazy val scalaLibraryJar: File = classLocationFile[scala.ScalaObject]
+	lazy val scalaCompilerJar: File = classLocationFile[scala.tools.nsc.Settings]
+	
+	/** The producer of randomness for unique name generation.*/
+	private val random = new java.util.Random
+
+	private val Reading = "reading"
+	private val Writing = "writing"
+	private val Appending = "appending"
+}
+
+private abstract class OpenResource[Source, T] extends NotNull
+{
+	import OpenResource.{unwrapEither, wrapEither}
+	protected def open(src: Source, log: Logger): Either[String, T]
+	def ioOption(src: Source, op: String, log: Logger)(f: T => Option[String]) =
+		unwrapEither( io(src, op, log)(wrapEither(f)) )
+	def io[R](src: Source, op: String, log: Logger)(f: T => Either[String,R]): Either[String, R] =
+		open(src, log).right flatMap
+		{
+			resource => Control.trapAndFinally("Error " + op + " "+ src + ": ", log)
+				{ f(resource) }
+				{ close(resource) }
+		}
+	protected def close(out: T): Unit
+}
+private trait CloseableOpenResource[Source, T <: Closeable] extends OpenResource[Source, T]
+{
+	protected def close(out: T): Unit = out.close()
+}
+import scala.reflect.{Manifest => SManifest}
+private abstract class WrapOpenResource[Source, T <: Closeable](implicit srcMf: SManifest[Source], targetMf: SManifest[T]) extends CloseableOpenResource[Source, T]
+{
+	private def label[S](m: SManifest[S]) = m.erasure.getSimpleName
+	protected def open(source: Source): T
+	protected final def open(source: Source, log: Logger): Either[String, T] =
+		Control.trap("Error wrapping " + label(srcMf) + " in " + label(targetMf) + ": ", log) { Right(open(source)) }
+}
+private abstract class OpenFile[T] extends OpenResource[File, T]
+{
+	protected def open(file: File): T
+	protected final def open(file: File, log: Logger): Either[String, T] =
+	{
+		val parent = file.getParentFile
+		if(parent != null)
+			FileUtilities.createDirectory(parent, log)
+		Control.trap("Error opening " + file + ": ", log) { Right(open(file)) }
+	}
+}
+private abstract class CloseableOpenFile[T <: Closeable] extends OpenFile[T] with CloseableOpenResource[File, T]
+private object OpenResource
+{
+	private def wrapEither[R](f: R => Option[String]): (R => Either[String, Unit]) = (r: R) => f(r).toLeft(())
+	private def unwrapEither(e: Either[String, Unit]): Option[String] = e.left.toOption
+	
+	def fileOutputStream(append: Boolean) =
+		new CloseableOpenFile[FileOutputStream] { protected def open(file: File) = new FileOutputStream(file, append) }
+	def fileInputStream = new CloseableOpenFile[FileInputStream]
+		{ protected def open(file: File) = new FileInputStream(file) }
+	def urlInputStream = new CloseableOpenResource[URL, InputStream]
+		{ protected def open(url: URL, log: Logger) = Control.trap("Error opening " + url + ": ", log) { Right(url.openStream) } }
+	def fileOutputChannel = new CloseableOpenFile[FileChannel]
+		{ protected def open(f: File) = (new FileOutputStream(f)).getChannel }
+	def fileInputChannel = new CloseableOpenFile[FileChannel]
+		{ protected def open(f: File) = (new FileInputStream(f)).getChannel }
+	def fileWriter(charset: Charset, append: Boolean) = new CloseableOpenFile[Writer]
+		{ protected def open(f: File) = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f, append), charset)) }
+	def fileReader(charset: Charset) = new CloseableOpenFile[Reader]
+		{ protected def open(f: File) = new BufferedReader(new InputStreamReader(new FileInputStream(f), charset)) }
+	def jarFile(verify: Boolean) = new OpenFile[JarFile]
+		{ protected def open(f: File) = new JarFile(f, verify)
+		   override protected def close(j: JarFile) = j.close() }
+	def zipFile = new OpenFile[ZipFile]
+		{ protected def open(f: File) = new ZipFile(f)
+		   override protected def close(z: ZipFile) = z.close() }
+	def streamReader = new WrapOpenResource[(InputStream, Charset), Reader]
+		{ protected def open(streamCharset: (InputStream, Charset)) = new InputStreamReader(streamCharset._1, streamCharset._2) }
+	def gzipInputStream = new WrapOpenResource[InputStream, GZIPInputStream]
+		{ protected def open(in: InputStream) = new GZIPInputStream(in) }
+	def zipInputStream = new WrapOpenResource[InputStream, ZipInputStream]
+		{ protected def open(in: InputStream) = new ZipInputStream(in) }
+	def gzipOutputStream = new WrapOpenResource[OutputStream, GZIPOutputStream]
+		{ protected def open(out: OutputStream) = new GZIPOutputStream(out)
+		   override protected def close(out: GZIPOutputStream) = out.finish() }
+	def jarOutputStream = new WrapOpenResource[OutputStream, JarOutputStream]
+		{ protected def open(out: OutputStream) = new JarOutputStream(out) }
+	def jarInputStream = new WrapOpenResource[InputStream, JarInputStream]
+		{ protected def open(in: InputStream) = new JarInputStream(in) }
+	def zipEntry(zip: ZipFile) = new CloseableOpenResource[ZipEntry, InputStream] {
+		protected def open(entry: ZipEntry, log: Logger) =
+			Control.trap("Error opening " + entry.getName + " in " + zip + ": ", log) { Right(zip.getInputStream(entry)) }
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Fork.scala b/src/main/scala/sbt/Fork.scala
new file mode 100644
index 000000000..278a77843
--- /dev/null
+++ b/src/main/scala/sbt/Fork.scala
@@ -0,0 +1,82 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+
+abstract class ForkJava extends NotNull
+{
+	def javaHome: Option[File] = None
+}
+abstract class ForkScala extends ForkJava
+{
+	def scalaJars: Iterable[File] = None
+}
+trait ForkScalaRun extends ForkScala
+{
+	def workingDirectory: Option[File] = None
+	def runJVMOptions: Seq[String] = Nil
+}
+trait ForkScalaCompiler extends ForkScala
+{
+	def compileJVMOptions: Seq[String] = Nil
+}
+
+import java.lang.{ProcessBuilder => JProcessBuilder}
+object Fork
+{
+	private val ScalacMainClass = "scala.tools.nsc.Main"
+	private val ScalaMainClass = "scala.tools.nsc.MainGenericRunner"
+	val java = new ForkJava("java")
+	val javac = new ForkJava("javac")
+	val scala = new ForkScala(ScalaMainClass)
+	val scalac = new ForkScala(ScalacMainClass)
+	
+	private def javaCommand(javaHome: Option[File], name: String): File =
+	{
+		val home = javaHome.getOrElse(new File(System.getProperty("java.home")))
+		new File(new File(home, "bin"), name)
+	}
+	final class ForkJava(commandName: String) extends NotNull
+	{
+		def apply(javaHome: Option[File], options: Seq[String], log: Logger): Int =
+			apply(javaHome, options, None, log)
+		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: File, log: Logger): Int =
+			apply(javaHome, options, Some(workingDirectory), log)
+		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], log: Logger): Int =
+			apply(javaHome, options, workingDirectory, Map.empty, log)
+		/** env is additional environment variables*/
+		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], env: Map[String, String], log: Logger): Int =
+		{
+			val executable = javaCommand(javaHome, commandName).getAbsolutePath
+			val command = (executable :: options.toList).toArray
+			log.debug("Forking java process: " + command.mkString(" ") + workingDirectory.map("\n\tin " + _.getAbsolutePath).getOrElse(""))
+			val builder = new JProcessBuilder(command : _*)
+			workingDirectory.foreach(wd => builder.directory(wd))
+			val environment = builder.environment
+			for( (key, value) <- env )
+				environment.put(key, value)
+			Process(builder) ! log
+		}
+	}
+	final class ForkScala(mainClassName: String) extends NotNull
+	{
+		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], log: Logger): Int =
+			apply(javaHome, jvmOptions, scalaJars, arguments, None, log)
+		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], workingDirectory: File, log: Logger): Int =
+			apply(javaHome, jvmOptions, scalaJars, arguments, Some(workingDirectory), log)
+		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], workingDirectory: Option[File], log: Logger): Int =
+		{
+			val scalaClasspath =
+				if(scalaJars.isEmpty)
+					FileUtilities.scalaLibraryJar :: FileUtilities.scalaCompilerJar :: Nil
+				else
+					scalaJars
+			val scalaClasspathString = "-Xbootclasspath/a:" + scalaClasspath.map(_.getAbsolutePath).mkString(File.pathSeparator)
+			val mainClass = if(mainClassName.isEmpty) Nil else mainClassName :: Nil
+			val options = jvmOptions ++ (scalaClasspathString :: mainClass ::: arguments.toList)
+			Fork.java(javaHome, options, workingDirectory, log)
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Format.scala b/src/main/scala/sbt/Format.scala
new file mode 100644
index 000000000..5e2f70425
--- /dev/null
+++ b/src/main/scala/sbt/Format.scala
@@ -0,0 +1,45 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah, David MacIver
+ */
+package sbt
+
+import java.io.File
+import scala.collection.mutable.{HashSet, Set}
+
+trait Format[T] extends NotNull
+{
+	def toString(t: T): String
+	def fromString(s: String): T
+}
+abstract class SimpleFormat[T] extends Format[T]
+{
+	def toString(t: T) = t.toString
+}
+object Format
+{
+	def path(basePath: Path): Format[Path] = new Format[Path]
+	{
+		def toString(path: Path) = path.relativePath
+		def fromString(s: String) = Path.fromString(basePath, s)
+	}
+	implicit val file: Format[File] = new Format[File]
+	{
+		def toString(file: File) = file.getAbsolutePath
+		def fromString(s: String) = (new File(s)).getAbsoluteFile
+	}
+	implicit val hash: Format[Array[Byte]] = new Format[Array[Byte]]
+	{
+		def toString(hash: Array[Byte]) = Hash.toHex(hash)
+		def fromString(hash: String) = Hash.fromHex(hash)
+	}
+	def set[T](implicit format: Format[T]): Format[Set[T]] = new Format[Set[T]]
+	{
+		def toString(set: Set[T]) = set.toList.map(format.toString).mkString(File.pathSeparator)
+		def fromString(s: String) = (new HashSet[T]) ++ FileUtilities.pathSplit(s).map(_.trim).filter(!_.isEmpty).map(format.fromString)
+	}
+	implicit val string: Format[String] = new SimpleFormat[String] { def fromString(s: String) = s }
+	implicit val test: Format[TestDefinition] = new SimpleFormat[TestDefinition]
+	{
+		def fromString(s: String) = TestParser.parse(s).fold(error, x => x)
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Hash.scala b/src/main/scala/sbt/Hash.scala
new file mode 100644
index 000000000..2a8434394
--- /dev/null
+++ b/src/main/scala/sbt/Hash.scala
@@ -0,0 +1,79 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.{ByteArrayInputStream, File, InputStream}
+
+object Hash
+{
+	private val BufferSize = 8192
+	def toHex(bytes: Array[Byte]): String =
+	{
+		val buffer = new StringBuilder(bytes.length * 2)
+		for(i <- 0 until bytes.length)
+		{
+			val b = bytes(i)
+			val bi: Int = if(b < 0) b + 256 else b
+			buffer append toHex((bi >>> 4).asInstanceOf[Byte])
+			buffer append toHex((bi & 0x0F).asInstanceOf[Byte])
+		}
+		buffer.toString
+	}
+	def fromHex(hex: String): Array[Byte] =
+	{
+		require((hex.length & 1) == 0, "Hex string must have length 2n.")
+		val array = new Array[Byte](hex.length >> 1)
+		for(i <- 0 until hex.length by 2)
+		{
+			val c1 = hex.charAt(i)
+			val c2 = hex.charAt(i+1)
+			array(i >> 1) = ((fromHex(c1) << 4) | fromHex(c2)).asInstanceOf[Byte]
+		}
+		array
+	}
+	/** Calculates the SHA-1 hash of the given String.*/
+	def apply(s: String, log: Logger): Either[String, Array[Byte]] = apply(new ByteArrayInputStream(s.getBytes("UTF-8")), log)
+	/** Calculates the SHA-1 hash of the given file.*/
+	def apply(path: Path, log: Logger): Either[String, Array[Byte]] = apply(path.asFile, log)
+	/** Calculates the SHA-1 hash of the given file.*/
+	def apply(file: File, log: Logger): Either[String, Array[Byte]] =
+		FileUtilities.readStreamValue(file, log) { stream => apply(stream, log) }
+	/** Calculates the SHA-1 hash of the given stream, closing it when finished.*/
+	def apply(stream: InputStream, log: Logger): Either[String, Array[Byte]] =
+	{
+		import java.security.{MessageDigest, DigestInputStream}
+		val digest = MessageDigest.getInstance("SHA")
+		Control.trapAndFinally("Error computing digest: ", log)
+		{
+			val dis = new DigestInputStream(stream, digest)
+			val buffer = new Array[Byte](BufferSize)
+			while(dis.read(buffer) >= 0) {}
+			dis.close()
+			Right(digest.digest)
+		}
+		{ stream.close() }
+	}
+
+	private def toHex(b: Byte): Char =
+	{
+		require(b >= 0 && b <= 15, "Byte " + b + " was not between 0 and 15")
+		if(b < 10)
+			('0'.asInstanceOf[Int] + b).asInstanceOf[Char]
+		else
+			('a'.asInstanceOf[Int] + (b-10)).asInstanceOf[Char]
+	}
+	private def fromHex(c: Char): Int =
+	{
+		val b =
+			if(c >= '0' && c <= '9')
+				(c - '0')
+			else if(c >= 'a' && c <= 'f')
+				(c - 'a') + 10
+			else if(c >= 'A' && c <= 'F')
+				(c - 'A') + 10
+			else
+				throw new RuntimeException("Invalid hex character: '" + c + "'.")
+		b
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/IntegrationTesting.scala b/src/main/scala/sbt/IntegrationTesting.scala
new file mode 100644
index 000000000..f37592748
--- /dev/null
+++ b/src/main/scala/sbt/IntegrationTesting.scala
@@ -0,0 +1,85 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Steven Blundy, Mark Harrah
+ */
+package sbt
+
+import ScalaProject.{optionsAsString, javaOptionsAsString}
+
+trait IntegrationTesting extends NotNull
+{
+	/** Override to provide pre-test setup. */
+	protected def pretests: Option[String] = None
+	/** Override to provide post-test cleanup. */
+	protected def posttests: Option[String] = None
+}
+trait ScalaIntegrationTesting extends IntegrationTesting
+{ self: ScalaProject =>
+
+	protected def integrationTestTask(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) =
+		testTask(frameworks, classpath, analysis, options)
+}
+
+trait BasicScalaIntegrationTesting extends BasicIntegrationTesting with MavenStyleIntegrationTestPaths
+{ self: BasicScalaProject => }
+/** A fully featured integration testing that may be mixed in with any subclass of <code>BasicScalaProject</code>.
+ * Pre-suite setup and post-suite cleanup are provide by overriding <code>pretests</code> and <code>posttests</code> respectively.*/
+trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTestPaths with BasicDependencyProject
+{
+	self: BasicScalaProject =>
+
+	import BasicScalaIntegrationTesting._
+	
+	lazy val integrationTestCompile = integrationTestCompileAction
+	lazy val integrationTest = integrationTestAction
+
+	val integrationTestCompileConditional = new CompileConditional(integrationTestCompileConfiguration)
+
+	protected def integrationTestAction = integrationTestTask(integrationTestFrameworks, integrationTestClasspath, integrationTestCompileConditional.analysis, integrationTestOptions) dependsOn integrationTestCompile describedAs IntegrationTestCompileDescription
+	protected def integrationTestCompileAction = integrationTestCompileTask() dependsOn compile describedAs IntegrationTestDescription
+
+	protected def integrationTestCompileTask() = task{ integrationTestCompileConditional.run }
+
+	def integrationTestOptions: Seq[TestOption] = 
+		TestSetup(() => pretests) ::
+		TestCleanup(() => posttests) ::
+		testOptions.toList
+	def integrationTestCompileOptions = testCompileOptions
+	def javaIntegrationTestCompileOptions: Seq[JavaCompileOption] = testJavaCompileOptions
+	
+	def integrationTestConfiguration = if(useIntegrationTestConfiguration) Configurations.IntegrationTest else Configurations.Test
+	def integrationTestClasspath = fullClasspath(integrationTestConfiguration) +++ optionalClasspath
+	
+	def integrationTestLabel = "integration-test"
+	def integrationTestCompileConfiguration = new IntegrationTestCompileConfig
+	
+	protected def integrationTestDependencies = new LibraryDependencies(this, integrationTestCompileConditional)
+
+	def integrationTestFrameworks = testFrameworks
+	override def useIntegrationTestConfiguration = false
+	abstract override def fullUnmanagedClasspath(config: Configuration) =
+	{
+		val superClasspath = super.fullUnmanagedClasspath(config)
+		if(config == integrationTestConfiguration)
+			integrationTestCompilePath +++ integrationTestResourcesPath +++ superClasspath
+		else
+			superClasspath
+	}
+
+	class IntegrationTestCompileConfig extends BaseCompileConfig
+	{
+		def label = integrationTestLabel
+		def sources = integrationTestSources
+		def outputDirectory = integrationTestCompilePath
+		def classpath = integrationTestClasspath
+		def analysisPath = integrationTestAnalysisPath
+		def baseCompileOptions = integrationTestCompileOptions
+		def javaOptions = javaOptionsAsString(javaCompileOptions)
+		def testDefinitionClassNames = integrationTestFrameworks.map(_.testSuperClassName)
+	}
+}
+
+object BasicScalaIntegrationTesting
+{
+	val IntegrationTestCompileDescription = "Compiles integration test sources."
+	val IntegrationTestDescription = "Runs all integration tests detected during compilation."
+}
diff --git a/src/main/scala/sbt/LineReader.scala b/src/main/scala/sbt/LineReader.scala
new file mode 100644
index 000000000..1332f6aac
--- /dev/null
+++ b/src/main/scala/sbt/LineReader.scala
@@ -0,0 +1,97 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+package sbt
+
+trait LineReader extends NotNull
+{
+	def readLine(prompt: String): Option[String]
+}
+class Completors(val projectAction: String, val projectNames: Iterable[String],
+	val generalCommands: Iterable[String], val propertyActions: Iterable[String],
+	val prefixes: Iterable[String]) extends NotNull
+import jline.ConsoleReader
+abstract class JLine extends LineReader
+{
+	protected[this] val reader: ConsoleReader
+	def readLine(prompt: String) =
+		reader.readLine(prompt) match
+		{
+			case null => None
+			case x => Some(x.trim)
+		}
+}
+object SimpleReader extends JLine
+{
+	protected[this] val reader =
+	{
+		val cr = new ConsoleReader
+		cr.setBellEnabled(false)
+		cr
+	}
+}
+class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger) extends JLine
+{
+	import completors._
+	import jline.{ArgumentCompletor, Completor, MultiCompletor, NullCompletor, SimpleCompletor}
+	
+	private val generalCompletor = simpleCompletor(generalCommands)
+	private val projectCompletor = simpleArgumentCompletor(projectAction :: Nil, projectNames)
+		
+	private val completor = new MultiCompletor()
+	
+	protected[this] val reader =
+	{
+		val cr = new ConsoleReader
+		cr.setBellEnabled(false)
+		for(historyLocation <- historyPath)
+		{
+			val historyFile = historyLocation.asFile
+			Control.trapAndLog(log)
+			{
+				historyFile.getParentFile.mkdirs()
+				cr.getHistory.setHistoryFile(historyFile)
+			}
+		}
+		cr.addCompletor(completor)
+		cr
+	}
+	
+	/** Used for a single argument so that the argument can have spaces in it.*/
+	object SingleArgumentDelimiter extends ArgumentCompletor.AbstractArgumentDelimiter
+	{
+		def isDelimiterChar(buffer: String, pos: Int) =
+			(buffer.charAt(pos) == ' ') && buffer.substring(0, pos).trim.indexOf(' ') == -1
+	}
+	
+	private def simpleCompletor(completions: Iterable[String]) = new SimpleCompletor(completions.toList.toArray)
+	private def simpleArgumentCompletor(first: Iterable[String], second: Iterable[String]) =
+		singleArgumentCompletor(simpleCompletor(first), simpleCompletor(second))
+	private def singleArgumentCompletor(first: Completor, second: Completor) =
+	{
+		val completors = Array(first, second, new NullCompletor)
+		val c = new ArgumentCompletor(completors, SingleArgumentDelimiter)
+		c.setStrict(true)
+		c
+	}
+	private def repeatedArgumentCompletor(first: Completor, repeat: Completor) =
+	{
+		val c = new ArgumentCompletor(Array(first, repeat))
+		c.setStrict(true)
+		c
+	}
+	
+	private def propertyCompletor(propertyNames: Iterable[String]) =
+		simpleArgumentCompletor(propertyActions, propertyNames)
+	private def prefixedCompletor(baseCompletor: Completor) =
+		singleArgumentCompletor(simpleCompletor(prefixes.toList.toArray), baseCompletor)
+	def setVariableCompletions(taskNames: Iterable[String], propertyNames: Iterable[String], extra: Iterable[(String, Iterable[String])] )
+	{
+		import scala.collection.immutable.TreeSet
+		val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
+		val extraCompletors = for( (first, repeat) <- extra) yield repeatedArgumentCompletor(simpleCompletor(first :: Nil), simpleCompletor(repeat))
+		val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
+		val baseCompletor = new MultiCompletor(baseCompletors.toArray)
+		completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor)) )
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
new file mode 100644
index 000000000..b637a4499
--- /dev/null
+++ b/src/main/scala/sbt/Logger.scala
@@ -0,0 +1,337 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import scala.collection.mutable.{Buffer, HashMap, ListBuffer}
+
+sealed trait LogEvent extends NotNull
+final class Success(val msg: String) extends LogEvent
+final class Log(val level: Level.Value, val msg: String) extends LogEvent
+final class Trace(val exception: Throwable) extends LogEvent
+final class SetLevel(val newLevel: Level.Value) extends LogEvent
+final class SetTrace(val enabled: Boolean) extends LogEvent
+final class ControlEvent(val event: ControlEvent.Value, val msg: String) extends LogEvent
+
+object ControlEvent extends Enumeration
+{
+	val Start, Header, Finish = Value
+}
+
+abstract class Logger extends NotNull
+{
+	def getLevel: Level.Value
+	def setLevel(newLevel: Level.Value)
+	def enableTrace(flag: Boolean)
+	def traceEnabled: Boolean
+	
+	def atLevel(level: Level.Value) = level.id >= getLevel.id
+	def trace(t: => Throwable): Unit
+	final def debug(message: => String): Unit = log(Level.Debug, message)
+	final def info(message: => String): Unit = log(Level.Info, message)
+	final def warn(message: => String): Unit = log(Level.Warn, message)
+	final def error(message: => String): Unit = log(Level.Error, message)
+	def success(message: => String): Unit
+	def log(level: Level.Value, message: => String): Unit
+	def control(event: ControlEvent.Value, message: => String): Unit
+	
+	/** Use this method to ensure calls. */
+	def logAll(events: Seq[LogEvent]): Unit
+	/** Defined in terms of other methods in Logger and should not be called from them. */
+	final def log(event: LogEvent)
+	{
+		event match
+		{
+			case s: Success => success(s.msg)
+			case l: Log => log(l.level, l.msg)
+			case t: Trace => trace(t.exception)
+			case setL: SetLevel => setLevel(setL.newLevel)
+			case setT: SetTrace => enableTrace(setT.enabled)
+			case c: ControlEvent => control(c.event, c.msg)
+		}
+	}
+}
+
+/** Implements the level-setting methods of Logger.*/
+abstract class BasicLogger extends Logger
+{
+	private var traceEnabledVar = true
+	private var level: Level.Value = Level.Info
+	def getLevel = level
+	def setLevel(newLevel: Level.Value) { level = newLevel }
+	def enableTrace(flag: Boolean) { traceEnabledVar = flag }
+	def traceEnabled = traceEnabledVar
+}
+
+final class SynchronizedLogger(delegate: Logger) extends Logger
+{
+	def getLevel = { synchronized { delegate.getLevel } }
+	def setLevel(newLevel: Level.Value) { synchronized { delegate.setLevel(newLevel) } }
+	def enableTrace(enabled: Boolean) { synchronized { delegate.enableTrace(enabled) } }
+	def traceEnabled: Boolean = { synchronized { delegate.traceEnabled } }
+	
+	def trace(t: => Throwable) { synchronized { delegate.trace(t) } }
+	def log(level: Level.Value, message: => String) { synchronized { delegate.log(level, message) } }
+	def success(message: => String) { synchronized { delegate.success(message) } }
+	def control(event: ControlEvent.Value, message: => String) { synchronized { delegate.control(event, message) } }
+	def logAll(events: Seq[LogEvent]) { synchronized { delegate.logAll(events) } }
+}
+
+final class MultiLogger(delegates: List[Logger]) extends BasicLogger
+{
+	override def setLevel(newLevel: Level.Value)
+	{
+		super.setLevel(newLevel)
+		dispatch(new SetLevel(newLevel))
+	}
+	override def enableTrace(enabled: Boolean)
+	{
+		super.enableTrace(enabled)
+		dispatch(new SetTrace(enabled))
+	}
+	def trace(t: => Throwable) { dispatch(new Trace(t)) }
+	def log(level: Level.Value, message: => String) { dispatch(new Log(level, message)) }
+	def success(message: => String) { dispatch(new Success(message)) }
+	def logAll(events: Seq[LogEvent]) { delegates.foreach(_.logAll(events)) }
+	def control(event: ControlEvent.Value, message: => String) { delegates.foreach(_.control(event, message)) }
+	private def dispatch(event: LogEvent) { delegates.foreach(_.log(event)) }
+}
+
+/** A logger that can buffer the logging done on it by currently executing Thread and
+* then can flush the buffer to the delegate logger provided in the constructor.  Use
+* 'startRecording' to start buffering and then 'play' from to flush the buffer for the
+* current Thread to the backing logger.  The logging level set at the
+* time a message is originally logged is used, not the level at the time 'play' is
+* called.
+*
+* This class assumes that it is the only client of the delegate logger.
+*
+* This logger is thread-safe.
+* */
+final class BufferedLogger(delegate: Logger) extends Logger
+{
+	private[this] val buffers = wrap.Wrappers.weakMap[Thread, Buffer[LogEvent]]
+	/* The recording depth part is to enable a weak nesting of recording calls.  When recording is
+	*  nested (recordingDepth >= 2), calls to play/playAll add the buffers for worker Threads to the
+	*  serial buffer (main Thread) and calls to clear/clearAll clear worker Thread buffers only. */
+	private[this] def recording = recordingDepth > 0
+	private[this] var recordingDepth = 0
+	
+	private[this] val mainThread = Thread.currentThread
+	private[this] def getBuffer(key: Thread) = buffers.getOrElseUpdate(key, new ListBuffer[LogEvent])
+	private[this] def buffer = getBuffer(key)
+	private[this] def key = Thread.currentThread
+	private[this] def serialBuffer = getBuffer(mainThread)
+
+	private[this] def inWorker = Thread.currentThread ne mainThread
+	
+	/** Enables buffering. */
+	def startRecording() { synchronized { recordingDepth += 1 } }
+	/** Flushes the buffer to the delegate logger for the current thread.  This method calls logAll on the delegate
+	* so that the messages are written consecutively. The buffer is cleared in the process. */
+	def play(): Unit =
+ 		synchronized
+		{
+			if(recordingDepth == 1)
+				delegate.logAll(wrap.Wrappers.readOnly(buffer))
+			else if(recordingDepth > 1 && inWorker)
+				serialBuffer ++= buffer
+		}
+	def playAll(): Unit =
+		synchronized
+		{
+			if(recordingDepth == 1)
+			{
+				for(buffer <- buffers.values)
+					delegate.logAll(wrap.Wrappers.readOnly(buffer))
+			}
+			else if(recordingDepth > 1)
+			{
+				for((key, buffer) <- buffers.toList if key ne mainThread)
+					serialBuffer ++= buffer
+			}
+		}
+	/** Clears buffered events for the current thread.  It does not disable buffering. */
+	def clear(): Unit = synchronized { if(recordingDepth == 1 || inWorker) buffers -= key }
+	/** Clears buffered events for all threads and disables buffering. */
+	def stop(): Unit =
+		synchronized
+		{
+			clearAll()
+			if(recordingDepth > 0)
+				recordingDepth -= 1
+		}
+	/** Clears buffered events for all threads. */
+	def clearAll(): Unit =
+		synchronized
+		{
+			if(recordingDepth <= 1)
+				buffers.clear()
+			else
+			{
+				val serial = serialBuffer
+				buffers.clear()
+				buffers(mainThread) = serial
+			}
+		}
+	def runAndFlush[T](f: => T): T =
+	{
+		try { f }
+		finally { play();  clear() }
+	}
+	
+	def setLevel(newLevel: Level.Value): Unit =
+		synchronized {
+			if(recording) buffer += new SetLevel(newLevel)
+			delegate.setLevel(newLevel)
+		}
+	def getLevel = synchronized { delegate.getLevel }
+	def traceEnabled = synchronized { delegate.traceEnabled }
+	def enableTrace(flag: Boolean): Unit =
+		synchronized
+		{
+			if(recording) buffer += new SetTrace(flag)
+			delegate.enableTrace(flag)
+		}
+	
+	def trace(t: => Throwable): Unit =
+		synchronized
+		{
+			if(traceEnabled)
+			{
+				if(recording) buffer += new Trace(t)
+				else delegate.trace(t)
+			}
+		}
+	def success(message: => String): Unit =
+		synchronized
+		{
+			if(atLevel(Level.Info))
+			{
+				if(recording)
+					buffer += new Success(message)
+				else
+					delegate.success(message)
+			}
+		}
+	def log(level: Level.Value, message: => String): Unit =
+		synchronized
+		{
+			if(atLevel(level))
+			{
+				if(recording)
+					buffer += new Log(level, message)
+				else
+					delegate.log(level, message)
+			}
+		}
+	def logAll(events: Seq[LogEvent]): Unit =
+		synchronized
+		{
+			if(recording)
+				buffer ++= events
+			else
+				delegate.logAll(events)
+		}
+	def control(event: ControlEvent.Value, message: => String): Unit =
+		synchronized
+		{
+			if(atLevel(Level.Info))
+			{
+				if(recording)
+					buffer += new ControlEvent(event, message)
+				else
+					delegate.control(event, message)
+			}
+		}
+}
+
+object ConsoleLogger
+{
+	private def os = System.getProperty("os.name")
+	private def isWindows = os.toLowerCase.indexOf("windows") >= 0
+	private def formatExplicitlyDisabled = java.lang.Boolean.getBoolean("sbt.log.noformat")
+	private val formatEnabled = !(formatExplicitlyDisabled || isWindows)
+}
+
+/** A logger that logs to the console.  On non-windows systems, the level labels are
+* colored. 
+*
+* This logger is not thread-safe.*/
+class ConsoleLogger extends BasicLogger
+{
+	import ConsoleLogger.formatEnabled
+	def messageColor(level: Level.Value) = Console.RESET
+	def labelColor(level: Level.Value) =
+		level match
+		{
+			case Level.Error => Console.RED
+			case Level.Warn => Console.YELLOW
+			case _ => Console.RESET
+		}
+	def successLabelColor = Console.GREEN
+	def successMessageColor = Console.RESET
+	override def success(message: => String)
+	{
+		if(atLevel(Level.Info))
+			log(successLabelColor, Level.SuccessLabel, successMessageColor, message)
+	}
+	def trace(t: => Throwable): Unit =
+		System.out.synchronized
+		{
+			if(traceEnabled)
+				t.printStackTrace
+		}
+	def log(level: Level.Value, message: => String)
+	{
+		if(atLevel(level))
+			log(labelColor(level), level.toString, messageColor(level), message)
+	}
+	private def setColor(color: String)
+	{
+		if(formatEnabled)
+			System.out.synchronized { System.out.print(color) }
+	}
+	private def log(labelColor: String, label: String, messageColor: String, message: String): Unit =
+		System.out.synchronized
+		{
+			for(line <- message.split("""\n"""))
+			{
+				setColor(Console.RESET)
+				System.out.print('[')
+				setColor(labelColor)
+				System.out.print(label)
+				setColor(Console.RESET)
+				System.out.print("] ")
+				setColor(messageColor)
+				System.out.print(line)
+				setColor(Console.RESET)
+				System.out.println()
+			}
+		}
+	
+	def logAll(events: Seq[LogEvent]) = System.out.synchronized { events.foreach(log) }
+	def control(event: ControlEvent.Value, message: => String)
+		{ log(labelColor(Level.Info), Level.Info.toString, Console.BLUE, message) }
+}
+
+/** An enumeration defining the levels available for logging.  A level includes all of the levels
+* with id larger than its own id.  For example, Warn (id=3) includes Error (id=4).*/
+object Level extends Enumeration with NotNull
+{
+	val Debug = Value(1, "debug")
+	val Info = Value(2, "info")
+	val Warn = Value(3, "warn")
+	val Error = Value(4, "error")
+	/** Defines the label to use for success messages.  A success message is logged at the info level but
+	* uses this label.  Because the label for levels is defined in this module, the success
+	* label is also defined here. */
+	val SuccessLabel = "success"
+	
+	// added because elements was renamed to iterator in 2.8.0 nightly
+	def levels = Debug :: Info :: Warn :: Error :: Nil
+	/** Returns the level with the given name wrapped in Some, or None if no level exists for that name. */
+	def apply(s: String) = levels.find(s == _.toString)
+	/** Same as apply, defined for use in pattern matching. */
+	private[sbt] def unapply(s: String) = apply(s)
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
new file mode 100644
index 000000000..e17c4b555
--- /dev/null
+++ b/src/main/scala/sbt/Main.scala
@@ -0,0 +1,673 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
+ */
+package sbt
+
+import scala.collection.immutable.TreeSet
+
+private trait RunCompleteAction extends NotNull
+private class Exit(val code: Int) extends RunCompleteAction
+private object Reload extends RunCompleteAction
+
+/** This class is the entry point for sbt.  If it is given any arguments, it interprets them
+* as actions, executes the corresponding actions, and exits.  If there were no arguments provided,
+* sbt enters interactive mode.*/
+object Main
+{
+	/** The entry point for sbt.  If arguments are specified, they are interpreted as actions, executed,
+	* and then the program terminates.  If no arguments are specified, the program enters interactive
+	* mode. Call run if you need to run sbt in the same JVM.*/
+	def main(args: Array[String])
+	{
+		val exitCode = run(args)
+		if(exitCode == RebootExitCode)
+		{
+			println("Rebooting is not supported when the sbt loader is not used.")
+			println("Please manually restart sbt.")
+		}
+		System.exit(exitCode)
+	}
+	val RebootExitCode = -1
+	val NormalExitCode = 0
+	val SetupErrorExitCode = 1
+	val SetupDeclinedExitCode = 2
+	val LoadErrorExitCode = 3
+	val UsageErrorExitCode = 4
+	val BuildErrorExitCode = 5
+	def run(args: Array[String]): Int =
+	{
+		val startTime = System.currentTimeMillis
+		Project.loadProject match
+		{
+			case err: LoadSetupError =>
+				println("\n" + err.message)
+				ExitHooks.runExitHooks(Project.bootLogger)
+				SetupErrorExitCode
+			case LoadSetupDeclined =>
+				ExitHooks.runExitHooks(Project.bootLogger)
+				SetupDeclinedExitCode
+			case err: LoadError =>
+			{
+				val log = Project.bootLogger
+				println(err.message)
+				ExitHooks.runExitHooks(log)
+				// Because this is an error that can probably be corrected, prompt user to try again.
+				val line =
+					try { SimpleReader.readLine("\n Hit enter to retry or 'exit' to quit: ") }
+					catch
+					{
+						case e =>
+							log.trace(e)
+							log.error(e.toString)
+							None
+					}
+				line match
+				{
+					case Some(l) => if(!isTerminateAction(l)) run(args) else NormalExitCode
+					case None => LoadErrorExitCode
+				}
+			}
+			case success: LoadSuccess =>
+			{
+				import success.project
+				val doNext: RunCompleteAction =
+					// in interactive mode, fill all undefined properties
+					if(args.length > 0 || fillUndefinedProjectProperties(project.topologicalSort.toList.reverse))
+						startProject(project, args, startTime)
+					else
+						new Exit(NormalExitCode)
+				ExitHooks.runExitHooks(project.log)
+				doNext match
+				{
+					case Reload => run(args)
+					case x: Exit => x.code
+				}
+			}
+		}
+	}
+	/** Returns true if the project should be reloaded, false if sbt should exit.*/
+	private def startProject(project: Project, args: Array[String], startTime: Long): RunCompleteAction =
+	{
+		project.log.info("Building project " + project.name + " " + project.version.toString + " using " + project.getClass.getName)
+		val scalaVersionOpt = ScalaVersion.current orElse project.scalaVersion.get
+		for(sbtVersion <- project.sbtVersion.get; scalaVersion <- scalaVersionOpt if !sbtVersion.isEmpty  && !scalaVersion.isEmpty)
+			project.log.info("   with sbt " + sbtVersion + " and Scala " + scalaVersion)
+		args match
+		{
+			case Array() =>
+				CrossBuild.load() match
+				{
+					case None =>
+						project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
+						val doNext = interactive(project)
+						printTime(project, startTime, "session")
+						doNext
+					case Some(cross) =>
+						crossBuildNext(project, cross)
+						new Exit(RebootExitCode)
+				}
+			case CrossBuild(action) =>
+				val exitCode =
+					CrossBuild.load() match
+					{
+						case None => if(startCrossBuild(project, action)) RebootExitCode else BuildErrorExitCode
+						case Some(cross) => if(crossBuildNext(project, cross)) RebootExitCode else NormalExitCode
+					}
+				new Exit(exitCode)
+			case _ =>
+				val exitCode =
+					Control.lazyFold(args.toList)(handleBatchCommand(project)) match
+					{
+						case None => project.log.success("Build completed successfully."); NormalExitCode
+						case Some(errorMessage) =>
+							project.log.error("Error during build" + (if(errorMessage.isEmpty) "." else ": " + errorMessage) )
+							BuildErrorExitCode
+					}
+				printTime(project, startTime, "build")
+				new Exit(exitCode)
+		}
+	}
+	private def crossBuildNext(project: Project, cross: CrossBuild) =
+	{
+		val setScalaVersion = (newVersion: String) => { System.setProperty(ScalaVersion.LiveKey, newVersion); () }
+		val complete =
+			if(handleAction(project, cross.command))
+				cross.versionComplete(setScalaVersion)
+			else
+				cross.error(setScalaVersion)
+		if(complete)
+			printTime(project, cross.startTime, "cross-build")
+		!complete
+	}
+	
+	/** The name of the command that loads a console with access to the current project through the variable 'project'.*/
+	val ProjectConsoleAction = "console-project"
+	/** The name of the command that shows the current project and logging level of that project.*/
+	val ShowCurrent = "current"
+	/** The name of the command that shows all available actions.*/
+	val ShowActions = "actions"
+	/** The name of the command that sets the currently active project.*/
+	val ProjectAction = "project"
+	/** The name of the command that shows all available projects.*/
+	val ShowProjectsAction = "projects"
+	/** The list of lowercase command names that may be used to terminate the program.*/
+	val TerminateActions: Iterable[String] = "exit" :: "quit" :: Nil
+	/** The name of the command that sets the value of the property given as its argument.*/
+	val SetAction = "set"
+	/** The name of the command that gets the value of the property given as its argument.*/
+	val GetAction = "get"
+	/** The name of the command that displays the help message. */
+	val HelpAction = "help"
+	/** The command for rebooting sbt. Requires sbt to have been launched by the loader.*/
+	val RebootCommand = "reboot"
+	/** The name of the command that reloads a project.  This is useful for when the project definition has changed. */
+	val ReloadAction = "reload"
+	/** The name of the command that toggles logging stacktraces. */
+	val TraceCommand = "trace"
+	/** The name of the command that compiles all sources continuously when they are modified. */
+	val ContinuousCompileCommand = "cc"
+	/** The prefix used to identify a request to execute the remaining input on source changes.*/
+	val ContinuousExecutePrefix = "~"
+	/** The prefix used to identify a request to execute the remaining input across multiple Scala versions.*/
+	val CrossBuildPrefix = "+"
+	/** Error message for when the user tries to prefix an action with CrossBuildPrefix but the loader is not used.*/
+	val CrossBuildUnsupported = "Cross-building is not supported when the loader is not used."
+	
+	/** The number of seconds between polling by the continuous compile command.*/
+	val ContinuousCompilePollDelaySeconds = 1
+
+	/** The list of all available commands at the interactive prompt in addition to the tasks defined
+	* by a project.*/
+	protected def interactiveCommands: Iterable[String] = basicCommands.toList ++ logLevels.toList
+	/** The list of logging levels.*/
+	private def logLevels: Iterable[String] = TreeSet.empty[String] ++ Level.levels.map(_.toString)
+	/** The list of all interactive commands other than logging level.*/
+	private def basicCommands: Iterable[String] = TreeSet(ShowProjectsAction, ShowActions, ShowCurrent, HelpAction,
+		RebootCommand, ReloadAction, TraceCommand, ContinuousCompileCommand, ProjectConsoleAction)
+	
+	/** Enters interactive mode for the given root project.  It uses JLine for tab completion and
+	* history.  It returns normally when the user terminates or reloads the interactive session.  That is,
+	* it does not call System.exit to quit.
+	**/
+	private def interactive(baseProject: Project): RunCompleteAction =
+	{
+		val projectNames = baseProject.topologicalSort.map(_.name)
+		val prefixes = ContinuousExecutePrefix :: Nil
+		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), prefixes)
+		val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log)
+		def updateTaskCompletions(project: Project)
+		{
+			val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
+			reader.setVariableCompletions(project.taskNames, project.propertyNames, methodCompletions)
+		}
+		
+		/** Prompts the user for the next command using 'currentProject' as context.
+		* If the command indicates that the user wishes to terminate or reload the session,
+		*   the function returns the appropriate value.
+		* Otherwise, the command is handled and this function is called again
+		*   (tail recursively) to prompt for the next command. */
+		def loop(currentProject: Project): RunCompleteAction =
+		{
+			updateTaskCompletions(baseProject) // this is done after every command because the completions could change due to the action invoked
+			reader.readLine("> ") match
+			{
+				case Some(line) =>
+				{
+					val trimmed = line.trim
+					if(trimmed.isEmpty)
+						loop(currentProject)
+					else if(isTerminateAction(trimmed))
+						new Exit(NormalExitCode)
+					else if(ReloadAction == trimmed)
+						Reload
+					else if(RebootCommand == trimmed)
+						new Exit(RebootExitCode)
+					else if(trimmed.startsWith(CrossBuildPrefix))
+					{
+						if(startCrossBuild(currentProject, trimmed.substring(CrossBuildPrefix.length).trim))
+							new Exit(RebootExitCode)
+						else
+							loop(currentProject)
+					}
+					else if(trimmed.startsWith(ProjectAction + " "))
+					{
+						val projectName = trimmed.substring(ProjectAction.length + 1)
+						baseProject.topologicalSort.find(_.name == projectName) match
+						{
+							case Some(newProject) =>
+							{
+								printProject("Set current project to ", newProject)
+								updateTaskCompletions(newProject)
+								loop(newProject)
+							}
+							case None =>
+							{
+								currentProject.log.error("Invalid project name '" + projectName + "' (type 'projects' to list available projects).")
+								loop(currentProject)
+							}
+						}
+					}
+					else
+					{
+						if(trimmed == HelpAction)
+							displayInteractiveHelp()
+						else if(trimmed == ShowProjectsAction)
+							baseProject.topologicalSort.foreach(listProject)
+						else if(trimmed.startsWith(SetAction + " "))
+							setProperty(currentProject, trimmed.substring(SetAction.length + 1))
+						else if(trimmed.startsWith(GetAction + " "))
+							getProperty(currentProject, trimmed.substring(GetAction.length + 1))
+						else if(trimmed == ProjectConsoleAction)
+							showResult(Run.projectConsole(currentProject), currentProject.log)
+						else
+							handleInteractiveCommand(currentProject, trimmed)
+						loop(currentProject)
+					}
+				}
+				case None => new Exit(NormalExitCode)
+			}
+		}
+		
+		loop(baseProject)
+	}
+	private def printCmd(name:String, desc:String) = Console.println("\t" + name + ": " + desc)
+	private def displayBatchHelp() = {
+		Console.println("You may execute any project action or method or one of the commands described below.")
+		Console.println("Available Commands:")
+		printCommonCommands()
+	}
+	private def printCommonCommands()
+	{
+		printCmd("<action name>", "Executes the project specified action.")
+		printCmd("<method name> <parameter>*", "Executes the project specified method.")
+		printCmd(ContinuousExecutePrefix + " <command>", "Executes the project specified action or method whenever source files change.")
+		printCmd(CrossBuildPrefix + " <command>", "Executes the project specified action or method for all versions of Scala defined in crossScalaVersions.")
+		printCmd(ShowActions, "Shows all available actions.")
+		printCmd(RebootCommand, "Changes to scala.version or sbt.version are processed and the project definition is reloaded.")
+		printCmd(HelpAction, "Displays this help message.")
+	}
+	private def displayInteractiveHelp() = {
+		Console.println("You may execute any project action or one of the commands described below. Only one action " +
+			"may be executed at a time in interactive mode and is entered by name, as it would be at the command line." +
+			" Also, tab completion is available.")
+		Console.println("Available Commands:")
+
+		printCommonCommands()
+		printCmd(ReloadAction, "Reloads sbt, recompiling modified project definitions if necessary.")
+		printCmd(ShowCurrent, "Shows the current project and logging level of that project.")
+		printCmd(Level.levels.mkString(", "), "Set logging for the current project to the specified level.")
+		printCmd(TraceCommand, "Toggles whether logging stack traces is enabled.")
+		printCmd(ProjectAction + " <project name>", "Sets the currently active project.")
+		printCmd(ShowProjectsAction, "Shows all available projects.")
+		printCmd(TerminateActions.elements.mkString(", "), "Terminates the program.")
+		printCmd(SetAction + " <property> <value>", "Sets the value of the property given as its argument.")
+		printCmd(GetAction + " <property>", "Gets the value of the property given as its argument.")
+		printCmd(ProjectConsoleAction, "Enters the Scala interpreter with the current project bound to the variable 'current' and all members imported.")
+	}
+	private def listProject(p: Project) = printProject("\t", p)
+	private def printProject(prefix: String, p: Project): Unit =
+		Console.println(prefix + p.name + " " + p.version)
+
+	private def startCrossBuild(project: Project, action: String) =
+	{
+		checkBooted && checkAction(project, action) &&
+		{
+			val againstScalaVersions = project.crossScalaVersions
+			val versionsDefined = !againstScalaVersions.isEmpty
+			if(versionsDefined)
+				CrossBuild(againstScalaVersions, action, System.currentTimeMillis)
+			else
+				Console.println("Project does not declare any Scala versions to cross-build against.")
+			versionsDefined
+		}
+	}
+	private def checkBooted =
+		Project.booted ||
+		{
+			Console.println(CrossBuildUnsupported)
+			false
+		}
+	
+	/** Handles the given command string provided by batch mode execution..*/
+	private def handleBatchCommand(project: Project)(command: String): Option[String] =
+	{
+		command.trim match
+		{
+			case HelpAction => displayBatchHelp(); None
+			case ShowActions => showActions(project); None
+			case CrossBuild(crossBuildAction) => Some(CrossBuildUnsupported)
+			case action => if(handleAction(project, action)) None else Some("")
+		}
+	}
+	
+	/** Handles the given command string provided at the command line.*/
+	private def handleInteractiveCommand(project: Project, command: String)
+	{
+		command match
+		{
+			case GetAction => getArgumentError(project.log)
+			case SetAction => setArgumentError(project.log)
+			case ProjectAction => setProjectError(project.log)
+			case ShowCurrent =>
+				printProject("Current project is ", project)
+				Console.println("Current log level is " + project.log.getLevel)
+				printTraceEnabled(project)
+			case ShowActions => showActions(project)
+			case TraceCommand => toggleTrace(project)
+			case Level(level) => setLevel(project, level)
+			case ContinuousCompileCommand => compileContinuously(project)
+			case action if action.startsWith(ContinuousExecutePrefix) =>
+				executeContinuously(project, action.substring(ContinuousExecutePrefix.length).trim)
+			case action => handleAction(project, action)
+		}
+	}
+	private def showActions(project: Project): Unit =
+		Console.println(project.taskAndMethodList)
+	
+	// returns true if it succeeded (needed by noninteractive handleCommand)
+	private def handleAction(project: Project, action: String): Boolean =
+	{
+		def show(result: Option[String]): Boolean = showResult(result, project.log)
+		val startTime = System.currentTimeMillis
+		val result = withAction(project, action)( (name, params) => show(project.call(name, params)))( name => show(project.act(name)))
+		printTime(project, startTime, "")
+		result
+	}
+	private def showResult(result: Option[String], log: Logger): Boolean =
+	{
+		result match
+		{
+			case Some(errorMessage) => log.error(errorMessage); false
+			case None => log.success("Successful."); true
+		}
+	}
+	// true if the action exists
+	private def checkAction(project: Project, actionString: String): Boolean =
+		withAction(project, actionString)(  (n,p) => true)( n => true)
+	private def withAction(project: Project, actionString: String)(ifMethod: (String, Array[String]) => Boolean)(ifAction: String => Boolean): Boolean =
+	{
+		def didNotExist(taskType: String, name: String) =
+		{
+			project.log.error("No " + taskType + " named '" + name + "' exists.")
+			project.log.info("Execute 'help' for a list of commands or 'actions' for a list of available project actions and methods.")
+			false
+		}
+		impl.CommandParser.parse(actionString) match
+		{
+			case Left(errMsg) => project.log.error(errMsg); false
+			case Right((name, parameters)) =>
+				if(project.methods.contains(name))
+					ifMethod(name, parameters.toArray)
+				else if(!parameters.isEmpty)
+					didNotExist("method", name)
+				else if(project.deepTasks.contains(name))
+					ifAction(name)
+				else
+					didNotExist("action", name)
+		}
+	}
+	
+	/** Toggles whether stack traces are enabled.*/
+	private def toggleTrace(project: Project)
+	{
+		val newValue = !project.log.traceEnabled
+		project.topologicalSort.foreach(_.log.enableTrace(newValue))
+		printTraceEnabled(project)
+	}
+	private def printTraceEnabled(project: Project)
+	{
+		Console.println("Stack traces are " + (if(project.log.traceEnabled) "enabled" else "disabled"))
+	}
+	/** Sets the logging level on the given project.*/
+	private def setLevel(project: Project, level: Level.Value)
+	{
+		project.topologicalSort.foreach(_.log.setLevel(level))
+		Console.println("Set log level to " + project.log.getLevel)
+	}
+	/** Prints the elapsed time to the given project's log using the given
+	* initial time and the label 's'.*/
+	private def printTime(project: Project, startTime: Long, s: String)
+	{
+		val endTime = System.currentTimeMillis()
+		project.log.info("")
+		val ss = if(s.isEmpty) "" else s + " "
+		project.log.info("Total " + ss + "time: " + (endTime - startTime + 500) / 1000 + " s")
+	}
+	/** Provides a partial message describing why the given property is undefined. */
+	private def undefinedMessage(property: Project#UserProperty[_]): String =
+	{
+		property.resolve match
+		{
+			case vu: UndefinedValue => " is not defined."
+			case e: ResolutionException => " has invalid value: " + e.toString
+			case _ => ""
+		}
+	}
+	/** Prompts the user for the value of undefined properties.  'first' is true if this is the first time
+	* that the current property has been prompted.*/
+	private def fillUndefinedProperties(project: Project, properties: List[(String, Project#Property[_])], first: Boolean): Boolean =
+	{
+		properties match
+		{
+			case (name, variable) :: tail =>
+			{
+				val shouldAdvanceOrQuit =
+					variable match
+					{
+						case property: Project#UserProperty[_] =>
+							if(first)
+								project.log.error(" Property '" + name + "' " + undefinedMessage(property))
+							for(newValue <- SimpleReader.readLine("  Enter new value for " + name + " : ")) yield
+							{
+								try
+								{
+									property.setStringValue(newValue)
+									true
+								}
+								catch
+								{
+									case e =>
+										project.log.error("Invalid value: " + e.getMessage)
+										false
+								}
+							}
+						case _ => Some(true)
+					}
+				shouldAdvanceOrQuit match
+				{
+					case Some(shouldAdvance) => fillUndefinedProperties(project, if(shouldAdvance) tail else properties, shouldAdvance)
+					case None => false
+				}
+			}
+			case Nil => true
+		}
+	}
+	/** Iterates over the undefined properties in the given projects, prompting the user for the value of each undefined
+	* property.*/
+	private def fillUndefinedProjectProperties(projects: List[Project]): Boolean =
+	{
+		projects match
+		{
+			case project :: remaining =>
+			{
+				val uninitialized = project.uninitializedProperties.toList
+				if(uninitialized.isEmpty)
+					fillUndefinedProjectProperties(remaining)
+				else
+				{
+					project.log.error("Project in " + project.info.projectDirectory.getAbsolutePath + " has undefined properties.")
+					val result = fillUndefinedProperties(project, uninitialized, true) && fillUndefinedProjectProperties(remaining)
+					project.saveEnvironment()
+					result
+				}
+			}
+			case Nil => true
+		}
+	}
+	/** Prints the value of the property with the given name in the given project. */
+	private def getProperty(project: Project, propertyName: String)
+	{
+		if(propertyName.isEmpty)
+			project.log.error("No property name specified.")
+		else
+		{
+			project.getPropertyNamed(propertyName) match
+			{
+				case Some(property) =>
+				{
+					property.resolve match
+					{
+						case u: UndefinedValue => project.log.error("Value of property '" + propertyName + "' is undefined.")
+						case ResolutionException(m, e) => project.log.error(m)
+						case DefinedValue(value, isInherited, isDefault) => Console.println(value.toString)
+					}
+				}
+				case None =>
+				{
+					val value = System.getProperty(propertyName)
+					if(value == null)
+						project.log.error("No property named '" + propertyName + "' is defined.")
+					else
+						Console.println(value)
+				}
+			}
+		}
+	}
+	/** Separates the space separated property name/value pair and stores the value in the user-defined property
+	* with the given name in the given project.  If no such property exists, the value is stored in a system
+	* property. */
+	private def setProperty(project: Project, propertyNameAndValue: String)
+	{
+		val m = """(\S+)(\s+\S.*)?""".r.pattern.matcher(propertyNameAndValue)
+		if(m.matches())
+		{
+			val name = m.group(1)
+			val newValue =
+			{
+				val v = m.group(2)
+				if(v == null) "" else v.trim
+			}
+			project.getPropertyNamed(name) match
+			{
+				case Some(property) =>
+				{
+					val succeeded =
+						try
+						{
+							property.setStringValue(newValue)
+							val isScalaVersion = property == project.scalaVersion
+							val isSbtVersion = property == project.sbtVersion
+							if(isScalaVersion || isSbtVersion)
+							{
+								val changed = if(isSbtVersion) "sbt " else "Scala "
+								Console.println(" Build will use " + changed + newValue + " after running 'reboot' command or restarting sbt.")
+							}
+							else
+								Console.println(" Set property '" + name + "' = '" + newValue + "'")
+						}
+						catch { case e => project.log.error("Error setting property '" + name + "' in " + project.environmentLabel + ": " + e.toString) }
+					project.saveEnvironment()
+				}
+				case None =>
+				{
+					System.setProperty(name, newValue)
+					project.log.info(" Set system property '" + name + "' = '" + newValue + "'")
+				}
+			}
+		}
+		else
+			setArgumentError(project.log)
+	}
+
+	private def compileContinuously(project: Project) = executeContinuously(project, "test-compile")
+	private def executeContinuously(project: Project, action: String)
+	{
+		if(checkAction(project, action))
+		{
+			SourceModificationWatch.watchUntil(project, ContinuousCompilePollDelaySeconds)(System.in.available() > 0)
+			{
+				handleAction(project, action)
+				Console.println("Waiting for source changes... (press any key to interrupt)")
+			}
+			while (System.in.available() > 0) System.in.read()
+		}
+	}
+
+	private def isTerminateAction(s: String) = TerminateActions.elements.contains(s.toLowerCase)
+	private def setArgumentError(log: Logger) { log.error("Invalid arguments for 'set': expected property name and new value.") }
+	private def getArgumentError(log: Logger) { log.error("Invalid arguments for 'get': expected property name.") }
+	private def setProjectError(log: Logger) { log.error("Invalid arguments for 'project': expected project name.") }
+}
+private class CrossBuild(val remainingScalaVersions: Set[String], val command: String, val startTime: Long)
+{
+	def error(setScalaVersion: String => Unit) = clearScalaVersion(setScalaVersion)
+	private def clearScalaVersion(setScalaVersion: String => Unit) =
+	{
+		CrossBuild.clear()
+		setScalaVersion("")
+		true
+	}
+	def versionComplete(setScalaVersion: String => Unit) =
+	{
+		val remaining = remainingScalaVersions - ScalaVersion.currentString
+		if(remaining.isEmpty)
+			clearScalaVersion(setScalaVersion)
+		else
+		{
+			CrossBuild.setProperties(remaining, command, startTime.toString)
+			setScalaVersion(remaining.toSeq.first)
+			false
+		}
+	}
+}
+private object CrossBuild
+{
+	private val RemainingScalaVersionsKey = "sbt.remaining.scala.versions"
+	private val CrossCommandKey = "sbt.cross.build.command"
+	private val StartTimeKey = "sbt.cross.start.time"
+	private def setProperties(remainingScalaVersions: Set[String], command: String, startTime: String)
+	{
+		System.setProperty(RemainingScalaVersionsKey, remainingScalaVersions.mkString(" "))
+		System.setProperty(CrossCommandKey, command)
+		System.setProperty(StartTimeKey, startTime)
+	}
+	private def getProperty(key: String) =
+	{
+		val value = System.getProperty(key)
+		if(value == null)
+			""
+		else
+			value.trim
+	}
+	private def clear() { setProperties(Set.empty, "", "") }
+	def load() =
+	{
+		val command = getProperty(CrossCommandKey)
+		val remaining = getProperty(RemainingScalaVersionsKey)
+		val startTime = getProperty(StartTimeKey)
+		if(command.isEmpty || remaining.isEmpty || startTime.isEmpty)
+			None
+		else
+			Some(new CrossBuild(Set(remaining.split(" ") : _*), command, startTime.toLong))
+	}
+	def apply(remainingScalaVersions: Set[String], command: String, startTime: Long) =
+	{
+		setProperties(remainingScalaVersions, command, startTime.toString)
+		new CrossBuild(remainingScalaVersions, command, startTime)
+	}
+	import Main.CrossBuildPrefix
+	def unapply(s: String): Option[String] =
+	{
+		val trimmed = s.trim
+		if(trimmed.startsWith(CrossBuildPrefix))
+			Some(trimmed.substring(CrossBuildPrefix.length).trim)
+		else
+			None
+	}
+	def unapply(s: Array[String]): Option[String] =
+		s match
+		{
+			case Array(CrossBuild(crossBuildAction)) => Some(crossBuildAction)
+			case _ => None
+		}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
new file mode 100644
index 000000000..ba761be89
--- /dev/null
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -0,0 +1,743 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import java.net.URL
+import java.util.Collections
+import scala.collection.mutable.HashSet
+
+import Artifact.{defaultExtension, defaultType}
+
+import org.apache.ivy.{core, plugins, util, Ivy}
+import core.LogOptions
+import core.cache.DefaultRepositoryCacheManager
+import core.deliver.DeliverOptions
+import core.module.descriptor.{DefaultArtifact, DefaultDependencyArtifactDescriptor, MDArtifact}
+import core.module.descriptor.{DefaultDependencyDescriptor, DefaultModuleDescriptor, DependencyDescriptor, ModuleDescriptor}
+import core.module.descriptor.{DefaultExcludeRule, ExcludeRule}
+import core.module.id.{ArtifactId,ModuleId, ModuleRevisionId}
+import core.publish.PublishOptions
+import core.resolve.ResolveOptions
+import core.retrieve.RetrieveOptions
+import core.settings.IvySettings
+import plugins.matcher.{ExactPatternMatcher, PatternMatcher}
+import plugins.parser.ModuleDescriptorParser
+import plugins.parser.m2.{PomModuleDescriptorParser,PomModuleDescriptorWriter}
+import plugins.parser.xml.XmlModuleDescriptorParser
+import plugins.repository.{BasicResource, Resource}
+import plugins.repository.url.URLResource
+import plugins.resolver.{ChainResolver, DependencyResolver, IBiblioResolver}
+import plugins.resolver.{AbstractPatternsBasedResolver, AbstractSshBasedResolver, FileSystemResolver, SFTPResolver, SshResolver, URLResolver}
+import util.{Message, MessageLogger}
+
+final class IvyScala(val scalaVersion: String, val configurations: Iterable[Configuration], val checkExplicit: Boolean, val filterImplicit: Boolean) extends NotNull
+final class IvyPaths(val projectDirectory: Path, val managedLibDirectory: Path, val cacheDirectory: Option[Path]) extends NotNull
+final class IvyFlags(val validate: Boolean, val addScalaTools: Boolean, val errorIfNoConfiguration: Boolean) extends NotNull
+final class IvyConfiguration(val paths: IvyPaths, val manager: Manager, val flags: IvyFlags, val ivyScala: Option[IvyScala], val log: Logger) extends NotNull
+final class UpdateConfiguration(val outputPattern: String, val synchronize: Boolean, val quiet: Boolean) extends NotNull
+object ManageDependencies
+{
+	val DefaultIvyConfigFilename = "ivysettings.xml"
+	val DefaultIvyFilename = "ivy.xml"
+	val DefaultMavenFilename = "pom.xml"
+	val ScalaOrganization = "org.scala-lang"
+	val ScalaLibraryID = "scala-library"
+	val ScalaCompilerID = "scala-compiler"
+	
+	private def defaultIvyFile(project: Path) = project / DefaultIvyFilename
+	private def defaultIvyConfiguration(project: Path) = project / DefaultIvyConfigFilename
+	private def defaultPOM(project: Path) = project / DefaultMavenFilename
+	
+	/** Configures Ivy using the provided configuration 'config' and calls 'doWithIvy'.  This method takes care of setting up and cleaning up Ivy.*/
+	private def withIvy(config: IvyConfiguration)(doWithIvy: (Ivy, ModuleDescriptor, String) => Option[String]) =
+		withIvyValue(config)( (ivy, module, default) => doWithIvy(ivy, module, default).toLeft(()) ).left.toOption
+	/** Configures Ivy using the provided configuration 'config' and calls 'doWithIvy'.  This method takes care of setting up and cleaning up Ivy.*/
+	private def withIvyValue[T](config: IvyConfiguration)(doWithIvy: (Ivy, ModuleDescriptor, String) => Either[String, T]) =
+	{
+		import config._
+		val logger = new IvyLogger(log)
+		Message.setDefaultLogger(logger)
+		val ivy = Ivy.newInstance()
+		ivy.getLoggerEngine.pushLogger(logger)
+		
+		/** Parses the given Maven pom 'pomFile'.*/
+		def readPom(pomFile: File) =
+			Control.trap("Could not read pom: ", log)
+				{ Right((PomModuleDescriptorParser.getInstance.parseDescriptor(ivy.getSettings, toURL(pomFile), flags.validate)), "compile") }
+		/** Parses the given Ivy file 'ivyFile'.*/
+		def readIvyFile(ivyFile: File) =
+			Control.trap("Could not read Ivy file: ", log)
+			{
+				val url = toURL(ivyFile)
+				val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
+				parser.setValidate(flags.validate)
+				parser.setSource(url)
+				parser.parse()
+				Right((parser.getModuleDescriptor(), parser.getDefaultConf))
+			}
+		/** Parses the given in-memory Ivy file 'xml', using the existing 'moduleID' and specifying the given 'defaultConfiguration'. */
+		def parseXMLDependencies(xml: scala.xml.NodeSeq, moduleID: DefaultModuleDescriptor, defaultConfiguration: String) =
+			parseDependencies(xml.toString, moduleID, defaultConfiguration)
+		/** Parses the given in-memory Ivy file 'xml', using the existing 'moduleID' and specifying the given 'defaultConfiguration'. */
+		def parseDependencies(xml: String, moduleID: DefaultModuleDescriptor, defaultConfiguration: String): Either[String, CustomXmlParser.CustomParser] =
+			Control.trap("Could not read dependencies: ", log)
+			{
+				val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
+				parser.setMd(moduleID)
+				parser.setDefaultConf(defaultConfiguration)
+				parser.setValidate(flags.validate)
+				val resource = new ByteResource(xml.getBytes)
+				parser.setInput(resource.openStream)
+				parser.setResource(resource)
+				parser.parse()
+				Right(parser)
+			}
+		/** Configures Ivy using the specified Ivy configuration file.  This method is used when the manager is explicitly requested to be MavenManager or
+		* IvyManager.  If a file is not specified, Ivy is configured with defaults and scala-tools releases is added as a repository.*/
+		def configure(configFile: Option[Path])
+		{
+			configFile match
+			{
+				case Some(path) => ivy.configure(path.asFile)
+				case None =>
+					configureDefaults()
+					scalaTools()
+			}
+		}
+		/** Adds the scala-tools.org releases maven repository to the list of resolvers if configured to do so in IvyFlags.*/
+		def scalaTools()
+		{
+			if(flags.addScalaTools)
+			{
+				log.debug("Added Scala Tools Releases repository.")
+				addResolvers(ivy.getSettings, ScalaToolsReleases :: Nil, log)
+			}
+		}
+		/** Configures Ivy using defaults.  This is done when no ivy-settings.xml exists. */
+		def configureDefaults()
+		{
+			ivy.configureDefault
+			val settings = ivy.getSettings
+			for(dir <- paths.cacheDirectory) settings.setDefaultCache(dir.asFile)
+			settings.setBaseDir(paths.projectDirectory.asFile)
+			configureCache(settings)
+		}
+		/** Called to configure Ivy when the configured dependency manager is SbtManager and inline configuration is specified or if the manager
+		* is AutodetectManager.  It will configure Ivy with an 'ivy-settings.xml' file if there is one, or configure the defaults and add scala-tools as
+		* a repository otherwise.*/
+		def autodetectConfiguration()
+		{
+			log.debug("Autodetecting configuration.")
+			val defaultIvyConfigFile = defaultIvyConfiguration(paths.projectDirectory).asFile
+			if(defaultIvyConfigFile.canRead)
+				ivy.configure(defaultIvyConfigFile)
+			else
+			{
+				configureDefaults()
+				scalaTools()
+			}
+		}
+		/** Called to determine dependencies when the dependency manager is SbtManager and no inline dependencies (Scala or XML) are defined
+		* or if the manager is AutodetectManager.  It will try to read from pom.xml first and then ivy.xml if pom.xml is not found.  If neither is found,
+		* Ivy is configured with defaults unless IvyFlags.errorIfNoConfiguration is true, in which case an error is generated.*/
+		def autodetectDependencies(module: ModuleRevisionId) =
+		{
+			log.debug("Autodetecting dependencies.")
+			val defaultPOMFile = defaultPOM(paths.projectDirectory).asFile
+			if(defaultPOMFile.canRead)
+				readPom(defaultPOMFile)
+			else
+			{
+				val defaultIvy = defaultIvyFile(paths.projectDirectory).asFile
+				if(defaultIvy.canRead)
+					readIvyFile(defaultIvy)
+				else if(flags.errorIfNoConfiguration)
+					Left("No readable dependency configuration found.  Need " + DefaultIvyFilename + " or " + DefaultMavenFilename)
+				else
+				{
+					val defaultConf = ModuleDescriptor.DEFAULT_CONFIGURATION
+					log.warn("No readable dependency configuration found, using defaults.")
+					val moduleID = DefaultModuleDescriptor.newDefaultInstance(module)
+					addMainArtifact(moduleID)
+					addDefaultArtifact(defaultConf, moduleID)
+					Right((moduleID, defaultConf))
+				}
+			}
+		}
+		/** Creates an Ivy module descriptor according the manager configured.  The default configuration for dependencies
+		* is also returned.*/
+		def moduleDescriptor: Either[String, (ModuleDescriptor, String)] =
+			config.manager match
+			{
+				case mm: MavenManager =>
+				{
+					log.debug("Maven configuration explicitly requested.")
+					configure(mm.configuration)
+					readPom(mm.pom.asFile)
+				}
+				case im: IvyManager =>
+				{
+					log.debug("Ivy configuration explicitly requested.")
+					configure(im.configuration)
+					readIvyFile(im.dependencies.asFile)
+				}
+				case adm: AutoDetectManager =>
+				{
+					log.debug("No dependency manager explicitly specified.")
+					autodetectConfiguration()
+					autodetectDependencies(toID(adm.module))
+				}
+				case sm: SbtManager =>
+				{
+					import sm._
+					if(resolvers.isEmpty && autodetectUnspecified)
+						autodetectConfiguration()
+					else
+					{
+						log.debug("Using inline repositories.")
+						configureDefaults()
+						val extra = if(flags.addScalaTools) ScalaToolsReleases :: resolvers.toList else resolvers
+						addResolvers(ivy.getSettings, extra, log)
+					}
+					if(autodetect)
+						autodetectDependencies(toID(module))
+					else
+					{
+						val moduleID =
+							{
+								val mod = new DefaultModuleDescriptor(toID(module), "release", null, false)
+								mod.setLastModified(System.currentTimeMillis)
+								configurations.foreach(config => mod.addConfiguration(toIvyConfiguration(config)))
+								mod
+							}
+						val defaultConf = defaultConfiguration getOrElse Configurations.config(ModuleDescriptor.DEFAULT_CONFIGURATION)
+						log.debug("Using inline dependencies specified in Scala" + (if(dependenciesXML.isEmpty) "." else " and XML."))
+						for(parser <- parseXMLDependencies(wrapped(module, dependenciesXML), moduleID, defaultConf.name).right) yield
+						{
+							addArtifacts(moduleID, artifacts)
+							addDependencies(moduleID, dependencies, parser)
+							addMainArtifact(moduleID)
+							(moduleID, parser.getDefaultConf)
+						}
+					}
+				}
+			}
+		/** Creates a full ivy file for 'module' using the 'dependencies' XML as the part after the &lt;info&gt;...&lt;/info&gt; section. */
+		def wrapped(module: ModuleID, dependencies: scala.xml.NodeSeq) =
+		{
+			import module._
+			<ivy-module version="2.0">
+				<info organisation={organization} module={name} revision={revision}/>
+				{dependencies}
+			</ivy-module>
+		}
+		/** Performs checks/adds filters on Scala dependencies (if enabled in IvyScala). */
+		def checkModule(moduleAndConf: (ModuleDescriptor, String)): Either[String, (ModuleDescriptor, String)] =
+			ivyScala match
+			{
+				case Some(check) =>
+					val (module, conf) = moduleAndConf
+					val explicitCheck =
+						if(check.checkExplicit)
+							checkDependencies(module, check.scalaVersion, check.configurations)
+						else
+							None
+					explicitCheck match
+					{
+						case None =>
+							if(check.filterImplicit)
+							{
+								val asDefault = toDefaultModuleDescriptor(module)
+								excludeScalaJars(asDefault, check.configurations)
+								Right( (asDefault, conf) )
+							}
+							else
+								Right(moduleAndConf)
+						case Some(err) => Left(err)
+					}
+				case None => Right(moduleAndConf)
+			}
+		
+		this.synchronized // Ivy is not thread-safe.  In particular, it uses a static DocumentBuilder, which is not thread-safe
+		{
+			ivy.pushContext()
+			try
+			{
+				moduleDescriptor.right.flatMap(checkModule).right.flatMap { mdAndConf =>
+					doWithIvy(ivy, mdAndConf._1, mdAndConf._2)
+				}
+			}
+			finally { ivy.popContext() }
+		}
+	}
+	/** Checks the immediate dependencies of module for dependencies on scala jars and verifies that the version on the
+	* dependencies matches scalaVersion. */
+	private def checkDependencies(module: ModuleDescriptor, scalaVersion: String, configurations: Iterable[Configuration]): Option[String] =
+	{
+		val configSet = configurationSet(configurations)
+		Control.lazyFold(module.getDependencies.toList)
+		{ dep =>
+			val id = dep.getDependencyRevisionId
+			if(id.getOrganisation == ScalaOrganization && id.getRevision != scalaVersion && dep.getModuleConfigurations.exists(configSet.contains))
+				Some("Different Scala version specified in dependency ("+ id.getRevision + ") than in project (" + scalaVersion + ").")
+			else
+				None
+		}
+	}
+	private def configurationSet(configurations: Iterable[Configuration]) =
+		HashSet(configurations.map(_.toString).toSeq : _*)
+	/** Adds exclusions for the scala library and compiler jars so that they are not downloaded.  This is
+	* done because normally these jars are already on the classpath and cannot/should not be overridden.  The version
+	* of Scala to use is done by setting scala.version in the project definition. */
+	private def excludeScalaJars(module: DefaultModuleDescriptor, configurations: Iterable[Configuration])
+	{
+		val configurationNames =
+		{
+			val names = module.getConfigurationsNames
+			if(configurations.isEmpty)
+				names
+			else
+			{
+				import scala.collection.mutable.HashSet
+				val configSet = configurationSet(configurations)
+				configSet.intersect(HashSet(names : _*))
+				configSet.toArray
+			}
+		}
+		def excludeScalaJar(name: String)
+			{ module.addExcludeRule(excludeRule(ScalaOrganization, name, configurationNames)) }
+		excludeScalaJar(ScalaLibraryID)
+		excludeScalaJar(ScalaCompilerID)
+	}
+	private def configureCache(settings: IvySettings)
+	{
+		settings.getDefaultRepositoryCacheManager match
+		{
+			case manager: DefaultRepositoryCacheManager =>
+				manager.setUseOrigin(true)
+				manager.setChangingMatcher(PatternMatcher.REGEXP);
+				manager.setChangingPattern(".*-SNAPSHOT");
+			case _ => ()
+		}
+	}
+	/** Creates an ExcludeRule that excludes artifacts with the given module organization and name for
+	* the given configurations. */
+	private def excludeRule(organization: String, name: String, configurationNames: Iterable[String]): ExcludeRule =
+	{
+		val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*")
+		val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, Collections.emptyMap[AnyRef,AnyRef])
+		configurationNames.foreach(rule.addConfiguration)
+		rule
+	}
+	/** Clears the Ivy cache, as configured by 'config'. */
+	def cleanCache(config: IvyConfiguration) =
+	{
+		def doClean(ivy: Ivy, module: ModuleDescriptor, default: String) =
+			Control.trapUnit("Could not clean cache: ", config.log)
+				{ ivy.getSettings.getRepositoryCacheManagers.foreach(_.clean()); None }
+		
+		withIvy(config)(doClean)
+	}
+	/** Creates a Maven pom from the given Ivy configuration*/
+	def makePom(config: IvyConfiguration, extraDependencies: Iterable[ModuleID], configurations: Option[Iterable[Configuration]], output: File) =
+	{
+		def doMakePom(ivy: Ivy, md: ModuleDescriptor, default: String) =
+			Control.trapUnit("Could not make pom: ", config.log)
+			{
+				val module = addLateDependencies(ivy, md, default, extraDependencies)
+				val pomModule = keepConfigurations(module, configurations)
+				PomModuleDescriptorWriter.write(pomModule, DefaultConfigurationMapping, output)
+				config.log.info("Wrote " + output.getAbsolutePath)
+				None
+			}
+		withIvy(config)(doMakePom)
+	}
+	private def addDefaultArtifact(defaultConf: String, moduleID: DefaultModuleDescriptor) =
+		moduleID.addArtifact(defaultConf, new MDArtifact(moduleID, moduleID.getModuleRevisionId.getName, defaultType, defaultExtension))
+	// todo: correct default configuration for extra dependencies
+	private def addLateDependencies(ivy: Ivy, md: ModuleDescriptor, defaultConfiguration: String, extraDependencies: Iterable[ModuleID]) =
+	{
+		val module = toDefaultModuleDescriptor(md)
+		val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
+		parser.setMd(module)
+		val defaultConf = if(defaultConfiguration.contains("->")) defaultConfiguration else (defaultConfiguration + "->default")
+		parser.setDefaultConf(defaultConf)
+		addDependencies(module, extraDependencies, parser)
+		module
+	}
+	private def getConfigurations(module: ModuleDescriptor, configurations: Option[Iterable[Configuration]]) =
+		configurations match
+		{
+			case Some(confs) => confs.map(_.name).toList.toArray
+			case None => module.getPublicConfigurationsNames
+		}
+	/** Retain dependencies only with the configurations given, or all public configurations of `module` if `configurations` is None.
+	* This is currently only preserves the information required by makePom*/
+	private def keepConfigurations(module: ModuleDescriptor, configurations: Option[Iterable[Configuration]]): ModuleDescriptor =
+	{
+		val keepConfigurations = getConfigurations(module, configurations)
+		val keepSet = Set(keepConfigurations.toSeq : _*)
+		def translate(dependency: DependencyDescriptor) =
+		{
+			val keep = dependency.getModuleConfigurations.filter(keepSet.contains)
+			if(keep.isEmpty)
+				None
+			else // TODO: translate the dependency to contain only configurations to keep
+				Some(dependency)
+		}
+		val newModule = new DefaultModuleDescriptor(module.getModuleRevisionId, "", null)
+		newModule.setHomePage(module.getHomePage)
+		for(dependency <- module.getDependencies; translated <- translate(dependency))
+			newModule.addDependency(translated)
+		newModule
+	}
+	private def addConfigurations(configurations: Iterable[String], to: { def setConfs(c: Array[String]): AnyRef }): Unit =
+		to.setConfs(configurations.toList.toArray)
+	
+	def deliver(ivyConfig: IvyConfiguration, updateConfig: UpdateConfiguration, status: String, deliverIvyPattern: String, extraDependencies: Iterable[ModuleID], configurations: Option[Iterable[Configuration]]) =
+	{
+		def doDeliver(ivy: Ivy, md: ModuleDescriptor, default: String) =
+			Control.trapUnit("Could not deliver: ", ivyConfig.log)
+			{
+				val module = addLateDependencies(ivy, md, default, extraDependencies)
+				resolve(ivy, updateConfig, module) orElse
+				{
+					val revID = module.getModuleRevisionId
+					val options = DeliverOptions.newInstance(ivy.getSettings).setStatus(status)
+					options.setConfs(getConfigurations(module, configurations))
+					
+					ivy.deliver(revID, revID.getRevision, deliverIvyPattern, options)
+					None
+				}
+			}
+		withIvy(ivyConfig)(doDeliver)
+	}
+	// todo: map configurations, extra dependencies
+	def publish(ivyConfig: IvyConfiguration, resolverName: String, srcArtifactPatterns: Iterable[String], deliveredIvyPattern: Option[String], configurations: Option[Iterable[Configuration]]) =
+	{
+		def doPublish(ivy: Ivy, md: ModuleDescriptor, default: String) =
+			Control.trapUnit("Could not publish: ", ivyConfig.log)
+			{
+				val revID = md.getModuleRevisionId
+				val patterns = new java.util.ArrayList[String]
+				srcArtifactPatterns.foreach(pattern => patterns.add(pattern))
+				val options = (new PublishOptions).setOverwrite(true)
+				deliveredIvyPattern.foreach(options.setSrcIvyPattern)
+				options.setConfs(getConfigurations(md, configurations))
+				ivy.publish(revID, patterns, resolverName, options)
+				None
+			}
+		withIvy(ivyConfig)(doPublish)
+	}
+	/** Resolves and retrieves dependencies.  'ivyConfig' is used to produce an Ivy file and configuration.
+	* 'updateConfig' configures the actual resolution and retrieval process. */
+	def update(ivyConfig: IvyConfiguration, updateConfig: UpdateConfiguration) =
+	{
+		def processModule(ivy: Ivy, module: ModuleDescriptor, default: String) =
+		{
+			import updateConfig._
+			Control.trapUnit("Could not process dependencies: ", ivyConfig.log)
+			{
+				resolve(ivy, updateConfig, module) orElse
+				{
+					val retrieveOptions = new RetrieveOptions
+					retrieveOptions.setSync(synchronize)
+					val patternBase = ivyConfig.paths.managedLibDirectory.absolutePath
+					val pattern =
+						if(patternBase.endsWith(File.separator))
+							patternBase + outputPattern
+						else
+							patternBase + File.separatorChar + outputPattern
+					ivy.retrieve(module.getModuleRevisionId, pattern, retrieveOptions)
+					None
+				}
+			}
+		}
+		
+		withIvy(ivyConfig)(processModule)
+	}
+	private def resolve(ivy: Ivy, updateConfig: UpdateConfiguration, module: ModuleDescriptor) =
+	{
+		import updateConfig._
+		val resolveOptions = new ResolveOptions
+		if(quiet)
+			resolveOptions.setLog(LogOptions.LOG_DOWNLOAD_ONLY)
+		val resolveReport = ivy.resolve(module, resolveOptions)
+		if(resolveReport.hasError)
+			Some(Set(resolveReport.getAllProblemMessages.toArray: _*).mkString(System.getProperty("line.separator")))
+		else
+			None
+	}
+	/** This method is used to add inline dependencies to the provided module. */
+	private def addDependencies(moduleID: DefaultModuleDescriptor, dependencies: Iterable[ModuleID], parser: CustomXmlParser.CustomParser)
+	{
+		for(dependency <- dependencies)
+		{
+			val dependencyDescriptor = new DefaultDependencyDescriptor(moduleID, toID(dependency), false, dependency.isChanging, dependency.isTransitive)
+			dependency.configurations match
+			{
+				case None => // The configuration for this dependency was not explicitly specified, so use the default
+					parser.parseDepsConfs(parser.getDefaultConf, dependencyDescriptor)
+				case Some(confs) => // The configuration mapping (looks like: test->default) was specified for this dependency
+					parser.parseDepsConfs(confs, dependencyDescriptor)
+			}
+			for(artifact <- dependency.explicitArtifacts)
+			{
+				import artifact.{name, `type`, extension, url}
+				val ivyArtifact = new DefaultDependencyArtifactDescriptor(dependencyDescriptor, name, `type`, extension, url.getOrElse(null), null)
+				for(conf <- dependencyDescriptor.getModuleConfigurations)
+					dependencyDescriptor.addDependencyArtifact(conf, ivyArtifact)
+			}
+			moduleID.addDependency(dependencyDescriptor)
+		}
+	}
+	private def addArtifacts(moduleID: DefaultModuleDescriptor, artifacts: Iterable[Artifact])
+	{
+		val allConfigurations = moduleID.getPublicConfigurationsNames
+		for(artifact <- artifacts)
+		{
+			val configurationStrings =
+			{
+				val artifactConfigurations = artifact.configurations
+				if(artifactConfigurations.isEmpty)
+					allConfigurations
+				else
+					artifactConfigurations.map(_.name)
+			}
+			val ivyArtifact = toIvyArtifact(moduleID, artifact, configurationStrings)
+			configurationStrings.foreach(configuration => moduleID.addArtifact(configuration, ivyArtifact))
+		}
+	}
+	private def toURL(file: File) = file.toURI.toURL
+	/** Adds the ivy.xml main artifact. */
+	private def addMainArtifact(moduleID: DefaultModuleDescriptor)
+	{
+		val artifact = DefaultArtifact.newIvyArtifact(moduleID.getResolvedModuleRevisionId, moduleID.getPublicationDate)
+		moduleID.setModuleArtifact(artifact)
+		moduleID.check()
+	}
+	/** Sets the resolvers for 'settings' to 'resolvers'.  This is done by creating a new chain and making it the default. */
+	private def addResolvers(settings: IvySettings, resolvers: Iterable[Resolver], log: Logger)
+	{
+		val newDefault = new ChainResolver
+		newDefault.setName("redefined-public")
+		resolvers.foreach(r => newDefault.add(ConvertResolver(r)))
+		newDefault.add(settings.getDefaultResolver)
+		settings.addResolver(newDefault)
+		settings.setDefaultResolver(newDefault.getName)
+		if(log.atLevel(Level.Debug))
+		{
+			log.debug("Using extra repositories:")
+			resolvers.foreach(r => log.debug("\t" + r.toString))
+		}
+	}
+	private def toIvyConfiguration(configuration: Configuration) =
+	{
+		import org.apache.ivy.core.module.descriptor.{Configuration => IvyConfig}
+		import IvyConfig.Visibility._
+		import configuration._
+		new IvyConfig(name, if(isPublic) PUBLIC else PRIVATE, description, extendsConfigs.map(_.name).toArray, transitive, null)
+	}
+	/** Converts the given sbt module id into an Ivy ModuleRevisionId.*/
+	private def toID(m: ModuleID) =
+	{
+		import m._
+		ModuleRevisionId.newInstance(organization, name, revision)
+	}
+	private def toIvyArtifact(moduleID: ModuleDescriptor, a: Artifact, configurations: Iterable[String]): MDArtifact =
+	{
+		val artifact = new MDArtifact(moduleID, a.name, a.`type`, a.extension)
+		configurations.foreach(artifact.addConfiguration)
+		artifact
+	}
+	/** An implementation of Ivy's Resource class that provides the Ivy file from a byte array.  This is used to support
+	* inline Ivy file XML.*/
+	private class ByteResource(bytes: Array[Byte]) extends
+		BasicResource("Inline XML dependencies", true, bytes.length, System.currentTimeMillis, true)
+	{
+		override def openStream = new java.io.ByteArrayInputStream(bytes)
+	}
+	/** Subclasses the default Ivy file parser in order to provide access to protected methods.*/
+	private object CustomXmlParser extends XmlModuleDescriptorParser with NotNull
+	{
+		import XmlModuleDescriptorParser.Parser
+		class CustomParser(settings: IvySettings) extends Parser(CustomXmlParser, settings) with NotNull
+		{
+			def setSource(url: URL) =
+			{
+				super.setResource(new URLResource(url))
+				super.setInput(url)
+			}
+			/** Overridden because the super implementation overwrites the module descriptor.*/
+			override def setResource(res: Resource) {}
+			override def setMd(md: DefaultModuleDescriptor) = super.setMd(md)
+			override def parseDepsConfs(confs: String, dd: DefaultDependencyDescriptor) = super.parseDepsConfs(confs, dd)
+			override def getDefaultConf = super.getDefaultConf
+			override def setDefaultConf(conf: String) = super.setDefaultConf(conf)
+		}
+	}
+	/** This code converts the given ModuleDescriptor to a DefaultModuleDescriptor by casting or generating an error.
+	* Ivy always produces a DefaultModuleDescriptor, so this should be reasonable. */
+	private def toDefaultModuleDescriptor(md: ModuleDescriptor) =
+		md match
+		{
+			case dmd: DefaultModuleDescriptor => dmd
+			case _ => error("Unknown ModuleDescriptor type.")
+		}
+}
+
+private object ConvertResolver
+{
+	/** Converts the given sbt resolver into an Ivy resolver..*/
+	def apply(r: Resolver) =
+	{
+		r match
+		{
+			case repo: MavenRepository =>
+			{
+				val resolver = new IBiblioResolver
+				initializeMavenStyle(resolver, repo.name, repo.root)
+				resolver
+			}
+			case JavaNet1Repository =>
+			{
+				// Thanks to Matthias Pfau for posting how to use the Maven 1 repository on java.net with Ivy:
+				// http://www.nabble.com/Using-gradle-Ivy-with-special-maven-repositories-td23775489.html
+				val resolver = new IBiblioResolver { override def convertM2IdForResourceSearch(mrid: ModuleRevisionId) = mrid }
+				initializeMavenStyle(resolver, JavaNet1Repository.name, "http://download.java.net/maven/1/")
+				resolver.setPattern("[organisation]/[ext]s/[module]-[revision](-[classifier]).[ext]")
+				resolver
+			}
+			case repo: SshRepository =>
+			{
+				val resolver = new SshResolver
+				initializeSSHResolver(resolver, repo)
+				repo.publishPermissions.foreach(perm => resolver.setPublishPermissions(perm))
+				resolver
+			}
+			case repo: SftpRepository =>
+			{
+				val resolver = new SFTPResolver
+				initializeSSHResolver(resolver, repo)
+				resolver
+			}
+			case repo: FileRepository =>
+			{
+				val resolver = new FileSystemResolver
+				resolver.setName(repo.name)
+				initializePatterns(resolver, repo.patterns)
+				import repo.configuration.{isLocal, isTransactional}
+				resolver.setLocal(isLocal)
+				isTransactional.foreach(value => resolver.setTransactional(value.toString))
+				resolver
+			}
+			case repo: URLRepository =>
+			{
+				val resolver = new URLResolver
+				resolver.setName(repo.name)
+				initializePatterns(resolver, repo.patterns)
+				resolver
+			}
+		}
+	}
+	private def initializeMavenStyle(resolver: IBiblioResolver, name: String, root: String)
+	{
+		resolver.setName(name)
+		resolver.setM2compatible(true)
+		resolver.setRoot(root)
+	}
+	private def initializeSSHResolver(resolver: AbstractSshBasedResolver, repo: SshBasedRepository)
+	{
+		resolver.setName(repo.name)
+		resolver.setPassfile(null)
+		initializePatterns(resolver, repo.patterns)
+		initializeConnection(resolver, repo.connection)
+	}
+	private def initializeConnection(resolver: AbstractSshBasedResolver, connection: RepositoryHelpers.SshConnection)
+	{
+		import resolver._
+		import connection._
+		hostname.foreach(setHost)
+		port.foreach(setPort)
+		authentication foreach
+			{
+				case RepositoryHelpers.PasswordAuthentication(user, password) =>
+					setUser(user)
+					setUserPassword(password)
+				case RepositoryHelpers.KeyFileAuthentication(file, password) =>
+					setKeyFile(file)
+					setKeyFilePassword(password)
+			}
+	}
+	private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: RepositoryHelpers.Patterns)
+	{
+		resolver.setM2compatible(patterns.isMavenCompatible)
+		patterns.ivyPatterns.foreach(resolver.addIvyPattern)
+		patterns.artifactPatterns.foreach(resolver.addArtifactPattern)
+	}
+}
+
+private object DefaultConfigurationMapping extends PomModuleDescriptorWriter.ConfigurationScopeMapping(new java.util.HashMap)
+{
+	override def getScope(confs: Array[String]) =
+	{
+		Configurations.defaultMavenConfigurations.find(conf => confs.contains(conf.name)) match
+		{
+			case Some(conf) => conf.name
+			case None =>
+				if(confs.isEmpty || confs(0) == Configurations.Default.name)
+					null
+				else
+					confs(0)
+		}
+	}
+	override def isOptional(confs: Array[String]) = confs.isEmpty || (confs.length == 1 && confs(0) == Configurations.Optional.name)
+}
+
+/** Interface between Ivy logging and sbt logging. */
+private final class IvyLogger(log: Logger) extends MessageLogger
+{
+	private var progressEnabled = false
+	
+	def log(msg: String, level: Int)
+	{
+		import Message.{MSG_DEBUG, MSG_VERBOSE, MSG_INFO, MSG_WARN, MSG_ERR}
+		level match
+		{
+			case MSG_DEBUG | MSG_VERBOSE => debug(msg)
+			case MSG_INFO => info(msg)
+			case MSG_WARN => warn(msg)
+			case MSG_ERR => error(msg)
+		}
+	}
+	def rawlog(msg: String, level: Int)
+	{
+		log(msg, level)
+	}
+	import Level.{Debug, Info, Warn, Error}
+	def debug(msg: String) = logImpl(msg, Debug)
+	def verbose(msg: String) = debug(msg)
+	def deprecated(msg: String) = warn(msg)
+	def info(msg: String) = logImpl(msg, Info)
+	def rawinfo(msg: String) = info(msg)
+	def warn(msg: String) = logImpl(msg, Warn)
+	def error(msg: String) = logImpl(msg, Error)
+	
+	private def logImpl(msg: String, level: Level.Value) = log.log(level, msg)
+	
+	private def emptyList = java.util.Collections.emptyList[T forSome { type T}]
+	def getProblems = emptyList
+	def getWarns = emptyList
+	def getErrors = emptyList
+
+	def clearProblems = ()
+	def sumupProblems = ()
+	def progress = ()
+	def endProgress = ()
+
+	def endProgress(msg: String) = info(msg)
+	def isShowProgress = false
+	def setShowProgress(progress: Boolean) {}
+}
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
new file mode 100644
index 000000000..9063e901b
--- /dev/null
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -0,0 +1,376 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import java.net.{URI, URL}
+import scala.xml.NodeSeq
+import org.apache.ivy.plugins.resolver.IBiblioResolver
+import org.apache.ivy.util.url.CredentialsStore
+
+sealed abstract class Manager extends NotNull
+/** This explicitly requests auto detection as a dependency manager.  It will first check for a 'pom.xml' file and if that does not exist, an 'ivy.xml' file.
+* Ivy is configured using the detected file or uses defaults.*/
+final class AutoDetectManager(val module: ModuleID) extends Manager
+/** This explicitly requests that the Maven pom 'pom' be used to determine dependencies.  An Ivy configuration file to use may be specified in
+* 'configuration', since Ivy currently cannot extract Maven repositories from a pom file. Otherwise, defaults are used.*/
+final class MavenManager(val configuration: Option[Path], val pom: Path) extends Manager
+/** This explicitly requests that the Ivy file 'dependencies' be used to determine dependencies.  An Ivy configuration file to use may be specified in
+* 'configuration'.  Otherwise, defaults are used.*/
+final class IvyManager(val configuration: Option[Path], val dependencies: Path) extends Manager
+/** This manager directly specifies the dependencies, resolvers, and configurations through sbt wrapper classes and through an in-memory
+* Ivy XML file. */
+sealed trait SbtManager extends Manager
+{
+	def autodetect: Boolean
+	def module: ModuleID
+	def resolvers: Iterable[Resolver]
+	def dependencies: Iterable[ModuleID]
+	def autodetectUnspecified: Boolean
+	def dependenciesXML: NodeSeq
+	def configurations: Iterable[Configuration]
+	def defaultConfiguration: Option[Configuration]
+	def artifacts: Iterable[Artifact]
+}
+final class SimpleManager private[sbt] (val dependenciesXML: NodeSeq, val autodetectUnspecified: Boolean,
+	val module: ModuleID, val resolvers: Iterable[Resolver], explicitConfigurations: Iterable[Configuration],
+	val defaultConfiguration: Option[Configuration], val artifacts: Iterable[Artifact], val dependencies: ModuleID*) extends SbtManager
+{
+	def autodetect = dependencies.isEmpty && dependenciesXML.isEmpty && artifacts.isEmpty && explicitConfigurations.isEmpty && autodetectUnspecified
+	def configurations =
+		if(explicitConfigurations.isEmpty && !autodetect)
+		{
+			defaultConfiguration match
+			{
+				case Some(Configurations.DefaultIvyConfiguration) => Configurations.Default :: Nil
+				case Some(Configurations.DefaultMavenConfiguration) => Configurations.defaultMavenConfigurations
+				case _ => Nil
+			}
+		}
+		else
+			explicitConfigurations
+}
+
+final case class ModuleID(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact]) extends NotNull
+{
+	override def toString = organization + ":" + name + ":" + revision
+	// () required for chaining
+	def notTransitive() = intransitive()
+	def intransitive() = ModuleID(organization, name, revision, configurations, isChanging, false, explicitArtifacts)
+	def changing() = ModuleID(organization, name, revision, configurations, true, isTransitive, explicitArtifacts)
+	def from(url: String) = artifacts(Artifact(name, new URL(url)))
+	def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts)
+}
+object ModuleID
+{
+	def apply(organization: String, name: String, revision: String): ModuleID = ModuleID(organization, name, revision, None)
+	def apply(organization: String, name: String, revision: String, configurations: Option[String]): ModuleID =
+		ModuleID(organization, name, revision, configurations, false, true)
+	def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean): ModuleID =
+		ModuleID(organization, name, revision, configurations, isChanging, isTransitive, Nil)
+}
+sealed trait Resolver extends NotNull
+{
+	def name: String
+}
+sealed case class MavenRepository(name: String, root: String) extends Resolver
+{
+	override def toString = name + ": " + root
+}
+
+object RepositoryHelpers
+{
+	final case class Patterns(ivyPatterns: Seq[String], artifactPatterns: Seq[String], isMavenCompatible: Boolean) extends NotNull
+	{
+		private[sbt] def mavenStyle(): Patterns = Patterns(ivyPatterns, artifactPatterns, true)
+		private[sbt] def withIvys(patterns: Seq[String]): Patterns = Patterns(patterns ++ ivyPatterns, artifactPatterns, isMavenCompatible)
+		private[sbt] def withArtifacts(patterns: Seq[String]): Patterns = Patterns(ivyPatterns, patterns ++ artifactPatterns, isMavenCompatible)
+	}
+	final case class SshConnection(authentication: Option[SshAuthentication], hostname: Option[String], port: Option[Int]) extends NotNull
+	{
+		def copy(authentication: Option[SshAuthentication]) = SshConnection(authentication, hostname, port)
+	}
+	/** Configuration specific to an Ivy filesystem resolver. */
+	final case class FileConfiguration(isLocal: Boolean, isTransactional: Option[Boolean]) extends NotNull
+	{
+		def transactional() = FileConfiguration(isLocal, Some(true))
+		def nontransactional() = FileConfiguration(isLocal, Some(false))
+		def nonlocal() = FileConfiguration(false, isTransactional)
+	}
+	sealed trait SshAuthentication extends NotNull
+	final case class PasswordAuthentication(user: String, password: String) extends SshAuthentication
+	final case class KeyFileAuthentication(keyfile: File, password: String) extends SshAuthentication
+}
+import RepositoryHelpers.{Patterns, SshConnection, FileConfiguration}
+import RepositoryHelpers.{KeyFileAuthentication, PasswordAuthentication, SshAuthentication}
+
+/** sbt interface to an Ivy repository based on patterns, which is most Ivy repositories.*/
+sealed abstract class PatternsBasedRepository extends Resolver
+{
+	type RepositoryType <: PatternsBasedRepository
+	/** Should be implemented to create a new copy of this repository but with `patterns` as given.*/
+	protected def copy(patterns: Patterns): RepositoryType
+
+	/** The object representing the configured patterns for this repository. */
+	def patterns: Patterns
+	
+	/** Enables maven 2 compatibility for this repository. */
+	def mavenStyle() = copy(patterns.mavenStyle())
+	/** Adds the given patterns for resolving/publishing Ivy files.*/
+	def ivys(ivyPatterns: String*): RepositoryType = copy(patterns.withIvys(ivyPatterns))
+	/** Adds the given patterns for resolving/publishing artifacts.*/
+	def artifacts(artifactPatterns: String*): RepositoryType = copy(patterns.withArtifacts(artifactPatterns))
+}
+/** sbt interface for an Ivy filesystem repository.  More convenient construction is done using Resolver.file.  */
+final case class FileRepository(name: String, configuration: FileConfiguration, patterns: Patterns) extends PatternsBasedRepository
+{
+	type RepositoryType = FileRepository
+	protected def copy(patterns: Patterns): FileRepository = FileRepository(name, configuration, patterns)
+	private def copy(configuration: FileConfiguration) = FileRepository(name, configuration, patterns)
+	def transactional() = copy(configuration.transactional())
+	def nonlocal() = copy(configuration.nonlocal())
+}
+final case class URLRepository(name: String, patterns: Patterns) extends PatternsBasedRepository
+{
+	type RepositoryType = URLRepository
+	protected def copy(patterns: Patterns): URLRepository = URLRepository(name, patterns)
+}
+/** sbt interface for an Ivy ssh-based repository (ssh and sftp).  Requires the Jsch library.. */
+sealed abstract class SshBasedRepository extends PatternsBasedRepository
+{
+	type RepositoryType <: SshBasedRepository
+	protected def copy(connection: SshConnection): RepositoryType
+	private def copy(authentication: SshAuthentication): RepositoryType = copy(connection.copy(Some(authentication)))
+	
+	/** The object representing the configured ssh connection for this repository. */
+	def connection: SshConnection
+	
+	/** Configures this to use the specified user name and password when connecting to the remote repository. */
+	def as(user: String, password: String): RepositoryType = copy(new PasswordAuthentication(user, password))
+	/** Configures this to use the specified keyfile and password for the keyfile when connecting to the remote repository. */
+	def as(keyfile: File, password: String): RepositoryType = copy(new KeyFileAuthentication(keyfile, password))
+}
+/** sbt interface for an Ivy repository over ssh.  More convenient construction is done using Resolver.ssh.  */
+final case class SshRepository(name: String, connection: SshConnection, patterns: Patterns, publishPermissions: Option[String]) extends SshBasedRepository
+{
+	type RepositoryType = SshRepository
+	protected def copy(patterns: Patterns): SshRepository = SshRepository(name, connection, patterns, publishPermissions)
+	protected def copy(connection: SshConnection): SshRepository = SshRepository(name, connection, patterns, publishPermissions)
+	/** Defines the permissions to set when publishing to this repository. */
+	def withPermissions(publishPermissions: String): SshRepository = withPermissions(Some(publishPermissions))
+	def withPermissions(publishPermissions: Option[String]): SshRepository = SshRepository(name, connection, patterns, publishPermissions)
+}
+/** sbt interface for an Ivy repository over sftp.  More convenient construction is done using Resolver.sftp.  */
+final case class SftpRepository(name: String, connection: SshConnection, patterns: Patterns) extends SshBasedRepository
+{
+	type RepositoryType = SftpRepository
+	protected def copy(patterns: Patterns): SftpRepository = SftpRepository(name, connection, patterns)
+	protected def copy(connection: SshConnection): SftpRepository = SftpRepository(name, connection, patterns)
+}
+
+import Resolver._
+object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot)
+object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot)
+object DefaultMavenRepository extends MavenRepository("Maven2 Repository", IBiblioResolver.DEFAULT_M2_ROOT)
+object JavaNet1Repository extends Resolver
+{
+	def name = "java.net Maven1 Repository"
+}
+
+object Resolver
+{
+	val ScalaToolsReleasesName = "Scala-Tools Maven2 Repository"
+	val ScalaToolsSnapshotsName = "Scala-Tools Maven2 Snapshots Repository"
+	val ScalaToolsReleasesRoot = "http://scala-tools.org/repo-releases"
+	val ScalaToolsSnapshotsRoot = "http://scala-tools.org/repo-snapshots"
+
+	/** A base class for defining factories for interfaces to Ivy repositories that require a hostname , port, and patterns.  */
+	sealed abstract class Define[RepositoryType <: SshBasedRepository] extends NotNull
+	{
+		/** Subclasses should implement this method to */
+		protected def construct(name: String, connection: SshConnection, patterns: Patterns): RepositoryType
+		/** Constructs this repository type with the given `name`.  `basePatterns` are the initial patterns to use.  A ManagedProject
+		* has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
+		def apply(name: String)(implicit basePatterns: Patterns): RepositoryType =
+			apply(name, None, None, None)
+		/** Constructs this repository type with the given `name` and `hostname`.  `basePatterns` are the initial patterns to use.
+		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
+		def apply(name: String, hostname: String)(implicit basePatterns: Patterns): RepositoryType =
+			apply(name, Some(hostname), None, None)
+		/** Constructs this repository type with the given `name`, `hostname`, and the `basePath` against which the initial
+		* patterns will be resolved.  `basePatterns` are the initial patterns to use.
+		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
+		def apply(name: String, hostname: String, basePath: String)(implicit basePatterns: Patterns): RepositoryType =
+			apply(name, Some(hostname), None, Some(basePath))
+		/** Constructs this repository type with the given `name`, `hostname`, and `port`.  `basePatterns` are the initial patterns to use.
+		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
+		def apply(name: String, hostname: String, port: Int)(implicit basePatterns: Patterns): RepositoryType =
+			apply(name, Some(hostname), Some(port), None)
+		/** Constructs this repository type with the given `name`, `hostname`, `port`, and the `basePath` against which the initial
+		* patterns will be resolved.  `basePatterns` are the initial patterns to use.
+		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
+		def apply(name: String, hostname: String, port: Int, basePath: String)(implicit basePatterns: Patterns): RepositoryType =
+			apply(name, Some(hostname), Some(port), Some(basePath))
+		/** Constructs this repository type with the given `name`, `hostname`, `port`, and the `basePath` against which the initial
+		* patterns will be resolved.  `basePatterns` are the initial patterns to use.  All but the `name` are optional (use None).
+		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
+		def apply(name: String, hostname: Option[String], port: Option[Int], basePath: Option[String])(implicit basePatterns: Patterns): RepositoryType =
+			construct(name, SshConnection(None, hostname, port), resolvePatterns(basePath, basePatterns))
+	}
+	/** A factory to construct an interface to an Ivy SSH resolver.*/
+	object ssh extends Define[SshRepository]
+	{
+		protected def construct(name: String, connection: SshConnection, patterns: Patterns) = SshRepository(name, connection, patterns, None)
+	}
+	/** A factory to construct an interface to an Ivy SFTP resolver.*/
+	object sftp extends Define[SftpRepository]
+	{
+		protected def construct(name: String, connection: SshConnection, patterns: Patterns) = SftpRepository(name, connection, patterns)
+	}
+	/** A factory to construct an interface to an Ivy filesytem resolver. */
+	object file
+	{
+		/** Constructs a file resolver with the given name.  The patterns to use must be explicitly specified
+		* using the `ivys` or `artifacts` methods on the constructed resolver object.*/
+		def apply(name: String): FileRepository = FileRepository(name, defaultFileConfiguration, ivyStylePatterns)
+		/** Constructs a file resolver with the given name and base directory. */
+		def apply(name: String, baseDirectory: File)(implicit basePatterns: Patterns): FileRepository =
+			baseRepository(baseDirectory.toURI)(FileRepository(name, defaultFileConfiguration, _))
+	}
+	object url
+	{
+		/** Constructs a URL resolver with the given name.  The patterns to use must be explicitly specified
+		* using the `ivys` or `artifacts` methods on the constructed resolver object.*/
+		def apply(name: String): URLRepository = URLRepository(name, ivyStylePatterns)
+		/** Constructs a file resolver with the given name and base directory. */
+		def apply(name: String, baseURL: URL)(implicit basePatterns: Patterns): URLRepository =
+			baseRepository(baseURL.toURI)(URLRepository(name, _))
+	}
+	private def baseRepository[T](baseURI: java.net.URI)(construct: Patterns => T)(implicit basePatterns: Patterns): T =
+		construct(resolvePatterns(baseURI.normalize, basePatterns))
+	
+	/** If `base` is None, `patterns` is returned unchanged.
+	* Otherwise, the ivy file and artifact patterns in `patterns` are resolved against the given base. */
+	private def resolvePatterns(base: Option[String], patterns: Patterns): Patterns =
+		base match
+		{
+			case Some(path) => resolvePatterns(pathURI(path), patterns)
+			case None => patterns
+		}
+	/** Resolves the ivy file and artifact patterns in `patterns` against the given base. */
+	private def resolvePatterns(base: URI, basePatterns: Patterns): Patterns =
+	{
+		def resolve(pattern: String) = base.resolve(pathURI(pattern)).getPath
+		def resolveAll(patterns: Seq[String]) = patterns.map(resolve)
+		Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible)
+	}
+	/** Constructs a `URI` with the path component set to `path` and the other components set to null.*/
+	private def pathURI(path: String) = new URI(null, null, path, null)
+	
+	def defaultFileConfiguration = FileConfiguration(true, None)
+	def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true)
+	def ivyStylePatterns = Patterns(Nil, Nil, false)
+
+	def defaultPatterns = mavenStylePatterns
+	def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+}
+
+object Configurations
+{
+	def config(name: String) = new Configuration(name)
+	def defaultMavenConfigurations = Compile :: Runtime :: Test :: Provided :: System :: Optional :: Sources :: Javadoc :: Nil
+	
+	lazy val Default = config("default")
+	lazy val Compile = config("compile")
+	lazy val IntegrationTest = config("it") hide
+	lazy val Provided = config("provided")
+	lazy val Javadoc = config("javadoc")
+	lazy val Runtime = config("runtime")
+	lazy val Test = config("test") hide
+	lazy val Sources = config("sources")
+	lazy val System = config("system")
+	lazy val Optional = config("optional")
+
+	lazy val CompilerPlugin = config("plugin") hide
+	
+	private[sbt] val DefaultMavenConfiguration = defaultConfiguration(true)
+	private[sbt] val DefaultIvyConfiguration = defaultConfiguration(false)
+	private[sbt] def DefaultConfiguration(mavenStyle: Boolean) = if(mavenStyle) DefaultMavenConfiguration else DefaultIvyConfiguration
+	private[sbt] def defaultConfiguration(mavenStyle: Boolean) = 
+	{
+		val base = if(mavenStyle) Configurations.Compile else Configurations.Default
+		config(base.name + "->default(compile)")
+	}
+	
+	private[sbt] def removeDuplicates(configs: Iterable[Configuration]) = Set(scala.collection.mutable.Map(configs.map(config => (config.name, config)).toSeq: _*).values.toList: _*)
+}
+/** Represents an Ivy configuration. */
+final case class Configuration(name: String, description: String, isPublic: Boolean, extendsConfigs: List[Configuration], transitive: Boolean) extends NotNull
+{
+	require(name != null && !name.isEmpty)
+	require(description != null)
+	def this(name: String) = this(name, "", true, Nil, true)
+	def describedAs(newDescription: String) = Configuration(name, newDescription, isPublic, extendsConfigs, transitive)
+	def extend(configs: Configuration*) = Configuration(name, description, isPublic, configs.toList ::: extendsConfigs, transitive)
+	def notTransitive = intransitive
+	def intransitive = Configuration(name, description, isPublic, extendsConfigs, false)
+	def hide = Configuration(name, description, false, extendsConfigs, transitive)
+	override def toString = name
+}
+
+final case class Artifact(name: String, `type`: String, extension: String, configurations: Iterable[Configuration], url: Option[URL]) extends NotNull
+object Artifact
+{
+	def apply(name: String): Artifact = Artifact(name, defaultType, defaultExtension, Nil, None)
+	def apply(name: String, `type`: String, extension: String): Artifact = Artifact(name, `type`, extension, Nil, None)
+	def apply(name: String, url: URL): Artifact =Artifact(name, extract(url, defaultType), extract(url, defaultExtension), Nil, Some(url))
+	val defaultExtension = "jar"
+	val defaultType = "jar"
+	private[this] def extract(url: URL, default: String) =
+	{
+		val s = url.toString
+		val i = s.lastIndexOf('.')
+		if(i >= 0)
+			s.substring(i+1)
+		else
+			default
+	}
+}
+
+object Credentials
+{
+	/** Add the provided credentials to Ivy's credentials cache.*/
+	def add(realm: String, host: String, userName: String, passwd: String): Unit =
+		CredentialsStore.INSTANCE.addCredentials(realm, host, userName, passwd)
+	/** Load credentials from the given file into Ivy's credentials cache.*/
+	def apply(file: String, log: Logger): Unit = apply(Path.fromFile(file), log)
+	/** Load credentials from the given file into Ivy's credentials cache.*/
+	def apply(file: File, log: Logger): Unit = apply(Path.fromFile(file), log)
+	/** Load credentials from the given file into Ivy's credentials cache.*/
+	def apply(path: Path, log: Logger)
+	{
+		val msg =
+			if(path.exists)
+			{
+				val properties = new scala.collection.mutable.HashMap[String, String]
+				def get(keys: List[String]) = keys.flatMap(properties.get).firstOption.toRight(keys.head + " not specified in credentials file: " + path)
+					
+					impl.MapUtilities.read(properties, path, log) orElse
+					{
+						List.separate( List(RealmKeys, HostKeys, UserKeys, PasswordKeys).map(get) ) match
+						{
+							case (Nil, List(realm, host, user, pass)) => add(realm, host, user, pass); None
+							case (errors, _) => Some(errors.mkString("\n"))
+						}
+					}
+			}
+			else
+				Some("Credentials file " + path + " does not exist")
+		msg.foreach(x => log.warn(x))
+	}
+	private[this] val RealmKeys = List("realm")
+	private[this] val HostKeys = List("host", "hostname")
+	private[this] val UserKeys = List("user", "user.name", "username")
+	private[this] val PasswordKeys = List("password", "pwd", "pass", "passwd")
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ModuleUtilities.scala b/src/main/scala/sbt/ModuleUtilities.scala
new file mode 100644
index 000000000..ab017c1b6
--- /dev/null
+++ b/src/main/scala/sbt/ModuleUtilities.scala
@@ -0,0 +1,14 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ */
+package sbt
+
+object ModuleUtilities
+{
+	def getObject(className: String, loader: ClassLoader) =
+	{
+		val obj = Class.forName(className + "$", true, loader)
+		val singletonField = obj.getField("MODULE$")
+		singletonField.get(null)
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/NameFilter.scala b/src/main/scala/sbt/NameFilter.scala
new file mode 100644
index 000000000..3387806b6
--- /dev/null
+++ b/src/main/scala/sbt/NameFilter.scala
@@ -0,0 +1,72 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import java.util.regex.Pattern
+
+trait FileFilter extends java.io.FileFilter with NotNull
+{
+	def || (filter: FileFilter): FileFilter = new SimpleFileFilter( file => accept(file) || filter.accept(file) )
+	def && (filter: FileFilter): FileFilter = new SimpleFileFilter( file => accept(file) && filter.accept(file) )
+	def -- (filter: FileFilter): FileFilter = new SimpleFileFilter( file => accept(file) && !filter.accept(file) )
+	def unary_- : FileFilter = new SimpleFileFilter( file => !accept(file) )
+}
+trait NameFilter extends FileFilter with NotNull
+{
+	def accept(name: String): Boolean
+	final def accept(file: File): Boolean = accept(file.getName)
+	def | (filter: NameFilter): NameFilter = new SimpleFilter( name => accept(name) || filter.accept(name) )
+	def & (filter: NameFilter): NameFilter = new SimpleFilter( name => accept(name) && filter.accept(name) )
+	def - (filter: NameFilter): NameFilter = new SimpleFilter( name => accept(name) && !filter.accept(name) )
+	override def unary_- : NameFilter = new SimpleFilter( name => !accept(name) )
+}
+object HiddenFileFilter extends FileFilter {
+	def accept(file: File) = file.isHidden && file.getName != "."
+}
+object ExistsFileFilter extends FileFilter {
+	def accept(file: File) = file.exists
+}
+object DirectoryFilter extends FileFilter {
+	def accept(file: File) = file.isDirectory
+}
+class SimpleFileFilter(val acceptFunction: File => Boolean) extends FileFilter
+{
+	def accept(file: File) = acceptFunction(file)
+}
+class ExactFilter(val matchName: String) extends NameFilter
+{
+	def accept(name: String) = matchName == name
+}
+class SimpleFilter(val acceptFunction: String => Boolean) extends NameFilter
+{
+	def accept(name: String) = acceptFunction(name)
+}
+class PatternFilter(val pattern: Pattern) extends NameFilter
+{
+	def accept(name: String) = pattern.matcher(name).matches
+}
+object AllPassFilter extends NameFilter
+{
+	def accept(name: String) = true
+}
+object NothingFilter extends NameFilter
+{
+	def accept(name: String) = false
+}
+
+object GlobFilter
+{
+	def apply(expression: String): NameFilter =
+	{
+		require(!expression.exists(java.lang.Character.isISOControl), "Control characters not allowed in filter expression.")
+		if(expression == "*")
+			AllPassFilter
+		else if(expression.indexOf('*') < 0) // includes case where expression is empty
+			new ExactFilter(expression)
+		else
+			new PatternFilter(Pattern.compile(expression.split("\\*", -1).map(quote).mkString(".*")))
+	}
+	private def quote(s: String) = if(s.isEmpty) "" else Pattern.quote(s.replaceAll("\n", """\n"""))
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Pack.scala b/src/main/scala/sbt/Pack.scala
new file mode 100644
index 000000000..ecfed74a2
--- /dev/null
+++ b/src/main/scala/sbt/Pack.scala
@@ -0,0 +1,87 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.{File, FileOutputStream}
+import java.util.jar.{JarEntry, JarFile, JarOutputStream, Pack200}
+import scala.collection.Map
+import FileUtilities._
+
+object Pack
+{
+	def pack(jarPath: Path, out: Path, log: Logger): Option[String] = pack(jarPath, out, defaultPackerOptions, log)
+	def pack(jarPath: Path, out: Path, options: Map[String, String], log: Logger): Option[String] =
+	{
+		val packer = Pack200.newPacker
+		val properties = new wrap.MutableMapWrapper(packer.properties)
+		properties ++= options
+		 
+		OpenResource.jarFile(false).ioOption(jarPath.asFile, "applying pack200 compression to jar", log) { f =>
+			writeStream(out.asFile, log) { stream =>
+				packer.pack(f, stream)
+				None
+			}
+		}
+	}
+	def unpack(packedPath: Path, toJarPath: Path, log: Logger): Option[String] =
+	{
+		val unpacker = Pack200.newUnpacker
+		writeStream(toJarPath.asFile, log) { fileStream =>
+			val jarOut = new JarOutputStream(fileStream)
+			Control.trapUnitAndFinally("Error unpacking '" + packedPath + "': ", log)
+				{ unpacker.unpack(packedPath.asFile, jarOut); None }
+				{ jarOut.close() }
+		}
+	}
+	def defaultPackerOptions: Map[String, String] = scala.collection.immutable.Map()
+}
+
+import java.net.URL
+/** This is somewhat of a mess and is not entirely correct.  jarsigner doesn't work properly
+* on scalaz and it is difficult to determine whether a jar is both signed and valid.  */
+object SignJar
+{
+	final class SignOption private[SignJar](val toList: List[String], val signOnly: Boolean) extends NotNull
+	{
+		override def toString = toList.mkString(" ")
+	}
+	def keyStore(url: URL) = new SignOption("-keystore" :: url.toExternalForm :: Nil, true)
+	def signedJar(p: Path) = new SignOption("-signedjar" :: p.asFile.getAbsolutePath :: Nil, true)
+	def verbose = new SignOption("-verbose" :: Nil, false)
+	def sigFile(name: String) = new SignOption("-sigfile" :: name :: Nil, true)
+	def storeType(t: String) = new SignOption("-storetype" :: t :: Nil, false)
+	def provider(p: String) = new SignOption("-provider" :: p :: Nil, false)
+	def providerName(p: String) = new SignOption("-providerName" :: p :: Nil, false)
+	def storePassword(p: String) = new SignOption("-storepass" :: p :: Nil, true)
+	def keyPassword(p: String) = new SignOption("-keypass" :: p :: Nil, true)
+	
+	private def VerifyOption = "-verify"
+	
+	/** Uses jarsigner to sign the given jar.  */
+	def sign(jarPath: Path, alias: String, options: Seq[SignOption], log: Logger): Option[String] =
+	{
+		require(!alias.trim.isEmpty, "Alias cannot be empty")
+		val arguments = options.toList.flatMap(_.toList) ::: jarPath.asFile.getAbsolutePath :: alias :: Nil
+		execute("Signed " + jarPath, "signing", arguments, log)
+	}
+	/** Uses jarsigner to verify the given jar.*/
+	def verify(jarPath: Path, options: Seq[SignOption], log: Logger): Option[String] =
+	{
+		val arguments = options.filter(!_.signOnly).toList.flatMap(_.toList) ::: VerifyOption :: jarPath.asFile.getAbsolutePath :: Nil
+		execute("Verified " + jarPath, "verifying", arguments, log)
+	}
+	private def execute(successMessage: String, action: String, arguments: List[String], log: Logger): Option[String] =
+	{
+		val exitCode = Process(CommandName, arguments) ! log
+		if(exitCode == 0)
+		{
+			log.debug(successMessage)
+			None
+		}
+		else
+			Some("Error " + action + " jar (exit code was " + exitCode + ".)")
+	}
+	
+	private val CommandName = "jarsigner"
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ParallelRunner.scala b/src/main/scala/sbt/ParallelRunner.scala
new file mode 100644
index 000000000..74ce7a8ee
--- /dev/null
+++ b/src/main/scala/sbt/ParallelRunner.scala
@@ -0,0 +1,464 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt
+
+/** This file provides the parallel execution engine of sbt.  It is a fairly general module, with pluggable Schedulers and Strategies.
+*
+* There are three main componenets to the engine: Distributors, Schedulers, and Strategies.
+*
+* A Scheduler provides work that is ready to execute.  The main type of Scheduler in sbt is a scheduler
+* of nodes in a directed, acyclic graph..  This type of scheduler provides work when its
+* dependencies have finished executing successfully.  Another type of scheduler is a MultiScheduler, which draws work
+* from sub-schedulers.
+*
+* A Strategy is used by a Scheduler to select the work to process from the work that is ready.  It is notified as work
+* becomes ready.  It is requested to select work to process from the work that is ready.  The main Strategy in sbt is the
+* OrderedStrategy, which prioritizes work according to some ordering defined by its constructor.  The primary ordering
+* used in sbt is based on the longest length of the processing path that includes the node being ordered.
+*
+* A Distributor uses a Scheduler to obtain work according up to the maximum work allowed to run at once.  It runs each
+* unit of work in its own Thread.
+**/
+
+import java.util.concurrent.LinkedBlockingQueue
+import scala.collection.{immutable, mutable}
+import immutable.TreeSet
+
+/** Interface to the Distributor/Scheduler system for running tasks with dependencies described by a directed acyclic graph.*/
+object ParallelRunner
+{
+	/** Executes work for nodes in an acyclic directed graph with root node `node`.  The name of a node is provided
+	* by the `name` function, the work to perform for a node by `action`, and the logger to use for a node by `log`.
+	* The maximum number of tasks to execute simultaneously is `maximumTasks`. */
+	def run[D <: Dag[D]](node: D, name: D => String, action: D => Option[String], maximumTasks: Int, log: D => Logger): List[WorkFailure[D]] =
+	{
+		val info = DagInfo(node)
+		// Create a strategy that gives each node a uniform self cost and uses the maximum cost to execute it and the nodes that depend on it
+		// to determine which node to run.  The self cost could be modified to include more information about a node, such as the size of input files
+		val strategy = defaultStrategy(info)
+		val jobScheduler = CompoundScheduler(new DagScheduler(info, strategy), strategy)
+		val distributor = new Distributor(jobScheduler, action, maximumTasks, log)
+		val result = distributor.run().toList
+		for( WorkFailure(work, message) <- result ) yield WorkFailure(work, "Error running " + name(work) + ": " + message)
+	}
+	def dagScheduler[D <: Dag[D]](node: D) =
+	{
+		val info = DagInfo(node)
+		new DagScheduler(info, defaultStrategy(info))
+	}
+	private def defaultStrategy[D <: Dag[D]](info: DagInfo[D]) = MaxPathStrategy((d: D) => 1, info)
+}
+/** Requests work from `scheduler` and processes it using `doWork`.  This class limits the amount of work processing at any given time
+* to `workers`.*/
+final class Distributor[D](scheduler: Scheduler[D], doWork: D => Option[String], workers: Int, log: D => Logger) extends NotNull
+{
+	require(workers > 0)
+	final def run(): Iterable[WorkFailure[D]]  = (new Run).run()
+
+	private final class Run extends NotNull
+	{
+		private[this] val schedule = scheduler.run
+		/** The number of threads currently running. */
+		private[this] var running = 0
+		/** Pending notifications of completed work. */
+		private[this] val complete = new java.util.concurrent.LinkedBlockingQueue[Done]
+		
+		private[Distributor] def run(): Iterable[WorkFailure[D]] =
+		{
+			next()
+			if(isIdle && !schedule.hasPending) // test if all work is complete
+				schedule.failures
+			else
+			{
+				waitForCompletedWork() // wait for some work to complete 
+				run() // continue
+			}
+		}
+		// true if the maximum number of worker threads are currently running
+		private def atMaximum = running == workers
+		private def availableWorkers = workers - running
+		// true if no worker threads are currently running
+		private def isIdle = running == 0
+		// process more work
+		private def next()
+		{
+			 // if the maximum threads are being used, do nothing
+			 // if all work is complete or the scheduler is waiting for current work to complete, do nothing
+			if(!atMaximum && schedule.hasPending)
+			{
+				val nextWork = schedule.next(availableWorkers)
+				val nextSize = nextWork.size
+				assume(nextSize <= availableWorkers, "Scheduler provided more work (" + nextSize + ") than allowed (" + availableWorkers + ")")
+				assume(nextSize > 0 || !isIdle, "Distributor idle and the scheduler indicated work pending, but provided no work.")
+				nextWork.foreach(process)
+			}
+		}
+		// wait on the blocking queue `complete` until some work finishes and notify the scheduler
+		private def waitForCompletedWork()
+		{
+			require(running > 0)
+			val done = complete.take()
+			running -= 1
+			schedule.complete(done.data, done.result)
+		}
+		private def process(data: D)
+		{
+			require(running + 1 <= workers)
+			running += 1
+			new Worker(data).start()
+		}
+		private class Worker(data: D) extends Thread with NotNull
+		{
+			override def run()
+			{
+				val result = Control.trapUnit("", log(data))(doWork(data))
+				complete.put( new Done(result, data) )
+			}
+		}
+	}
+	private final class Done(val result: Option[String], val data: D) extends NotNull
+}
+final case class WorkFailure[D](work: D, message: String) extends NotNull
+{
+	override def toString = message
+}
+/** Schedules work of type D.  A Scheduler determines what work is ready to be processed.
+* A Scheduler is itself immutable.  It creates a mutable object for each scheduler run.*/
+trait Scheduler[D] extends NotNull
+{
+	/** Starts a new run.  The returned object is a new Run, representing a single scheduler run.  All state for the run
+	* is encapsulated in this object.*/
+	def run: Run
+	trait Run extends NotNull
+	{
+		/** Notifies this scheduler that work has completed with the given result (Some with the error message or None if the work succeeded).*/
+		def complete(d: D, result: Option[String]): Unit
+		/** Returns true if there is any more work to be done, although remaining work can be blocked
+		* waiting for currently running work to complete.*/
+		def hasPending: Boolean
+		/**Returns true if this scheduler has no more work to be done, ever.*/
+		def isComplete: Boolean
+		/** Returns up to 'max' units of work.  `max` is always positive.  The returned sequence cannot be empty if there is
+		* no work currently being processed.*/
+		def next(max: Int): Seq[D]
+		/** A list of failures that occurred to this point, as reported to the `complete` method. */
+		def failures: Iterable[WorkFailure[D]]
+	}
+}
+/** A Strategy selects the work to process from work that is ready to be processed.*/
+private trait ScheduleStrategy[D] extends NotNull
+{
+	/** Starts a new run.  The returned object is a new Run, representing a single strategy run.  All state for the run
+	* is handled through this object and is encapsulated in this object.*/
+	def run: Run
+	trait Run extends NotNull
+	{
+		/** Adds the given work to the list of work that is ready to run.*/
+		def workReady(dep: D): Unit
+		/** Returns true if there is work ready to be run. */
+		def hasReady: Boolean
+		/** Provides up to `max` units of work.  `max` is always positive and this method is not called
+		* if hasReady is false. The returned list cannot be empty is there is work ready to be run.*/
+		def next(max: Int): List[D]
+	}
+}
+
+/** A scheduler for nodes of a directed-acyclic graph.  It requires the root of the graph
+* and a strategy to select which available nodes to run on limited resources.*/
+private[sbt] final class DagScheduler[D <: Dag[D]](info: DagInfo[D], strategy: ScheduleStrategy[D]) extends Scheduler[D]
+{
+	def run: Run = new Run
+	{
+		val infoRun = info.run
+		val strategyRun = strategy.run
+		
+		// find nodes that are ready to be run (no dependencies)
+		{
+			val startReady = for( (key, value) <- infoRun.remainingDepsRun if(value.isEmpty)) yield key
+			infoRun.remainingDepsRun --= startReady
+			startReady.foreach(strategyRun.workReady)
+		}
+			
+		val failures = new mutable.ListBuffer[WorkFailure[D]]
+		def next(max: Int) = strategyRun.next(max)
+		def complete(work: D, result: Option[String])
+		{
+			result match
+			{
+				case None => infoRun.complete(work, strategyRun.workReady)
+				case Some(errorMessage) =>
+					infoRun.clear(work)
+					failures += WorkFailure(work, errorMessage)
+			}
+		}
+		def isComplete = !strategyRun.hasReady && infoRun.reverseDepsRun.isEmpty
+		// the strategy might not have any work ready if the remaining work needs currently executing work to finish first
+		def hasPending = strategyRun.hasReady || !infoRun.remainingDepsRun.isEmpty
+	}
+}
+private object MaxPathStrategy
+{
+	def apply[D <: Dag[D]](selfCost: D => Int, info: DagInfo[D]): ScheduleStrategy[D] =
+	{
+		val cost = // compute the cost of the longest execution path ending at each node
+		{
+			val cost = new mutable.HashMap[D, Int]
+			def computeCost(work: D): Int = info.reverseDeps.getOrElse(work, immutable.Set.empty[D]).foldLeft(0)(_ max getCost(_)) + selfCost(work)
+			def getCost(work: D): Int = cost.getOrElseUpdate(work, computeCost(work))
+			info.remainingDeps.keys.foreach(getCost)
+			wrap.Wrappers.readOnly(cost)
+		}
+		// create a function to compare units of work.  This is not as simple as cost(a) compare cost(b) because it cannot return 0 for
+		// unequal nodes (at least for the Ordered comparison)
+		
+		// 2.8.0 uses Ordering
+		implicit val compareOrdering: Ordering[D] =
+			new Ordering[D]
+			{
+				def compare(a: D, b: D) =
+				{
+					val base = cost(a) compare cost(b)
+					if(base == 0)
+						a.hashCode compare b.hashCode // this is required because TreeSet interprets 0 as equal
+					else
+						base
+				}
+			}
+		// 2.7.x uses an implicit view to Ordered
+		implicit val compare =
+			(a: D) => new Ordered[D] {
+				def compare(b: D) = compareOrdering.compare(a, b)
+			}
+		new OrderedStrategy(new TreeSet())
+	}
+}
+/** A strategy that adds work to a tree and selects the last key as the next work to be done. */
+private class OrderedStrategy[D](ready: TreeSet[D]) extends ScheduleStrategy[D]
+{
+	def run = new Run
+	{
+		private[this] var readyRun = ready
+		def next(max: Int): List[D] = nextImpl(max, Nil)
+		private[this] def nextImpl(remaining: Int, accumulated: List[D]): List[D] =
+		{
+			if(remaining <= 0 || readyRun.isEmpty)
+				accumulated
+			else
+			{
+				val next = readyRun.lastKey
+				readyRun -= next
+				nextImpl(remaining - 1, next :: accumulated)
+			}
+		}
+		def workReady(dep: D) { readyRun += dep }
+		def hasReady = !readyRun.isEmpty
+	}
+}
+/** A class that represents state for a DagScheduler and that MaxPathStrategy uses to initialize an OrderedStrategy. */
+private final class DagInfo[D <: Dag[D]](val remainingDeps: immutable.Map[D, immutable.Set[D]],
+	val reverseDeps: immutable.Map[D, immutable.Set[D]]) extends NotNull
+{
+	def run = new Run
+	final class Run extends NotNull
+	{
+		val remainingDepsRun = DagInfo.mutableMap(remainingDeps)
+		val reverseDepsRun = DagInfo.mutableMap(reverseDeps)
+		/** Called when work does not complete successfully and so all work that (transitively) depends on the work 
+		* must be removed from the maps. */
+		def clear(work: D)
+		{
+			remainingDepsRun -= work
+			foreachReverseDep(work)(clear)
+		}
+		/** Called when work completes properly.  `initial` and `ready` are used for a fold over
+		* the work that is now ready to go (becaues it was only waiting for `work` to complete).*/
+		def complete(work: D, ready: D => Unit)
+		{
+			def completed(dependsOnCompleted: D)
+			{
+				for(remainingDependencies <- remainingDepsRun.get(dependsOnCompleted))
+				{
+					remainingDependencies -= work
+					if(remainingDependencies.isEmpty)
+					{
+						remainingDepsRun -= dependsOnCompleted
+						ready(dependsOnCompleted)
+					}
+				}
+			}
+			foreachReverseDep(work)(completed)
+		}
+		private def foreachReverseDep(work: D)(f: D => Unit) { reverseDepsRun.removeKey(work).foreach(_.foreach(f)) }
+	}
+}
+/** Constructs forward and reverse dependency map for the given Dag root node. */
+private object DagInfo
+{
+	/** Constructs the reverse dependency map from the given Dag and
+	* puts the forward dependencies into a map */
+	def apply[D <: Dag[D]](root: D): DagInfo[D] =
+	{
+		val remainingDeps = new mutable.HashMap[D, immutable.Set[D]]
+		val reverseDeps = new mutable.HashMap[D, mutable.Set[D]]
+		def visitIfUnvisited(node: D): Unit = remainingDeps.getOrElseUpdate(node, processDependencies(node))
+		def processDependencies(node: D): Set[D] =
+		{
+			val workDependencies = node.dependencies
+			workDependencies.foreach(visitIfUnvisited)
+			for(dep <- workDependencies)
+				reverseDeps.getOrElseUpdate(dep, new mutable.HashSet[D]) += node
+			immutable.HashSet(workDependencies.toSeq: _*)
+		}
+		visitIfUnvisited(root)
+		new DagInfo(immutable.HashMap(remainingDeps.toSeq : _*), immute(reverseDeps) )
+	}
+	/** Convert a mutable Map with mutable Sets for values to an immutable Map with immutable Sets for values. */
+	private def immute[D](map: mutable.Map[D, mutable.Set[D]]): immutable.Map[D, immutable.Set[D]] =
+	{
+		val immutedSets = map.map { case (key, value) =>(key,  immutable.HashSet(value.toSeq : _*)) }
+		immutable.HashMap(immutedSets.toSeq :_*)
+	}
+	/** Convert an immutable Map with immutable Sets for values to a mutable Map with mutable Sets for values. */
+	private def mutableMap[D](map: immutable.Map[D, immutable.Set[D]]): mutable.Map[D, mutable.Set[D]] =
+	{
+		val mutableSets = map.map { case (key, value) =>(key,  mutable.HashSet(value.toSeq : _*)) }
+		mutable.HashMap(mutableSets.toSeq :_*)
+	}
+}
+/** A scheduler that can get work from sub-schedulers.  The `schedulers` argument to the constructor
+* is a sequence of the initial schedulers and the key to provide to a client that uses the 'detailedComplete'
+* method when the scheduler completes its work.*/
+private final class MultiScheduler[D, T](schedulers: (Scheduler[D], T)*) extends Scheduler[D]
+{
+	/** Returns a Run instance that represents a scheduler run.*/
+	def run = new MultiRun
+	final class MultiRun extends Run
+	{
+		val owners = new mutable.HashMap[D, Scheduler[D]#Run]
+		val failures = new mutable.ListBuffer[WorkFailure[D]]
+		val schedules = mutable.HashMap[Scheduler[D]#Run, T](schedulers.map { case (scheduler, completeKey) => (scheduler.run, completeKey)} : _*)
+		def +=(schedule: Scheduler[D]#Run, completeKey: T) { schedules(schedule) = completeKey }
+	
+		def isComplete = schedules.keys.forall(_.isComplete)
+		def hasPending = schedules.keys.exists(_.hasPending)
+		def next(max: Int) = nextImpl(max, schedules.keys.toList, Nil)
+	
+		private def nextImpl(max: Int, remaining: List[Scheduler[D]#Run], accumulatedWork: List[D]): Seq[D] =
+		{
+			if(max == 0 || remaining.isEmpty)
+				accumulatedWork
+			else
+			{
+				val currentSchedule = remaining.head
+				if(currentSchedule.hasPending)
+				{
+					val newWork = currentSchedule.next(max).toList
+					newWork.foreach(work => owners.put(work, currentSchedule))
+					nextImpl(max - newWork.size, remaining.tail, newWork ::: accumulatedWork)
+				}
+				else
+					nextImpl(max, remaining.tail, accumulatedWork)
+			}
+		}
+	
+		def complete(work: D, result: Option[String]) { detailedComplete(work, result) }
+		def detailedComplete(work: D, result: Option[String]) =
+		{
+			def complete(forOwner: Scheduler[D]#Run) =
+			{
+				forOwner.complete(work, result)
+				if(forOwner.isComplete)
+				{
+					failures ++= forOwner.failures
+					Some(forOwner, schedules.removeKey(forOwner).get)
+				}
+				else
+					None
+			}
+			owners.removeKey(work).flatMap(complete)
+		}
+	}
+}
+/** This scheduler allows a unit of work to provide nested work.
+*
+* When a unit of work that implements CompoundWork is returned for processing by `multi`, this scheduler will request the work's
+* nested scheduler that represents the nested work to be done.  The new scheduler will be added to `multi`.  When the new scheduler
+* is finished providing work, a final scheduler is run.*/
+private final class CompoundScheduler[D](multi: MultiScheduler[D, Option[FinalWork[D]]], finalWorkStrategy: ScheduleStrategy[D]) extends Scheduler[D]
+{
+	def run: Run = new Run
+	{
+		val multiRun = multi.run
+		val strategyRun = finalWorkStrategy.run
+	
+		def isComplete = multiRun.isComplete && !strategyRun.hasReady
+		def hasPending = strategyRun.hasReady || multiRun.hasPending || multiRun.schedules.values.exists(_.isDefined)
+		def complete(work: D, result: Option[String]) =
+		{
+			for( (scheduler, Some(finalWorkTodo)) <- multiRun.detailedComplete(work, result) )
+			{
+				multiRun += (finalWorkTodo.doFinally.run, None)
+				if(scheduler.failures.isEmpty)
+					strategyRun workReady finalWorkTodo.compound
+				else
+					multiRun.complete(finalWorkTodo.compound, Some("One or more subtasks failed"))
+			}
+		}
+		def failures = multiRun.failures
+		def next(max: Int) = nextImpl(max, Nil)
+		private def nextImpl(max: Int, processedNextWork: List[D]): Seq[D] =
+		{
+			if(max > 0)
+			{
+				if(strategyRun.hasReady)
+				{
+					val newWork = strategyRun.next(max)
+					nextImpl(max - newWork.size, newWork ::: processedNextWork)
+				}
+				else if(multiRun.hasPending)
+				{
+					val multiWork = multiRun.next(max)
+					if(multiWork.isEmpty)
+						processedNextWork
+					else
+					{
+						val expandedWork = (processedNextWork /: multiWork)(expand)
+						val remaining = max - (expandedWork.size - processedNextWork.size)
+						nextImpl(remaining, expandedWork)
+					}
+				}
+				else
+					processedNextWork
+			}
+			else
+				processedNextWork
+		}
+		private def expand(accumulate: List[D], work: D): List[D] =
+		{
+			work match
+			{
+				case c: CompoundWork[D] =>
+					val subWork = c.work
+					addFinal(subWork.scheduler, new FinalWork(work, subWork.doFinally))
+					accumulate
+				case _ => work :: accumulate
+			}
+		}
+		private def addFinal(schedule: Scheduler[D], work: FinalWork[D]) { multiRun += (schedule.run, Some(work)) }
+	}
+}
+private object CompoundScheduler
+{
+	def apply[D](scheduler: Scheduler[D], strategy: ScheduleStrategy[D]) : Scheduler[D] =
+		new CompoundScheduler(new MultiScheduler[D, Option[FinalWork[D]]]( (scheduler, None) ), strategy)
+}
+private final class FinalWork[D](val compound: D, val doFinally: Scheduler[D]) extends NotNull
+/** This represents nested work.  The work provided by `scheduler` is processed first.  The work provided by `doFinally` is processed
+* after `scheduler` completes regardless of the success of `scheduler`.*/
+final class SubWork[D](val scheduler: Scheduler[D], val doFinally: Scheduler[D]) extends NotNull
+/** Work that implements this interface provides nested work to be done before this work is processed.*/
+trait CompoundWork[D] extends NotNull
+{
+	def work: SubWork[D]
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
new file mode 100644
index 000000000..7f746f4f4
--- /dev/null
+++ b/src/main/scala/sbt/Path.scala
@@ -0,0 +1,336 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import Path._
+import FileUtilities.wrapNull
+import java.io.File
+import scala.collection.mutable.{Set, HashSet}
+
+/** A Path represents a file in a project.
+* @see sbt.PathFinder*/
+sealed abstract class Path extends PathFinder with NotNull
+{
+	/** Creates a base directory for this path.  This is used by copy and zip functions
+	* to determine the relative path that should be used in the destination.  For example,
+	* if the following path is specified to be copied to directory 'd',
+	* 
+	* <code>((a / b) ##) / x / y</code>
+	*
+	* the copied path would be 
+	*
+	* <code>d / x / y</code>
+	*
+	* The <code>relativePath</code> method is used to return the relative path to the base directory. */
+	override def ## : Path = new BaseDirectory(this)
+	private[sbt] def addTo(pathSet: Set[Path])
+	{
+		if(asFile.exists)
+			pathSet += this
+	}
+	override def / (component: String): Path = if(component == ".") this else new RelativePath(this, component)
+	/** True if and only if the file represented by this path exists.*/
+	def exists = asFile.exists
+	/** True if and only if the file represented by this path is a directory.*/
+	def isDirectory = asFile.isDirectory
+	/** The last modified time of the file represented by this path.*/
+	def lastModified = asFile.lastModified
+	/* True if and only if file that this path represents exists and the file represented by the path 'p'
+	* does not exist or was modified before the file for this path.*/
+	def newerThan(p: Path): Boolean = exists && (!p.exists || lastModified > p.lastModified)
+	/* True if and only if file that this path represents does not exist or the file represented by the path 'p'
+	* exists and was modified after the file for this path.*/
+	def olderThan(p: Path): Boolean = p newerThan this
+	/** The file represented by this path.*/
+	def asFile: File
+	/** The file represented by this path converted to a <code>URL</code>.*/
+	def asURL = asFile.toURI.toURL
+	/** The string representation of this path relative to the base directory.  The project directory is the
+	* default base directory if one is not specified explicitly using the <code>##</code> operator.*/
+	lazy val relativePath: String = relativePathString(sep.toString)
+	def relativePathString(separator: String): String
+	final def projectRelativePath: String = projectRelativePathString(sep.toString)
+	def projectRelativePathString(separator: String): String
+	def absolutePath: String = asFile.getAbsolutePath
+	private[sbt] def prependTo(s: String): String
+	
+	/** Equality of Paths is defined in terms of the underlying <code>File</code>.*/
+	override final def equals(other: Any) =
+		other match
+		{
+			case op: Path => asFile == op.asFile
+			case _ => false
+		}
+	/** The hash code of a Path is that of the underlying <code>File</code>.*/
+	override final def hashCode = asFile.hashCode
+}
+private final class BaseDirectory(private[sbt] val path: Path) extends Path
+{
+	override def ## : Path = this
+	override def toString = path.toString
+	def asFile = path.asFile
+	def relativePathString(separator: String) = ""
+	def projectRelativePathString(separator: String) = path.projectRelativePathString(separator)
+	private[sbt] def prependTo(s: String) = "." + sep + s
+}
+private[sbt] final class FilePath(file: File) extends Path
+{
+	lazy val asFile = absolute(file)
+	override def toString = absolutePath
+	def relativePathString(separator: String) = asFile.getName
+	def projectRelativePathString(separator: String) = relativePathString(separator)
+	private[sbt] def prependTo(s: String) = absolutePath + sep + s
+}
+private[sbt] final class ProjectDirectory(file: File) extends Path
+{
+	lazy val asFile = absolute(file)
+	override def toString = "."
+	def relativePathString(separator: String) = ""
+	def projectRelativePathString(separator: String) = ""
+	private[sbt] def prependTo(s: String) = "." + sep + s
+}
+private[sbt] final class RelativePath(val parentPath: Path, val component: String) extends Path
+{
+	checkComponent(component)
+	override def toString = parentPath prependTo component
+	lazy val asFile = new File(parentPath.asFile, component)
+	private[sbt] def prependTo(s: String) =  parentPath prependTo (component + sep + s)
+	def relativePathString(separator: String) = relative(parentPath.relativePathString(separator), separator)
+	def projectRelativePathString(separator: String) = relative(parentPath.projectRelativePathString(separator), separator)
+	private def relative(parentRelative: String, separator: String) =
+	{
+		if(parentRelative.isEmpty)
+			component
+		else
+			parentRelative + separator + component
+	}
+}
+object Path
+{
+	import java.io.File
+	import File.pathSeparator
+	
+	def fileProperty(name: String) = Path.fromFile(System.getProperty(name))
+	def userHome = fileProperty("user.home")
+	
+	def absolute(file: File) = new File(file.toURI.normalize).getAbsoluteFile
+	/** Constructs a String representation of <code>Path</code>s.  The absolute path String of each <code>Path</code> is
+	* separated by the platform's path separator.*/
+	def makeString(paths: Iterable[Path]): String = paths.map(_.absolutePath).mkString(pathSeparator)
+	
+	/** Constructs a String representation of <code>Path</code>s.  The relative path String of each <code>Path</code> is
+	* separated by the platform's path separator.*/
+	def makeRelativeString(paths: Iterable[Path]): String = makeRelativeString(paths, sep.toString)
+	def makeRelativeString(paths: Iterable[Path], separator: String): String = paths.map(_.relativePathString(separator)).mkString(pathSeparator)
+	
+	def splitString(projectPath: Path, value: String): Iterable[Path] =
+	{
+		for(pathString <- FileUtilities.pathSplit(value) if pathString.length > 0) yield
+			Path.fromString(projectPath, pathString)
+	}
+	
+	/** A <code>PathFinder</code> that always produces the empty set of <code>Path</code>s.*/
+	def emptyPathFinder =
+		new PathFinder
+		{
+			private[sbt] def addTo(pathSet: Set[Path]) {}
+		}
+	/** A <code>PathFinder</code> that selects the paths provided by the <code>paths</code> argument, which is
+	* reevaluated on each call to the <code>PathFinder</code>'s <code>get</code> method.  */
+	def lazyPathFinder(paths: => Iterable[Path]): PathFinder =
+		new PathFinder
+		{
+			private[sbt] def addTo(pathSet: Set[Path]) = pathSet ++= paths
+		}
+		
+	/** The separator character of the platform.*/
+	val sep = java.io.File.separatorChar
+	
+	/** Checks the string to verify that it is a legal path component.  The string must be non-empty,
+	* not a slash, and not '.' or '..'.*/
+	def checkComponent(c: String): String =
+	{
+		require(c.length > 0, "Path component must not be empty")
+		require(c.indexOf('/') == -1, "Path component '" + c + "' must not have forward slashes in it")
+		require(c.indexOf('\\') == -1, "Path component '" + c + "' must not have backslashes in it")
+		require(c != "..", "Path component cannot be '..'")
+		require(c != ".", "Path component cannot be '.'")
+		c
+	}
+	/** Converts a path string relative to the given base path to a <code>Path</code>. */
+	def fromString(basePath: Path, value: String): Path =
+	{
+		if(value.isEmpty)
+			basePath
+		else
+		{
+			val components = value.split("""[/\\]""")
+			(basePath /: components)( (path, component) => path / component )
+		}
+	}
+	def baseAncestor(path: Path): Option[Path] =
+		path match
+		{
+			case pd: ProjectDirectory => None
+			case fp: FilePath => None
+			case rp: RelativePath => baseAncestor(rp.parentPath)
+			case b: BaseDirectory => Some(b.path)
+		}
+	
+	def relativize(basePath: Path, path: Path): Option[Path] = relativize(basePath, path.asFile)
+	def relativize(basePath: Path, file: File): Option[Path] =
+		basePathString(basePath) flatMap { baseString => relativize(basePath, baseString, file) }
+	def relativize(basePath: Path, basePathString: String, file: File): Option[Path] =
+	{
+		val pathString = file.getAbsolutePath
+		if(pathString.startsWith(basePathString))
+			Some(fromString(basePath, pathString.substring(basePathString.length)))
+		else
+			None
+	}
+	private[sbt] def relativize(baseFile: File, file: File): Option[String] =
+	{
+		val pathString = file.getAbsolutePath
+		baseFileString(baseFile) flatMap
+		{
+			baseString =>
+			{
+				if(pathString.startsWith(baseString))
+					Some(pathString.substring(baseString.length))
+				else
+					None
+			}
+		}
+	}
+	private[sbt] def basePathString(basePath: Path): Option[String] = baseFileString(basePath.asFile)
+	private def baseFileString(baseFile: File): Option[String] =
+	{
+		if(baseFile.isDirectory)
+		{
+			val cp = baseFile.getAbsolutePath
+			assert(cp.length > 0)
+			if(cp.charAt(cp.length - 1) == File.separatorChar)
+				Some(cp)
+			else
+				Some(cp + File.separatorChar)
+		}
+		else
+			None
+	}
+	def fromFile(file: String): Path = fromFile(new File(file))
+	def fromFile(file: File): Path = new FilePath(file)
+}
+
+/** A path finder constructs a set of paths.  The set is evaluated by a call to the <code>get</code>
+* method.  The set will be different for different calls to <code>get</code> if the underlying filesystem
+* has changed.*/
+sealed abstract class PathFinder extends NotNull
+{
+	/** The union of the paths found by this <code>PathFinder</code> with the paths found by 'paths'.*/
+	def +++(paths: PathFinder): PathFinder = new Paths(this, paths)
+	/** Excludes all paths from <code>excludePaths</code> from the paths selected by this <code>PathFinder</code>.*/
+	def ---(excludePaths: PathFinder): PathFinder = new ExcludePaths(this, excludePaths)
+	/** Constructs a new finder that selects all paths with a name that matches <code>filter</code> and are
+	* descendents of paths selected by this finder.*/
+	def **(filter: FileFilter): PathFinder = new DescendentOrSelfPathFinder(this, filter)
+	/** Constructs a new finder that selects all paths with a name that matches <code>filter</code> and are
+	* immediate children of paths selected by this finder.*/
+	def *(filter: FileFilter): PathFinder = new ChildPathFinder(this, filter)
+	/** Constructs a new finder that selects all paths with name <code>literal</code> that are immediate children
+	* of paths selected by this finder.*/
+	def / (literal: String): PathFinder = new ChildPathFinder(this, new ExactFilter(literal))
+	/** Constructs a new finder that selects all paths with name <code>literal</code> that are immediate children
+	* of paths selected by this finder.*/
+	final def \ (literal: String): PathFinder = this / literal
+
+	/** Makes the paths selected by this finder into base directories.
+	* @see Path.##
+	*/
+	def ## : PathFinder = new BasePathFinder(this)
+
+	/** Selects all descendent paths with a name that matches <code>include</code> and do not have an intermediate
+	* path with a name that matches <code>intermediateExclude</code>.  Typical usage is:
+	*
+	* <code>descendentsExcept("*.jar", ".svn")</code>*/
+	def descendentsExcept(include: FileFilter, intermediateExclude: FileFilter): PathFinder =
+		(this ** include) --- (this ** intermediateExclude ** include)
+	
+	/** Evaluates this finder.  The set returned by this method will reflect the underlying filesystem at the
+	* time of calling.  If the filesystem changes, two calls to this method might be different.*/
+	final def get: scala.collection.Set[Path] =
+	{
+		val pathSet = new HashSet[Path]
+		addTo(pathSet)
+		wrap.Wrappers.readOnly(pathSet)
+	}
+	private[sbt] def addTo(pathSet: Set[Path])
+}
+private class BasePathFinder(base: PathFinder) extends PathFinder
+{
+	private[sbt] def addTo(pathSet: Set[Path])
+	{
+		for(path <- base.get)
+			pathSet += (path ##)
+	}
+}
+private abstract class FilterPath extends PathFinder with FileFilter
+{
+	def parent: PathFinder
+	def filter: FileFilter
+	final def accept(file: File) = filter.accept(file)
+	
+	protected def handlePath(path: Path, pathSet: Set[Path])
+	{
+		for(matchedFile <- wrapNull(path.asFile.listFiles(this)))
+			pathSet += path / matchedFile.getName
+	}
+}
+private class DescendentOrSelfPathFinder(val parent: PathFinder, val filter: FileFilter) extends FilterPath
+{
+	private[sbt] def addTo(pathSet: Set[Path])
+	{
+		for(path <- parent.get)
+		{
+			if(accept(path.asFile))
+				pathSet += path
+			handlePathDescendent(path, pathSet)
+		}
+	}
+	private def handlePathDescendent(path: Path, pathSet: Set[Path])
+	{
+		handlePath(path, pathSet)
+		for(childDirectory <- wrapNull(path.asFile.listFiles(DirectoryFilter)))
+			handlePathDescendent(path / childDirectory.getName, pathSet)
+	}
+}
+private class ChildPathFinder(val parent: PathFinder, val filter: FileFilter) extends FilterPath
+{
+	private[sbt] def addTo(pathSet: Set[Path])
+	{
+		for(path <- parent.get)
+			handlePath(path, pathSet)
+	}
+}
+private class Paths(a: PathFinder, b: PathFinder) extends PathFinder
+{
+	private[sbt] def addTo(pathSet: Set[Path])
+	{
+		a.addTo(pathSet)
+		b.addTo(pathSet)
+	}
+}
+private class ExcludePaths(include: PathFinder, exclude: PathFinder) extends PathFinder
+{
+	private[sbt] def addTo(pathSet: Set[Path])
+	{
+		val includeSet = new HashSet[Path]
+		include.addTo(includeSet)
+		
+		val excludeSet = new HashSet[Path]
+		exclude.addTo(excludeSet)
+		
+		includeSet --= excludeSet
+		pathSet ++= includeSet
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
new file mode 100644
index 000000000..702cba554
--- /dev/null
+++ b/src/main/scala/sbt/Process.scala
@@ -0,0 +1,89 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt
+
+import java.lang.{Process => JProcess, ProcessBuilder => JProcessBuilder}
+import java.io.{Closeable, File, IOException}
+import java.io.{BufferedReader, InputStream, InputStreamReader, OutputStream, PipedInputStream, PipedOutputStream}
+import java.net.URL
+
+/** Methods for constructing simple commands that can then be combined. */
+object Process
+{
+	implicit def apply(command: String): ProcessBuilder = apply(command.split("""\s+""")) // TODO: use CommandParser
+	implicit def apply(command: Seq[String]): ProcessBuilder = apply(new JProcessBuilder(command.toArray : _*))
+	def apply(command: String, arguments: Seq[String]): ProcessBuilder = apply(new JProcessBuilder((command :: arguments.toList).toArray : _*))
+	implicit def apply(builder: JProcessBuilder): ProcessBuilder = new SimpleProcessBuilder(builder)
+	implicit def apply(file: File): FilePartialBuilder = new FileBuilder(file)
+	implicit def apply(url: URL): URLPartialBuilder = new URLBuilder(url)
+}
+
+trait URLPartialBuilder extends NotNull
+{
+	def #>(b: ProcessBuilder): ProcessBuilder
+	def #>>(b: File): ProcessBuilder
+	def #>(b: File): ProcessBuilder
+}
+trait FilePartialBuilder extends NotNull
+{
+	def #>(b: ProcessBuilder): ProcessBuilder
+	def #<(b: ProcessBuilder): ProcessBuilder
+	def #<(url: URL): ProcessBuilder
+	def #>>(b: File): ProcessBuilder
+	def #>(b: File): ProcessBuilder
+	def #<(file: File): ProcessBuilder
+	def #<<(file: File): ProcessBuilder
+}
+
+/** Represents a process that is running or has finished running.
+* It may be a compound process with several underlying native processes (such as 'a #&& b`).*/
+trait Process extends NotNull
+{
+	/** Blocks until this process exits and returns the exit code.*/
+	def exitValue(): Int
+	/** Destroys this process. */
+	def destroy(): Unit
+}
+/** Represents a runnable process. */
+trait ProcessBuilder extends NotNull
+{
+	/** Starts the process represented by this builder, blocks until it exits, and returns the exit code.  Standard output and error are
+	* sent to the console.*/
+	def ! : Int
+	/** Starts the process represented by this builder, blocks until it exits, and returns the exit code.  Standard output and error are
+	* sent to the given Logger.*/
+	def !(log: Logger): Int
+	/** Starts the process represented by this builder.  Standard output and error are sent to the console.*/
+	def run(): Process
+	/** Starts the process represented by this builder.  Standard output and error are sent to the given Logger.*/
+	def run(log: Logger): Process
+	/** Starts the process represented by this builder.  I/O is handled by the given ProcessIO instance.*/
+	def run(io: ProcessIO): Process
+
+	/** Constructs a command that runs this command first and then `other` if this command succeeds.*/
+	def #&& (other: ProcessBuilder): ProcessBuilder
+	/** Constructs a command that runs this command first and then `other` if this command does not succeed.*/
+	def #|| (other: ProcessBuilder): ProcessBuilder
+	/** Constructs a command that will run this command and pipes the output to `other`.  `other` must be a simple command.*/
+	def #| (other: ProcessBuilder): ProcessBuilder
+	/** Constructs a command that will run this command and then `other`.  The exit code will be the exit code of `other`.*/
+	def ## (other: ProcessBuilder): ProcessBuilder
+	/** Reads the given file into the input stream of this process. */
+	def #< (f: File): ProcessBuilder
+	/** Reads the given URL into the input stream of this process. */
+	def #< (f: URL): ProcessBuilder
+	/** Writes the output stream of this process to the given file. */
+	def #> (f: File): ProcessBuilder
+	/** Appends the output stream of this process to the given file. */
+	def #>> (f: File): ProcessBuilder
+
+	def canPipeTo: Boolean
+}
+/** Each method will be called in a separate thread.*/
+final class ProcessIO(val writeInput: OutputStream => Unit, val processOutput: InputStream => Unit, val processError: InputStream => Unit) extends NotNull
+{
+	def withOutput(process: InputStream => Unit): ProcessIO = new ProcessIO(writeInput, process, processError)
+	def withError(process: InputStream => Unit): ProcessIO = new ProcessIO(writeInput, processOutput, process)
+	def withInput(write: OutputStream => Unit): ProcessIO = new ProcessIO(write, processOutput, processError)
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
new file mode 100644
index 000000000..8eaf126ee
--- /dev/null
+++ b/src/main/scala/sbt/Project.scala
@@ -0,0 +1,462 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah, David MacIver
+ */
+package sbt
+
+import java.io.File
+import scala.collection._
+import FileUtilities._
+import Project._
+
+trait Project extends TaskManager with Dag[Project] with BasicEnvironment
+{
+	/** The logger for this project definition. */
+	final val log: Logger = logImpl
+	protected def logImpl: Logger = new BufferedLogger(new ConsoleLogger)
+	
+	trait ActionOption extends NotNull
+	
+	/** Basic project information. */
+	def info: ProjectInfo
+	/** The project name. */
+	final def name: String = projectName.value
+	/** The project version. */
+	final def version: Version = projectVersion.value
+	/** The project organization. */
+	final def organization: String = projectOrganization.value
+	/** True if the project should cater to a quick throwaway project setup.*/
+	def scratch = projectScratch.value
+	
+	final type ManagerType = Project
+	final type ManagedTask = Project#Task
+	/** The tasks declared on this project. */
+	def tasks: Map[String, Task]
+	/** The task methods declared on this project */
+	def methods: Map[String, MethodTask]
+	/** The names of all available tasks that may be called through `act`.  These include
+	* the names of the Tasks in `tasks` and those of all dependencies.*/
+	def taskNames: Iterable[String] = deepTasks.keys.toList
+	/** The names of all available method tasks that may be called through `call`.  These
+	* only include the names of the MethodTasks in `methods` and not those of dependencies.*/
+	def methodNames: Iterable[String] = methods.keys.toList
+	/** A description of all available method tasks in this project, but not of dependencies. */
+	def methodList: String = descriptionList(methods)
+	/** A description of all available tasks in this project and all dependencies.  If there
+	* are different tasks with the same name, only one will be included. */
+	def taskList: String = descriptionList(deepTasks)
+	
+	final def taskName(task: Task) = tasks.find( _._2 eq task ).map(_._1).getOrElse(UnnamedName)
+	/** A description of all available tasks in this project and all dependencies and all
+	* available method tasks in this project, but not of dependencies.  If there
+	* are different tasks or methods with the same name, only one will be included. */
+	def taskAndMethodList: String = descriptionList(tasksAndMethods)
+	/** The actions and methods declared on this project. */
+	final def tasksAndMethods: Map[String, Described] =
+		immutable.TreeMap.empty[String, Described] ++ methods ++ tasks
+	private def descriptionList(described: Map[String, Described]): String =
+	{
+		val buffer = new StringBuilder
+		for((name, d) <- described)
+			buffer.append("\t" + name + d.description.map(x => ": " + x).getOrElse("") + "\n")
+		buffer.toString
+	}
+	/** Combines the method task maps of this project and all dependencies.*/
+	private[sbt] def deepMethods: Map[String, Project#MethodTask] = deep(_.methods)
+	/** Combines the task maps of this project and all dependencies.*/
+	private[sbt] def deepTasks: Map[String, Project#Task] = deep(_.tasks)
+	private def deep[T](p: Project => Map[String, T]): Map[String, T] =
+	{
+		var tasks: immutable.SortedMap[String,T] = new immutable.TreeMap[String, T]
+		for(dependentProject <- topologicalSort)
+			tasks ++= p(dependentProject).elements
+		tasks
+	}
+	/** A map of names to projects for all subprojects of this project.  These are typically explicitly
+	* specified for the project and are different from those specified in the project constructor. The
+	* main use within sbt is in ParentProject.*/
+	def subProjects: Map[String, Project] = immutable.Map.empty
+	/** The name of this project and the names of all subprojects/dependencies, transitively.*/
+	def projectNames: Iterable[String] =
+	{
+		val names = new mutable.HashSet[String]
+		names ++= subProjects.keys
+		for(dependentProject <- topologicalSort)
+			names ++= dependentProject.tasks.keys
+		names.toList
+	}
+	
+	def call(name: String, parameters: Array[String]): Option[String] =
+	{
+		methods.get(name) match
+		{
+			case Some(method) =>run(method(parameters), name)
+			case None => Some("Method '" + name + "' does not exist.")
+		}
+	}
+	private def run(task: Project#Task, taskName: String): Option[String] =
+		impl.RunTask(task, taskName, parallelExecution) match
+		{
+			case Nil => None
+			case x => Some(Set(x: _*).mkString("\n"))
+		}
+		
+	/** Executes the task with the given name.  This involves executing the task for all
+	* project dependencies (transitive) and then for this project.  Not every dependency
+	* must define a task with the given name.  If this project and all dependencies
+	* do not define a task with the given name, an error is generated indicating this.*/
+	def act(name: String): Option[String] =
+	{
+		val ordered = topologicalSort
+		val definedTasks = ordered.flatMap(_.tasks.get(name).toList)
+		def virtualTask(name: String): Task = new Task(None, definedTasks.filter(!_.interactive), false, None)
+
+		if(definedTasks.isEmpty)
+			Some("Action '" + name + "' does not exist.")
+		else
+		{
+			tasks.get(name) match
+			{
+				case None =>
+					val virtual = virtualTask(name)
+					if(virtual.dependencies.size == definedTasks.size)
+						run(virtual, name)
+					else
+					{
+						Some("Cannot run interactive action '" + name +
+							"' defined on multiple subprojects (change to the desired project with 'project <name>').")
+					}
+				case Some(task) => run(task, name)
+			}
+		}
+	}
+	
+	/** Logs the list of projects at the debug level.*/
+	private def showBuildOrder(order: Iterable[Project])
+	{
+		log.debug("Project build order:")
+		order.foreach(x => log.debug("    " + x.name) )
+		log.debug("")
+	}
+	
+	/** Converts a String to a path relative to the project directory of this project. */
+	implicit def path(component: String): Path = info.projectPath / component
+	/** Converts a String to a simple name filter.  * has the special meaning: zero or more of any character */
+	implicit def filter(simplePattern: String): NameFilter = GlobFilter(simplePattern)
+	
+	/** Loads the project at the given path and declares the project to have the given
+	* dependencies.  This method will configure the project according to the
+	* project/ directory in the directory denoted by path.*/
+	def project(path: Path, deps: Project*): Project = getProject(Project.loadProject(path, deps, Some(this), log), path)
+	
+	/** Loads the project at the given path using the given name and inheriting this project's version.
+	* The builder class is the default builder class, sbt.DefaultProject. The loaded project is declared
+	* to have the given dependencies. Any project/build/ directory for the project is ignored.*/
+	def project(path: Path, name: String, deps: Project*): Project = project(path, name, Project.DefaultBuilderClass, deps: _*)
+	
+	/** Loads the project at the given path using the given name and inheriting it's version from this project.
+	* The Project implementation used is given by builderClass.  The dependencies are declared to be
+	* deps. Any project/build/ directory for the project is ignored.*/
+	def project[P <: Project](path: Path, name: String, builderClass: Class[P], deps: Project*): P =
+	{
+		require(builderClass != this.getClass, "Cannot recursively construct projects of same type: " + builderClass.getName)
+		project(path, name, info => Project.constructProject(info, builderClass), deps: _*)
+	}
+	/** Loads the project at the given path using the given name and inheriting it's version from this project.
+	* The construct function is used to obtain the Project instance. Any project/build/ directory for the project
+	* is ignored.  The project is declared to have the dependencies given by deps.*/
+	def project[P <: Project](path: Path, name: String, construct: ProjectInfo => P, deps: Project*): P =
+		initialize(construct(ProjectInfo(path.asFile, deps, Some(this))), Some(new SetupInfo(name, None, None, false)), log)
+	
+	/** Initializes the project directories when a user has requested that sbt create a new project.*/
+	def initializeDirectories() {}
+	/** True if projects should be run in parallel, false if they should run sequentially.
+	*  This only has an effect for multi-projects.  If this project has a parent, this value is
+	* inherited from that parent project.*/
+	def parallelExecution: Boolean =
+		info.parent match
+		{
+			case Some(parent) => parent.parallelExecution
+			case None => false
+		}
+	
+	/** True if a project and its dependencies should be checked to ensure that their
+	* output directories are not the same, false if they should not be checked. */
+	def shouldCheckOutputDirectories = true
+	
+	/** The list of directories to which this project writes.  This is used to verify that multiple
+	* projects have not been defined with the same output directories. */
+	def outputDirectories: Iterable[Path] = outputRootPath :: Nil
+	def rootProject = Project.rootProject(this)
+	/** The path to the file that provides persistence for properties.*/
+	final def envBackingPath = info.builderPath / Project.DefaultEnvBackingName
+	/** The path to the file that provides persistence for history. */
+	def historyPath: Option[Path] = Some(outputRootPath / ".history")
+	def outputPath = crossPath(outputRootPath)
+	def outputRootPath = outputDirectoryName
+	def outputDirectoryName = DefaultOutputDirectoryName
+	
+	private def getProject(result: LoadResult, path: Path): Project =
+		result match
+		{
+			case LoadSetupDeclined => Predef.error("No project exists at path " + path)
+			case lse: LoadSetupError => Predef.error("Error setting up new project at path " + Path + " : " + lse.message)
+			case err: LoadError => Predef.error("Error loading project at path " + path + " : " + err.message)
+			case success: LoadSuccess => success.project
+		}
+	
+	/** The property for the project's version. */
+	final val projectVersion = property[Version]
+	/** The property for the project's name. */
+	final val projectName = propertyLocalF[String](NonEmptyStringFormat)
+	/** The property for the project's organization.  Defaults to the parent project's organization or the project name if there is no parent. */
+	final val projectOrganization = propertyOptional[String](normalizedName, true)
+	/** The property that defines the version of Scala to build this project with by default.  This property is only
+	* ready by `sbt` on startup and reboot.  When cross-building, this value may be different from the actual
+	* version of Scala being used to build the project.  ScalaVersion.current and ScalaVersion.cross should be used
+	* to read the version of Scala building the project.  This should only be used to change the version of Scala used
+	* for normal development (not cross-building)*/
+	final val scalaVersion = propertyOptional[String]("")
+	final val sbtVersion = propertyOptional[String]("")
+	final val projectInitialize = propertyOptional[Boolean](false)
+	final val projectScratch = propertyOptional[Boolean](false)
+
+	/** If this project is cross-building, returns `base` with an additional path component containing the scala version.
+	* Otherwise, this returns `base`.
+	* By default, cross-building is enabled when a project is loaded by the loader and crossScalaVersions is not empty.*/
+	def crossPath(base: Path) = ScalaVersion.withCross(disableCrossPaths)(base / ScalaVersion.crossString(_), base)
+	/** If modifying paths for cross-building is enabled, this returns ScalaVersion.currentString.
+	* Otherwise, this returns the empty string. */
+	def crossScalaVersionString: String = if(disableCrossPaths) "" else ScalaVersion.currentString
+	
+	/** True if crossPath should be the identity function.*/
+	protected def disableCrossPaths = crossScalaVersions.isEmpty
+	/** By default, this is empty and cross-building is disabled.  Overriding this to a Set of Scala versions
+	* will enable cross-building against those versions.*/
+	def crossScalaVersions = scala.collection.immutable.Set.empty[String]
+	/** A `PathFinder` that determines the files watched when an action is run with a preceeding ~ when this is the current
+	* project.  This project does not need to include the watched paths for projects that this project depends on.*/
+	def watchPaths: PathFinder = Path.emptyPathFinder
+	
+	protected final override def parentEnvironment = info.parent
+	
+	// .* included because svn doesn't mark .svn hidden
+	def defaultExcludes: FileFilter = (".*"  - ".") || HiddenFileFilter
+	/** Short for parent.descendentsExcept(include, defaultExcludes)*/
+	def descendents(parent: PathFinder, include: FileFilter) = parent.descendentsExcept(include, defaultExcludes)
+	override def toString = "Project " + projectName.get.getOrElse("at " + environmentLabel)
+	
+	def normalizedName = StringUtilities.normalize(name)
+}
+private[sbt] sealed trait LoadResult extends NotNull
+private[sbt] final class LoadSuccess(val project: Project) extends LoadResult
+private[sbt] final class LoadError(val message: String) extends LoadResult
+private[sbt] final object LoadSetupDeclined extends LoadResult
+private[sbt] final class LoadSetupError(val message: String) extends LoadResult
+
+object Project
+{
+	val UnnamedName = "<anonymous>"
+	val BootDirectoryName = "boot"
+	val DefaultOutputDirectoryName = "target"
+	val DefaultEnvBackingName = "build.properties"
+	val DefaultBuilderClassName = "sbt.DefaultProject"
+	val DefaultBuilderClass = Class.forName(DefaultBuilderClassName).asSubclass(classOf[Project])
+	
+	/** The name of the directory for project definitions.*/
+	val BuilderProjectDirectoryName = "build"
+	/** The name of the directory for plugin definitions.*/
+	val PluginProjectDirectoryName = "plugins"
+	/** The name of the class that all projects must inherit from.*/
+	val ProjectClassName = classOf[Project].getName
+	
+	/** The logger that should be used before the root project definition is loaded.*/
+	private[sbt] def bootLogger =
+	{
+		val log = new ConsoleLogger
+		log.setLevel(Level.Debug)
+		log.enableTrace(true)
+		log
+	}
+
+	private[sbt] def booted = java.lang.Boolean.getBoolean("sbt.boot")
+	
+	/** Loads the project in the current working directory.*/
+	private[sbt] def loadProject: LoadResult = loadProject(bootLogger)
+	/** Loads the project in the current working directory.*/
+	private[sbt] def loadProject(log: Logger): LoadResult = checkOutputDirectories(loadProject(new File("."), Nil, None, log))
+	/** Loads the project in the directory given by 'path' and with the given dependencies.*/
+	private[sbt] def loadProject(path: Path, deps: Iterable[Project], parent: Option[Project], log: Logger): LoadResult =
+		loadProject(path.asFile, deps, parent, log)
+	/** Loads the project in the directory given by 'projectDirectory' and with the given dependencies.*/
+	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], log: Logger): LoadResult =
+	{
+		val info = ProjectInfo(projectDirectory, deps, parent)
+		ProjectInfo.setup(info, log) match
+		{
+			case err: SetupError => new LoadSetupError(err.message)
+			case SetupDeclined => LoadSetupDeclined
+			case AlreadySetup => loadProject(info, None, log)
+			case setup: SetupInfo => loadProject(info, Some(setup), log)
+		}
+	}
+	private def loadProject(info: ProjectInfo, setupInfo: Option[SetupInfo], log: Logger): LoadResult =
+	{
+		try
+		{
+			val oldLevel = log.getLevel
+			log.setLevel(Level.Warn)
+			val result =
+				for(builderClass <- getProjectDefinition(info, log).right) yield
+					initialize(constructProject(info, builderClass), setupInfo, log)
+			log.setLevel(oldLevel)
+			result.fold(new LoadError(_), new LoadSuccess(_))
+		}
+		catch
+		{
+			case ite: java.lang.reflect.InvocationTargetException =>
+			{
+				val cause =
+					if(ite.getCause == null) ite
+					else ite.getCause
+				errorLoadingProject(cause, log)
+			}
+			case nme: NoSuchMethodException => new LoadError("Constructor with one argument of type sbt.ProjectInfo required for project definition.")
+			case e: Exception => errorLoadingProject(e, log)
+		}
+	}
+	/** Logs the stack trace and returns an error message in Left.*/
+	private def errorLoadingProject(e: Throwable, log: Logger) =
+	{
+		log.trace(e)
+		new LoadError("Error loading project: " + e.toString)
+	}
+	/** Loads the project for the given `info` and represented by an instance of 'builderClass'.*/
+	private[sbt] def constructProject[P <: Project](info: ProjectInfo, builderClass: Class[P]): P =
+		builderClass.getConstructor(classOf[ProjectInfo]).newInstance(info)
+	/** Checks the project's dependencies, initializes its environment, and possibly its directories.*/
+	private def initialize[P <: Project](p: P, setupInfo: Option[SetupInfo], log: Logger): P =
+	{
+		setupInfo match
+		{
+			case Some(setup) =>
+			{
+				p.projectName() = setup.name
+				for(v <- setup.version)
+					p.projectVersion() = v
+				for(org <- setup.organization)
+					p.projectOrganization() = org
+				if(!setup.initializeDirectories)
+					p.setEnvironmentModified(false)
+				for(errorMessage <- p.saveEnvironment())
+					log.error(errorMessage)
+				if(setup.initializeDirectories)
+					p.initializeDirectories()
+			}
+			case None =>
+				if(p.projectInitialize.value)
+				{
+					p.initializeDirectories()
+					p.projectInitialize() = false
+					for(errorMessage <- p.saveEnvironment())
+						log.error(errorMessage)
+				}
+		}
+		val useName = p.projectName.get.getOrElse("at " + p.info.projectDirectory.getAbsolutePath)
+		checkDependencies(useName, p.info.dependencies, log)
+		p
+	}
+	/** Compiles the project definition classes and returns the project definition class name
+	* and the class loader that should be used to load the definition. */
+	private def getProjectDefinition(info: ProjectInfo, buildLog: Logger): Either[String, Class[P] forSome { type P <: Project }] =
+	{
+		val builderProjectPath = info.builderPath / BuilderProjectDirectoryName
+		if(builderProjectPath.asFile.isDirectory)
+		{
+			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
+			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None), pluginProjectPath, buildLog)
+			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
+				builderProject.projectDefinition.right.map {
+					case Some(definition) => getProjectClass[Project](definition, builderProject.projectClasspath)
+					case None => DefaultBuilderClass
+				}
+			}
+		}
+		else
+			Right(DefaultBuilderClass)
+	}
+	/** Verifies that the given list of project dependencies contains no nulls.  The
+	* String argument should be the project name with the dependencies.*/
+	private def checkDependencies(forProject: String, deps: Iterable[Project], log: Logger)
+	{
+		for(nullDep <- deps.find(_ == null))
+		{
+			log.error("Project " + forProject + " had a null dependency.  This is probably an initialization problem and might be due to a circular dependency.")
+			throw new RuntimeException("Null dependency in project " + forProject)
+		}
+	}
+	/** Verifies that output directories of the given project and all of its dependencies are
+	* all different.  No verification is done if the project overrides
+	* 'shouldCheckOutputDirectories' to be false. The 'Project.outputDirectories' method is
+	* used to determine a project's output directories. */
+	private def checkOutputDirectories(result: LoadResult): LoadResult =
+		result match
+		{
+			case success: LoadSuccess =>
+				if(success.project.shouldCheckOutputDirectories)
+					checkOutputDirectoriesImpl(success.project)
+				else
+					success
+			case x => x
+		}
+	/** Verifies that output directories of the given project and all of its dependencies are
+	* all different.  The 'Project.outputDirectories' method is used to determine a project's
+	* output directories. */
+	private def checkOutputDirectoriesImpl(project: Project): LoadResult =
+	{
+		val projects = project.topologicalSort
+		import scala.collection.mutable.{HashMap, HashSet, Set}
+		val outputDirectories = new HashMap[Path, Set[Project]]
+		for(p <- projects; path <- p.outputDirectories)
+			outputDirectories.getOrElseUpdate(path, new HashSet[Project]) += p
+		val shared = outputDirectories.filter(_._2.size > 1)
+		if(shared.isEmpty)
+			new LoadSuccess(project)
+		else
+		{
+			val sharedString =
+			{
+				val s =
+					for((path, projectsSharingPath) <- shared) yield
+						projectsSharingPath.map(_.name).mkString(", ") + " share " + path
+				s.mkString("\n\t")
+			}
+			new LoadError("The same directory is used for output for multiple projects:\n\t" + sharedString +
+			"\n  (If this is intentional, use 'override def shouldCheckOutputDirectories = false' in your project definition.)")
+		}
+	}
+	import scala.reflect.Manifest
+	private[sbt] def getProjectClass[P <: Project](name: String, classpath: PathFinder)(implicit mf: Manifest[P]): Class[P] =
+	{
+		val loader =ClasspathUtilities.toLoader(classpath)
+		val builderClass = Class.forName(name, false, loader)
+		val projectClass = mf.erasure
+		require(projectClass.isAssignableFrom(builderClass), "Builder class '" + builderClass + "' does not extend " + projectClass.getName + ".")
+		builderClass.asSubclass(projectClass).asInstanceOf[Class[P]]
+	}
+	
+	/** Writes the project name and a separator to the project's log at the info level.*/
+	def showProjectHeader(project: Project)
+	{
+		val projectHeader = "Project " + project.name
+		project.log.info("")
+		project.log.info(projectHeader)
+		project.log.info("=" * projectHeader.length)
+	}
+	
+	def rootProject(p: Project): Project =
+		p.info.parent match
+		{
+			case Some(parent) => rootProject(parent)
+			case None => p
+		}
+}
diff --git a/src/main/scala/sbt/ProjectInfo.scala b/src/main/scala/sbt/ProjectInfo.scala
new file mode 100644
index 000000000..80002cb1b
--- /dev/null
+++ b/src/main/scala/sbt/ProjectInfo.scala
@@ -0,0 +1,107 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import FileUtilities._
+
+final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Project], parent: Option[Project]) extends NotNull
+{
+	val projectPath = new ProjectDirectory(projectDirectory)
+	val builderPath = projectPath / ProjectInfo.MetadataDirectoryName
+	def bootPath = builderPath / Project.BootDirectoryName
+	def builderProjectPath = builderPath / Project.BuilderProjectDirectoryName
+	def builderProjectOutputPath = builderProjectPath / Project.DefaultOutputDirectoryName
+	def pluginsPath = builderPath / Project.PluginProjectDirectoryName
+	def pluginsOutputPath = pluginsPath / Project.DefaultOutputDirectoryName
+	def pluginsManagedSourcePath = pluginsPath / BasicDependencyPaths.DefaultManagedSourceDirectoryName
+	def pluginsManagedDependencyPath = pluginsPath / BasicDependencyPaths.DefaultManagedDirectoryName
+}
+
+private[sbt] sealed trait SetupResult extends NotNull
+private[sbt] final object SetupDeclined extends SetupResult
+private[sbt] final class SetupError(val message: String) extends SetupResult
+private[sbt] final object AlreadySetup extends SetupResult
+private[sbt] final class SetupInfo(val name: String, val version: Option[Version], val organization: Option[String], val initializeDirectories: Boolean) extends SetupResult
+
+object ProjectInfo
+{
+	val MetadataDirectoryName = "project"
+	private val DefaultOrganization = "empty"
+	
+	def setup(info: ProjectInfo, log: Logger): SetupResult =
+	{
+		val builderDirectory = info.builderPath.asFile
+		if(builderDirectory.exists)
+		{
+			if(builderDirectory.isDirectory)
+				AlreadySetup
+			else
+				new SetupError("'" + builderDirectory.getAbsolutePath + "' is not a directory.")
+		}
+		else
+			setupProject(info.projectDirectory, log)
+	}
+	private def setupProject(projectDirectory: File, log: Logger): SetupResult =
+	{
+		if(confirmPrompt("No project found. Create new project?", false))
+		{
+			val name = trim(SimpleReader.readLine("Project Name: "))
+			if(name.isEmpty)
+				new SetupError("Project not created: no name specified.")
+			else
+			{
+				val organization =
+				{
+					val org = trim(SimpleReader.readLine("Organization [" + DefaultOrganization + "]: "))
+					if(org.isEmpty)
+						DefaultOrganization
+					else
+						org
+				}
+				readVersion(projectDirectory, log) match
+				{
+					case None => new SetupError("Project not created: no version specified.")
+					case Some(version) =>
+						if(verifyCreateProject(name, version, organization))
+							new SetupInfo(name, Some(version), Some(organization), true)
+						else
+							SetupDeclined
+				}
+			}
+		}
+		else
+			SetupDeclined
+	}
+	private def verifyCreateProject(name: String, version: Version, organization: String): Boolean =
+		confirmPrompt("Create new project " + name + " " + version + " with organization " + organization +" ?", true)
+	
+	private def confirmPrompt(question: String, defaultYes: Boolean) =
+	{
+		val choices = if(defaultYes) " (Y/n) " else " (y/N) "
+		val answer = trim(SimpleReader.readLine(question + choices))
+		val yes = "y" :: "yes" :: (if(defaultYes) List("") else Nil)
+		yes.contains(answer.toLowerCase)
+	}
+	
+	private def readVersion(projectDirectory: File, log: Logger): Option[Version] =
+	{
+		val version = trim(SimpleReader.readLine("Version: "))
+		if(version.isEmpty)
+			None
+		else
+		{
+			Version.fromString(version) match
+			{
+				case Left(errorMessage) =>
+				{
+					log.error("Invalid version: " + errorMessage)
+					readVersion(projectDirectory, log)
+				}
+				case Right(v) => Some(v)
+			}
+		}
+	}
+	private def trim(s: Option[String]) = s.getOrElse("")
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ProjectPaths.scala b/src/main/scala/sbt/ProjectPaths.scala
new file mode 100644
index 000000000..c29dc41fa
--- /dev/null
+++ b/src/main/scala/sbt/ProjectPaths.scala
@@ -0,0 +1,300 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+trait PackagePaths extends NotNull
+{
+	def jarPath: Path
+	def packageTestJar: Path
+	def packageDocsJar: Path
+	def packageSrcJar: Path
+	def packageTestSrcJar: Path
+	def packageProjectZip: Path
+}
+/** These are the paths required by BasicScalaProject.*/
+trait ScalaPaths extends PackagePaths
+{
+	/** A PathFinder that selects all main sources.*/
+	def mainSources: PathFinder
+	/** A PathFinder that selects all test sources.*/
+	def testSources: PathFinder
+	/** A PathFinder that selects all main resources.*/
+	def mainResources: PathFinder
+	/** A PathFinder that selects all test resources. */
+	def testResources: PathFinder
+	
+	def mainResourceClasspath: PathFinder
+	def testResourceClasspath: PathFinder
+	
+	def mainCompilePath: Path
+	def testCompilePath: Path
+	def mainAnalysisPath: Path
+	def testAnalysisPath: Path
+	def mainDocPath: Path
+	def testDocPath: Path
+	def graphPath: Path
+
+	/** A PathFinder that selects all the classes compiled from the main sources.*/
+	def mainClasses: PathFinder
+	/** A PathFinder that selects all the classes compiled from the test sources.*/
+	def testClasses: PathFinder
+	
+	/** Declares all paths to be packaged by the package action.*/
+	def packagePaths: PathFinder
+	/** Declares all paths to be packaged by the package-test action.*/
+	def packageTestPaths: PathFinder
+	/** Declares all sources to be packaged by the package-src action.*/
+	def packageSourcePaths: PathFinder
+	/** Declares all sources to be packaged by the package-test-src action.*/
+	def packageTestSourcePaths: PathFinder
+	/** Declares all paths to be packaged by the package-project action.*/
+	def packageProjectPaths: PathFinder
+	
+	/** These are the directories that are created when a user makes a new project from sbt.*/
+	protected def directoriesToCreate: List[Path]
+	/** The directories to which a project writes are listed here and is used
+	* to check a project and its dependencies for collisions.*/
+	def outputDirectories: Iterable[Path]
+	
+	def artifactBaseName: String
+}
+
+trait BasicScalaPaths extends Project with ScalaPaths
+{
+	def mainSourceRoots: PathFinder
+	def testSourceRoots: PathFinder
+	def mainResourcesPath: PathFinder
+	def testResourcesPath: PathFinder
+	def managedDependencyRootPath: Path
+	def dependencyPath: Path
+
+	protected def sources(base: PathFinder) = descendents(base, sourceExtensions)	
+	protected def sourceExtensions = "*.scala" | "*.java"
+	
+	def mainSources =
+	{
+		val normal = sources(mainSourceRoots)
+		if(scratch)
+			normal +++ (info.projectPath * sourceExtensions)
+		else
+			normal
+	}
+	def testSources = sources(testSourceRoots)
+	
+	def mainResourceClasspath = mainResourcesPath
+	def testResourceClasspath = testResourcesPath
+	def mainResources = descendents(mainResourcesPath ##, "*")
+	def testResources = descendents(testResourcesPath ##, "*")
+	
+	def mainClasses = (mainCompilePath ##) ** "*.class"
+	def testClasses = (testCompilePath ##) ** "*.class"
+	
+	def packagePaths = mainClasses +++ mainResources
+	def packageTestPaths = testClasses +++ testResources
+	def packageSourcePaths = mainSources +++ mainResources
+	def packageTestSourcePaths = testSources +++ testResources
+	def packageProjectPaths = descendents( (info.projectPath ##), "*") --- (packageProjectExcludes ** "*")
+	protected def packageProjectExcludes: PathFinder =
+		outputRootPath +++ managedDependencyRootPath +++
+		info.bootPath +++ info.builderProjectOutputPath +++
+		info.pluginsOutputPath +++ info.pluginsManagedSourcePath +++ info.pluginsManagedDependencyPath
+
+	override def outputDirectories = outputRootPath :: managedDependencyRootPath :: Nil
+}
+
+@deprecated trait BasicProjectPaths extends MavenStyleScalaPaths
+trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
+{
+	import BasicProjectPaths._
+	
+	def outputPath: Path
+	
+	def sourceDirectoryName = DefaultSourceDirectoryName
+	def mainDirectoryName = DefaultMainDirectoryName
+	def scalaDirectoryName = DefaultScalaDirectoryName
+	def javaDirectoryName = DefaultJavaDirectoryName
+	def resourcesDirectoryName = DefaultResourcesDirectoryName
+	def testDirectoryName = DefaultTestDirectoryName
+	def mainCompileDirectoryName = DefaultMainCompileDirectoryName
+	def testCompileDirectoryName = DefaultTestCompileDirectoryName
+	def docDirectoryName = DefaultDocDirectoryName
+	def apiDirectoryName = DefaultAPIDirectoryName
+	def graphDirectoryName = DefaultGraphDirectoryName
+	def mainAnalysisDirectoryName = DefaultMainAnalysisDirectoryName
+	def testAnalysisDirectoryName = DefaultTestAnalysisDirectoryName
+	
+	def sourcePath = path(sourceDirectoryName)
+	
+	def mainSourcePath = sourcePath / mainDirectoryName
+	def mainScalaSourcePath = mainSourcePath / scalaDirectoryName
+	def mainJavaSourcePath = mainSourcePath / javaDirectoryName
+	def mainResourcesPath = mainSourcePath / resourcesDirectoryName
+	def mainDocPath = docPath / mainDirectoryName / apiDirectoryName
+	def mainCompilePath = outputPath / mainCompileDirectoryName
+	def mainAnalysisPath = outputPath / mainAnalysisDirectoryName
+	
+	def testSourcePath = sourcePath / testDirectoryName
+	def testJavaSourcePath = testSourcePath / javaDirectoryName
+	def testScalaSourcePath = testSourcePath / scalaDirectoryName
+	def testResourcesPath = testSourcePath / resourcesDirectoryName
+	def testDocPath = docPath / testDirectoryName / apiDirectoryName
+	def testCompilePath = outputPath / testCompileDirectoryName
+	def testAnalysisPath = outputPath / testAnalysisDirectoryName
+	
+	def docPath = outputPath / docDirectoryName
+	def graphPath = outputPath / graphDirectoryName
+		
+	/** These are the directories that are created when a user makes a new project from sbt.*/
+	protected def directoriesToCreate: List[Path] =
+		dependencyPath ::
+		mainScalaSourcePath ::
+		mainResourcesPath ::
+		testScalaSourcePath ::
+		testResourcesPath ::
+		Nil
+		
+	def mainSourceRoots = mainJavaSourcePath +++ mainScalaSourcePath
+	def testSourceRoots = testJavaSourcePath +++ testScalaSourcePath
+}
+
+trait BasicPackagePaths extends ScalaPaths with PackagePaths
+{
+	def outputPath: Path
+	
+	def defaultJarBaseName: String = artifactBaseName
+	def defaultJarName = defaultJarBaseName + ".jar"
+	def jarPath = outputPath / defaultJarName
+	def packageTestJar = defaultJarPath("-test.jar")
+	def packageDocsJar = defaultJarPath("-docs.jar")
+	def packageSrcJar= defaultJarPath("-src.jar")
+	def packageTestSrcJar = defaultJarPath("-test-src.jar")
+	def packageProjectZip = defaultJarPath("-project.zip")
+	def defaultJarPath(extension: String) = outputPath / (artifactBaseName + extension)
+}
+
+object BasicProjectPaths
+{
+	val DefaultSourceDirectoryName = "src"
+	val DefaultMainCompileDirectoryName = "classes"
+	val DefaultTestCompileDirectoryName = "test-classes"
+	val DefaultDocDirectoryName = "doc"
+	val DefaultAPIDirectoryName = "api"
+	val DefaultGraphDirectoryName = "graph"
+	val DefaultMainAnalysisDirectoryName = "analysis"
+	val DefaultTestAnalysisDirectoryName = "test-analysis"
+	
+	val DefaultMainDirectoryName = "main"
+	val DefaultScalaDirectoryName = "scala"
+	val DefaultJavaDirectoryName = "java"
+	val DefaultResourcesDirectoryName = "resources"
+	val DefaultTestDirectoryName = "test"
+	
+	// forwarders to new locations
+	def BootDirectoryName = Project.BootDirectoryName
+	def DefaultManagedDirectoryName = BasicDependencyPaths.DefaultManagedDirectoryName
+	def DefaultDependencyDirectoryName = BasicDependencyPaths.DefaultDependencyDirectoryName
+}
+
+trait WebScalaPaths extends ScalaPaths
+{
+	def temporaryWarPath: Path
+	def webappResources: PathFinder
+	def jettyContextPath: String
+	def warPath: Path
+}
+@deprecated trait WebProjectPaths extends MavenStyleWebScalaPaths
+trait MavenStyleWebScalaPaths extends WebScalaPaths with MavenStyleScalaPaths
+{
+	import WebProjectPaths._
+	def temporaryWarPath = outputPath / webappDirectoryName
+	def webappPath = mainSourcePath / webappDirectoryName
+	def webappDirectoryName = DefaultWebappDirectoryName
+	def jettyContextPath = DefaultJettyContextPath
+	def defaultWarName = defaultJarBaseName + ".war"
+	def warPath = outputPath / defaultWarName
+	/** Additional files to include in the web application. */
+	protected def extraWebappFiles: PathFinder = Path.emptyPathFinder
+	def webappResources = descendents(webappPath ##, "*") +++ extraWebappFiles
+}
+object WebProjectPaths
+{
+	val DefaultWebappDirectoryName = "webapp"
+	val DefaultJettyContextPath = "/"
+}
+
+/** Defines default paths for a webstart project.  It directly extends WebstartOptions to make
+* it easy to implement and override webstart options in the common case of one webstartTask per
+* project.*/
+trait WebstartPaths extends ScalaPaths
+{
+	import WebstartPaths._
+	
+	def outputPath: Path
+	def jnlpPath: Path
+	
+	def webstartOutputDirectory = outputPath / webstartDirectoryName
+	
+	def jnlpFile = webstartOutputDirectory / jnlpFileName
+	def webstartLibDirectory = webstartOutputDirectory / webstartLibName
+	def webstartZip: Option[Path] = Some(outputPath / webstartZipName)
+	def jnlpResourcesPath = jnlpPath / BasicProjectPaths.DefaultResourcesDirectoryName
+	
+	def webstartLibName = DefaultWebstartLibName
+	def webstartDirectoryName = DefaultWebstartDirectoryName
+	
+	def webstartZipName: String
+	def jnlpFileName: String
+}
+object WebstartPaths
+{
+	val DefaultWebstartDirectoryName = "webstart"
+	val DefaultJnlpName = "jnlp"
+	val DefaultWebstartLibName = "lib"
+}
+trait MavenStyleWebstartPaths extends WebstartPaths with MavenStyleScalaPaths
+{
+	import WebstartPaths._
+	def jnlpPath = mainSourcePath / DefaultJnlpName
+	def webstartMainJar = jarPath
+	def jnlpFileName = DefaultJnlpFileName
+	def webstartZipName = artifactBaseName + ".zip"
+	def DefaultJnlpFileName = artifactBaseName + ".jnlp"
+}
+
+trait IntegrationTestPaths extends NotNull
+{
+	def integrationTestSources: PathFinder
+	def integrationTestResourcesPath: Path
+
+	def integrationTestCompilePath: Path
+	def integrationTestAnalysisPath: Path
+}
+trait BasicIntegrationTestPaths extends IntegrationTestPaths
+{
+	def integrationTestScalaSourcePath: Path
+	def integrationTestSources = sources(integrationTestScalaSourcePath)
+	protected def sources(base: Path): PathFinder
+}
+trait MavenStyleIntegrationTestPaths extends BasicIntegrationTestPaths with MavenStyleScalaPaths
+{
+	import IntegrationTestPaths._
+
+	def integrationTestDirectoryName = DefaultIntegrationTestDirectoryName
+	def integrationTestCompileDirectoryName = DefaultIntegrationTestCompileDirectoryName
+	def integrationTestAnalysisDirectoryName = DefaultIntegrationTestAnalysisDirectoryName
+
+	def integrationTestSourcePath = sourcePath / integrationTestDirectoryName
+	def integrationTestScalaSourcePath = integrationTestSourcePath / scalaDirectoryName
+	def integrationTestResourcesPath = integrationTestSourcePath / resourcesDirectoryName
+
+	def integrationTestCompilePath = outputPath / integrationTestCompileDirectoryName
+	def integrationTestAnalysisPath = outputPath / integrationTestAnalysisDirectoryName
+}
+
+object IntegrationTestPaths
+{
+	val DefaultIntegrationTestDirectoryName = "it"
+	val DefaultIntegrationTestCompileDirectoryName = "it-classes"
+	val DefaultIntegrationTestAnalysisDirectoryName = "it-analysis"
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ReflectUtilities.scala b/src/main/scala/sbt/ReflectUtilities.scala
new file mode 100644
index 000000000..02822190a
--- /dev/null
+++ b/src/main/scala/sbt/ReflectUtilities.scala
@@ -0,0 +1,52 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 David MacIver, Mark Harrah
+ */
+package sbt;
+
+import scala.collection._
+
+object ReflectUtilities
+{
+	def transformCamelCase(name: String, separator: Char) =
+	{
+		val buffer = new StringBuilder
+		for(char <- name)
+		{
+			import java.lang.Character._
+			if(isUpperCase(char))
+			{
+				buffer += separator
+				buffer += toLowerCase(char)
+			}
+			else
+				buffer += char
+		}
+		buffer.toString
+	}
+
+	def ancestry(clazz : Class[_]) : List[Class[_]] = 
+		if (clazz == classOf[AnyRef] || !classOf[AnyRef].isAssignableFrom(clazz)) List(clazz)
+		else clazz :: ancestry(clazz.getSuperclass);
+
+	def fields(clazz : Class[_]) = 
+		mutable.OpenHashMap(ancestry(clazz).
+			flatMap(_.getDeclaredFields).
+			map(f => (f.getName, f)):_*)
+	
+	def allValsC[T](self: AnyRef, clazz: Class[T]): Map[String, T] =
+	{
+		val mappings = new mutable.OpenHashMap[String, T]
+		val correspondingFields = fields(self.getClass)
+		for(method <- self.getClass.getMethods)
+		{
+			if(method.getParameterTypes.length == 0 && clazz.isAssignableFrom(method.getReturnType))
+			{
+				for(field <- correspondingFields.get(method.getName) if field.getType == method.getReturnType)
+					mappings(method.getName) = method.invoke(self).asInstanceOf[T]
+			}
+		}
+		mappings
+	}
+	def allVals[T](self: AnyRef)(implicit mt: scala.reflect.Manifest[T]): Map[String, T] =
+		allValsC(self, mt.erasure).asInstanceOf[Map[String,T]]
+}
diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
new file mode 100644
index 000000000..388e82b3c
--- /dev/null
+++ b/src/main/scala/sbt/Resources.scala
@@ -0,0 +1,149 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import FileUtilities._
+
+object Resources
+{
+	def apply(basePath: String) =
+	{
+		require(basePath.startsWith("/"))
+		val resource = getClass.getResource(basePath)
+		if(resource == null)
+			throw new Exception("Resource base directory '" + basePath + "' not on classpath.")
+		else
+		{
+			val file = new File(resource.toURI)
+			if(file.exists)
+				new Resources(file)
+			else
+				throw new Exception("Resource base directory '" + basePath + "' does not exist.")
+		}
+	}
+	private val LoadErrorPrefix = "Error loading initial project: "
+}
+
+class Resources(val baseDirectory: File)
+{
+	import Resources._
+	// The returned directory is not actually read-only, but it should be treated that way
+	def readOnlyResourceDirectory(group: String, name: String): Either[String, File] =
+	{
+		val groupDirectory = new File(baseDirectory, group)
+		if(groupDirectory.isDirectory)
+		{
+			val resourceDirectory = new File(groupDirectory, name)
+			if(resourceDirectory.isDirectory)
+				Right(resourceDirectory)
+			else
+				Left("Resource directory '" + name + "' in group '" + group + "' not found.")
+		}
+		else
+			Left("Group '" + group + "' not found.")
+	}
+	def readWriteResourceDirectory[T](group: String, name: String, log: Logger)
+		(withDirectory: File => Either[String, T]): Either[String, T] =
+			readOnlyResourceDirectory(group, name).right flatMap(file => readWriteResourceDirectory(file, log)(withDirectory))
+	def readWriteResourceDirectory[T](readOnly: File, log: Logger)
+		(withDirectory: File => Either[String, T]): Either[String, T] =
+	{
+		require(readOnly.isDirectory)
+		def readWrite(readOnly: File)(temporary: File): Either[String, T] =
+		{
+			val readWriteDirectory = new File(temporary, readOnly.getName)
+			FileUtilities.copyDirectory(readOnly, readWriteDirectory, log).toLeft(()).right flatMap { x =>
+				withDirectory(readWriteDirectory)
+			}
+		}
+		doInTemporaryDirectory(log)(readWrite(readOnly))
+	}
+	
+	def withProject[T](projectDirectory: File, log: Logger)(f: Project => WithProjectResult[T]): Either[String, T] =
+		readWriteResourceDirectory(projectDirectory, log)(withProject(log)(f))
+	def withProject[T](group: String, name: String, log: Logger)(f: Project => WithProjectResult[T]): Either[String, T] =
+		readWriteResourceDirectory(group, name, log)(withProject(log)(f))
+	def withProject[T](log: Logger)(f: Project => WithProjectResult[T])(dir: File): Either[String, T] =
+		withProject(log, None, new ReloadSuccessExpected(LoadErrorPrefix), dir )(f)
+	private def withProject[T](log: Logger, previousProject: Option[Project], reload: ReloadProject, dir: File)
+		(f: Project => WithProjectResult[T]): Either[String, T] =
+	{
+		require(previousProject.isDefined || reload != NoReload, "Previous project undefined and reload not requested.")
+		val loadResult =
+			if(reload == NoReload && previousProject.isDefined)
+				Right(previousProject.get)
+			else
+			{
+				val buffered = new BufferedLogger(log)
+				def error(msg: String) =
+				{
+					buffered.playAll()
+					buffered.stop()
+					Left(msg)
+				}
+				
+				buffered.startRecording()
+				resultToEither(Project.loadProject(dir, Nil, None, buffered)) match
+				{
+					case Left(msg) =>
+						reload match
+						{
+							case ReloadErrorExpected =>
+								buffered.stop()
+								previousProject.toRight("Initial project load failed.")
+							case s: ReloadSuccessExpected => error(s.prefixIfError + msg)
+							case NoReload /* shouldn't happen */=> error(msg)
+						}
+					case Right(p) =>
+						reload match
+						{
+							case ReloadErrorExpected => error("Expected project load failure, but it succeeded.")
+							case _ =>
+								buffered.stop()
+								Right(p)
+						}
+				}
+			}
+		loadResult match
+		{
+			case Right(project) =>
+				project.log.enableTrace(log.traceEnabled)
+				project.log.setLevel(log.getLevel)
+				f(project) match
+				{
+					case ContinueResult(newF, newReload) => withProject(log, Some(project), newReload, dir)(newF)
+					case ValueResult(value) => Right(value)
+					case err: ErrorResult => Left(err.message)
+				}
+			case Left(message) => Left(message)
+		}
+	}
+
+	def resultToEither(result: LoadResult): Either[String, Project] =
+		result match
+		{
+			case success: LoadSuccess => Right(success.project)
+			case err: LoadError => Left(err.message)
+			case err: LoadSetupError => Left(err.message)
+			case LoadSetupDeclined => Left("Setup declined")
+		}
+}
+sealed trait ReloadProject extends NotNull
+final object ReloadErrorExpected extends ReloadProject
+final class ReloadSuccessExpected(val prefixIfError: String) extends ReloadProject
+final object NoReload extends ReloadProject
+
+sealed trait WithProjectResult[+T] extends NotNull
+final case class ContinueResult[T](f: Project => WithProjectResult[T], reload: ReloadProject) extends WithProjectResult[T]
+final case class ValueResult[T](value: T) extends WithProjectResult[T]
+final class ErrorResult(val message: String) extends WithProjectResult[Nothing]
+object ContinueResult
+{
+	def apply[T](f: Project => WithProjectResult[T], prefixIfError: Option[String]) =
+	{
+		val reload = prefixIfError match { case None => NoReload; case Some(p) => new ReloadSuccessExpected(p) }
+		new ContinueResult[T](f, reload)
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
new file mode 100644
index 000000000..f4dbb412e
--- /dev/null
+++ b/src/main/scala/sbt/Run.scala
@@ -0,0 +1,167 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import scala.tools.nsc.{GenericRunnerCommand, Interpreter, InterpreterLoop, ObjectRunner, Settings}
+import scala.tools.nsc.interpreter.InteractiveReader
+import scala.tools.nsc.reporters.Reporter
+import scala.tools.nsc.util.ClassPath
+
+import java.io.File
+import java.net.{URL, URLClassLoader}
+
+trait ScalaRun
+{
+	def console(classpath: Iterable[Path], log: Logger): Option[String]
+	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger): Option[String]
+}
+class ForkRun(config: ForkScalaRun) extends ScalaRun
+{
+	def console(classpath: Iterable[Path], log: Logger): Option[String] =
+	{
+		error("Forking the interpreter is not implemented.")
+		//val exitCode = Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, classpathOption(classpath), config.workingDirectory, log)
+		//processExitCode(exitCode, "interpreter")
+	}
+	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger): Option[String] =
+	{
+		val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList
+		val exitCode = Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, log)
+		processExitCode(exitCode, "runner")
+	}
+	private def classpathOption(classpath: Iterable[Path]) = "-cp" :: Path.makeString(classpath) :: Nil
+	private def processExitCode(exitCode: Int, label: String) =
+	{
+		if(exitCode == 0)
+			None
+		else
+			Some("Nonzero exit code returned from " + label + ": " + exitCode)
+	}
+}
+
+/** This module is an interface to starting the scala interpreter or runner.*/
+object Run extends ScalaRun
+{
+	/** Starts an interactive scala interpreter session with the given classpath.*/
+	def console(classpath: Iterable[Path], log: Logger) =
+		createSettings(log)
+		{
+			(settings: Settings) =>
+			{
+				settings.classpath.value = Path.makeString(classpath)
+				log.info("Starting scala interpreter...")
+				log.debug("  Classpath: " + settings.classpath.value)
+				log.info("")
+				Control.trapUnit("Error during session: ", log)
+				{
+					val loop = new InterpreterLoop
+					executeTrapExit(loop.main(settings), log)
+				}
+			}
+		}
+	/** Executes the given function, trapping calls to System.exit. */
+	private def executeTrapExit(f: => Unit, log: Logger): Option[String] =
+	{
+		val exitCode = TrapExit(f, log)
+		if(exitCode == 0)
+		{
+			log.debug("Exited with code 0")
+			None
+		}
+		else
+			Some("Nonzero exit code: " + exitCode)
+	}
+	/** Runs the class 'mainClass' using the given classpath and options using the scala runner.*/
+	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger) =
+	{
+		createSettings(log)
+		{
+			(settings: Settings) =>
+			{
+				Control.trapUnit("Error during run: ", log)
+				{
+					val classpathURLs = classpath.map(_.asURL).toList
+					val bootClasspath = FileUtilities.pathSplit(settings.bootclasspath.value)
+					val extraURLs =
+						for(pathString <- bootClasspath if pathString.length > 0) yield
+							(new java.io.File(pathString)).toURI.toURL
+					log.info("Running " + mainClass + " ...")
+					log.debug("  Classpath:" + (classpathURLs ++ extraURLs).mkString("\n\t", "\n\t",""))
+					executeTrapExit( ObjectRunner.run(classpathURLs ++ extraURLs, mainClass, options.toList), log )
+				}
+			}
+		}
+	}
+	/** If mainClassOption is None, then the interactive scala interpreter is started with the given classpath.
+	* Otherwise, the class wrapped by Some is run using the scala runner with the given classpath and
+	* options. */
+	def apply(mainClassOption: Option[String], classpath: Iterable[Path], options: Seq[String], log: Logger) =
+	{
+		mainClassOption match
+		{
+			case Some(mainClass) => run(mainClass, classpath, options, log)
+			case None => console(classpath, log)
+		}
+	}
+	/** Create a settings object and execute the provided function if the settings are created ok.*/
+	private def createSettings(log: Logger)(f: Settings => Option[String]) =
+	{
+		val command = new GenericRunnerCommand(Nil, message => log.error(message))
+		if(command.ok)
+			f(command.settings)
+		else
+			Some(command.usageMsg)
+	}
+	
+	/** Starts a Scala interpreter session with 'project' bound to the value 'current' in the console
+	* and the following two lines executed:
+	*   import sbt._
+	*   import current._
+	*/
+	def projectConsole(project: Project): Option[String] =
+	{
+		import project.log
+		createSettings(log) { interpreterSettings =>
+		createSettings(log) { compilerSettings =>
+			log.info("Starting scala interpreter with project definition " + project.name + " ...")
+			log.info("")
+			Control.trapUnit("Error during session: ", log)
+			{
+				val loop = new ProjectInterpreterLoop(compilerSettings, project)
+				executeTrapExit(loop.main(interpreterSettings), log)
+			}
+		}}
+	}
+	/** A custom InterpreterLoop with the purpose of creating an interpreter with Project 'project' bound to the value 'current', 
+	* and the following two lines interpreted:
+	*   import sbt._
+	*   import current._.
+	* To do this,
+	* 1)  The compiler uses a different settings instance: 'compilerSettings', which will have its classpath set to include the classpath
+	*    of the loader that loaded 'project'.  The compiler can then find the classes it needs to compile code referencing the project.
+	* 2) The parent class loader for the interpreter is the loader that loaded the project, so that the project can be bound to a variable
+	*    in the interpreter.
+	*/
+	private class ProjectInterpreterLoop(compilerSettings: Settings, project: Project) extends InterpreterLoop
+	{
+		override def createInterpreter()
+		{
+			val loader = project.getClass.getClassLoader.asInstanceOf[URLClassLoader]
+			compilerSettings.classpath.value = loader.getURLs.flatMap(ClasspathUtilities.asFile).map(_.getAbsolutePath).mkString(File.pathSeparator)
+			project.log.debug("  Compiler classpath: " + compilerSettings.classpath.value)
+			
+			in = InteractiveReader.createDefault()
+			interpreter = new Interpreter(settings)
+			{
+				override protected def parentClassLoader = loader
+				override protected def newCompiler(settings: Settings, reporter: Reporter) = super.newCompiler(compilerSettings, reporter)
+			}
+			interpreter.setContextClassLoader()
+			interpreter.bind("current", project.getClass.getName, project)
+			interpreter.interpret("import sbt._")
+			interpreter.interpret("import Process._")
+			interpreter.interpret("import current._")
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
new file mode 100644
index 000000000..d9b38592f
--- /dev/null
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -0,0 +1,345 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah, David MacIver
+ */
+package sbt
+
+import FileUtilities._
+import java.io.File
+import java.util.jar.{Attributes, Manifest}
+import scala.collection.mutable.ListBuffer
+
+trait SimpleScalaProject extends Project
+{
+	def errorTask(message: String) = task{ Some(message) }
+	
+	trait CleanOption extends ActionOption
+	case class ClearAnalysis(analysis: TaskAnalysis[_, _, _]) extends CleanOption
+	case class Preserve(paths: PathFinder) extends CleanOption
+	
+	case class CompileOption(val asString: String) extends ActionOption
+	case class JavaCompileOption(val asString: String) extends ActionOption
+	
+	val Deprecation = CompileOption("-deprecation")
+	val ExplainTypes = CompileOption("-explaintypes")
+	val Optimize = CompileOption("-optimise")
+	def Optimise = Optimize
+	val Verbose = CompileOption("-verbose")
+	val Unchecked = CompileOption("-unchecked")
+	val DisableWarnings = CompileOption("-nowarn")
+	def target(target: Target.Value) = CompileOption("-target:" + target)
+	object Target extends Enumeration
+	{
+		val Java1_5 = Value("jvm-1.5")
+		val Java1_4 = Value("jvm-1.4")
+		val Msil = Value("msil")
+	}
+	
+	def cleanTask(paths: PathFinder, options: CleanOption*): Task =
+		cleanTask(paths, options)
+	def cleanTask(paths: PathFinder, options: => Seq[CleanOption]): Task =
+		task
+		{
+			val cleanOptions = options
+			val preservePaths = for(Preserve(preservePaths) <- cleanOptions; toPreserve <- preservePaths.get) yield toPreserve
+			Control.thread(FileUtilities.preserve(preservePaths, log))
+			{ preserved =>
+				val pathClean = FileUtilities.clean(paths.get, log)
+				for(ClearAnalysis(analysis) <- cleanOptions)
+				{
+					analysis.clear()
+					analysis.save()
+				}
+				val restored = preserved.restore(log)
+				pathClean orElse restored
+			}
+		}
+}
+trait ScalaProject extends SimpleScalaProject with FileTasks
+{
+	import ScalaProject._
+	
+	final case class MaxCompileErrors(val value: Int) extends CompileOption("") with ScaladocOption { def asList = Nil }
+	trait PackageOption extends ActionOption
+	trait TestOption extends ActionOption
+	
+	case class TestSetup(setup: () => Option[String]) extends TestOption
+	case class TestCleanup(cleanup: () => Option[String]) extends TestOption
+	case class ExcludeTests(tests: Iterable[String]) extends TestOption
+	case class TestListeners(listeners: Iterable[TestReportListener]) extends TestOption
+	case class TestFilter(filterTest: String => Boolean) extends TestOption
+	
+	case class JarManifest(m: Manifest) extends PackageOption
+	{
+		assert(m != null)
+	}
+	case class MainClass(mainClassName: String) extends PackageOption
+	case class ManifestAttributes(attributes: (Attributes.Name, String)*) extends PackageOption
+	case object Recursive extends PackageOption
+	def ManifestAttributes(attributes: (String, String)*): ManifestAttributes =
+	{
+		val converted = for( (name,value) <- attributes ) yield (new Attributes.Name(name), value)
+		new ManifestAttributes(converted : _*)
+	}
+	
+	
+	trait ScaladocOption extends ActionOption
+	{
+		def asList: List[String]
+	}
+	case class SimpleDocOption(optionValue: String) extends ScaladocOption
+	{
+		def asList = List(optionValue)
+	}
+	case class CompoundDocOption(label: String, value: String) extends ScaladocOption
+	{
+		def asList = List(label, value)
+	}
+	val LinkSource = SimpleDocOption("-linksource")
+	val NoComment = SimpleDocOption("-nocomment")
+	def access(access: Access.Value) = SimpleDocOption("-access:" + access)
+	def documentBottom(bottomText: String) = CompoundDocOption("-bottom", bottomText)
+	def documentCharset(charset: String) = CompoundDocOption("-charset", charset)
+	def documentTitle(title: String) = CompoundDocOption("-doctitle", title)
+	def documentFooter(footerText: String) = CompoundDocOption("-footer", footerText)
+	def documentHeader(headerText: String) = CompoundDocOption("-header", headerText)
+	def stylesheetFile(path: Path) = CompoundDocOption("-stylesheetfile", path.asFile.getAbsolutePath)
+	def documentTop(topText: String) = CompoundDocOption("-top", topText)
+	def windowTitle(title: String) = CompoundDocOption("-windowtitle", title)
+	
+	object Access extends Enumeration
+	{
+		val Public = Value("public")
+		val Default = Value("protected")
+		val Private = Value("private")
+	}
+
+	def consoleTask(classpath : PathFinder): Task = 
+		consoleTask(classpath, Run)
+	def consoleTask(classpath : PathFinder, runner: ScalaRun): Task =
+		interactiveTask { runner.console(classpath.get, log) }
+
+	def runTask(mainClass: => Option[String], classpath: PathFinder, options: String*): Task =
+		runTask(mainClass, classpath, options)
+	def runTask(mainClass: => Option[String], classpath: PathFinder, options: => Seq[String]): Task =
+		runTask(mainClass, classpath, options, Run)
+	def runTask(mainClass: => Option[String], classpath: PathFinder, options: => Seq[String], runner: ScalaRun): Task =
+		task
+		{
+			mainClass match
+			{
+				case Some(main) => runner.run(main, classpath.get, options, log)
+				case None => Some("No main class specified.")
+			}
+		}
+		
+	def syncTask(sourceDirectory: Path, destinationDirectory: Path): Task =
+		task { FileUtilities.sync(sourceDirectory, destinationDirectory, log) }
+	def copyTask(sources: PathFinder, destinationDirectory: Path): Task =
+		task { FileUtilities.copy(sources.get, destinationDirectory, log).left.toOption }
+
+	def testTask(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: TestOption*): Task =
+		testTask(frameworks, classpath, analysis, options)
+	def testTask(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]): Task =
+	{
+		def work =
+		{
+			val (begin, work, end) = testTasks(frameworks, classpath, analysis, options)
+			val beginTasks = begin.map(toTask).toSeq // test setup tasks
+			val workTasks = work.map(w => toTask(w) dependsOn(beginTasks : _*)) // the actual tests
+			val endTasks = end.map(toTask).toSeq // tasks that perform test cleanup and are run regardless of success of tests
+			val endTask = task { None } named("test-cleanup") dependsOn(endTasks : _*)
+			val rootTask = task { None } named("test-complete") dependsOn(workTasks.toSeq : _*) // the task that depends on all test subtasks
+			new SubWork[Project#Task](ParallelRunner.dagScheduler(rootTask), ParallelRunner.dagScheduler(endTask))
+		}
+		new CompoundTask(work)
+	}
+	private def toTask(testTask: NamedTestTask) = task(testTask.run()) named(testTask.name)
+
+	def graphTask(outputDirectory: Path, analysis: CompileAnalysis): Task = task { DotGraph(analysis, outputDirectory, log) }
+	def scaladocTask(label: String, sources: PathFinder, outputDirectory: Path, classpath: PathFinder, options: ScaladocOption*): Task =
+		scaladocTask(label, sources, outputDirectory, classpath, options)
+	def scaladocTask(label: String, sources: PathFinder, outputDirectory: Path, classpath: PathFinder, options: => Seq[ScaladocOption]): Task =
+		task
+		{
+			val classpathString = Path.makeString(classpath.get)
+			val optionsLocal = options
+			val maxErrors = maximumErrors(optionsLocal)
+			(new Scaladoc(maxErrors))(label, sources.get, classpathString, outputDirectory, optionsLocal.flatMap(_.asList), log)
+		}
+
+	def packageTask(sources: PathFinder, outputDirectory: Path, jarName: => String, options: PackageOption*): Task =
+		packageTask(sources, outputDirectory / jarName, options)
+	def packageTask(sources: PathFinder, outputDirectory: Path, jarName: => String, options: => Seq[PackageOption]): Task =
+		packageTask(sources: PathFinder, outputDirectory / jarName, options)
+	def packageTask(sources: PathFinder, jarPath: => Path, options: PackageOption*): Task =
+		packageTask(sources, jarPath, options)
+	def packageTask(sources: PathFinder, jarPath: => Path, options: => Seq[PackageOption]): Task =
+		fileTask("package", jarPath from sources)
+		{
+			import wrap.{MutableMapWrapper,Wrappers}
+			/** Copies the mappings in a2 to a1, mutating a1. */
+			def mergeAttributes(a1: Attributes, a2: Attributes)
+			{
+				for( (key, value) <- Wrappers.toList(a2))
+					a1.put(key, value)
+			}
+
+			val manifest = new Manifest
+			var recursive = false
+			for(option <- options)
+			{
+				option match
+				{
+					case JarManifest(mergeManifest) => 
+					{
+						mergeAttributes(manifest.getMainAttributes, mergeManifest.getMainAttributes)
+						val entryMap = new MutableMapWrapper(manifest.getEntries)
+						for((key, value) <- Wrappers.toList(mergeManifest.getEntries))
+						{
+							entryMap.get(key) match
+							{
+								case Some(attributes) => mergeAttributes(attributes, value)
+								case None => entryMap += (key, value)
+							}
+						}
+					}
+					case Recursive => recursive = true
+					case MainClass(mainClassName) =>
+						manifest.getMainAttributes.put(Attributes.Name.MAIN_CLASS, mainClassName)
+					case ManifestAttributes(attributes @ _*) =>
+						val main = manifest.getMainAttributes
+						for( (name, value) <- attributes)
+							main.put(name, value)
+					case _ => log.warn("Ignored unknown package option " + option)
+				}
+			}
+			val jarPathLocal = jarPath
+			FileUtilities.clean(jarPathLocal :: Nil, log) orElse
+			FileUtilities.jar(sources.get, jarPathLocal, manifest, recursive, log)
+		}
+	def zipTask(sources: PathFinder, outputDirectory: Path, zipName: => String): Task =
+		zipTask(sources, outputDirectory / zipName)
+	def zipTask(sources: PathFinder, zipPath: => Path): Task =
+		fileTask("zip", zipPath from sources) { FileUtilities.zip(sources.get, zipPath, false, log) }
+	def incrementVersionNumber()
+	{
+		projectVersion.get match
+		{
+			case Some(v: BasicVersion) =>
+			{
+				val newVersion = incrementImpl(v)
+				log.info("Changing version to " + newVersion)
+				projectVersion() = newVersion
+			}
+			case a => ()
+		}
+	}
+	protected def incrementImpl(v: BasicVersion): Version = v.incrementMicro
+	protected def testTasks(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) = {
+		import scala.collection.mutable.HashSet
+
+			val testFilters = new ListBuffer[String => Boolean]
+			val excludeTestsSet = new HashSet[String]
+			val setup, cleanup = new ListBuffer[() => Option[String]]
+			val testListeners = new ListBuffer[TestReportListener]
+			
+			options.foreach {
+				case TestFilter(include) => testFilters += include
+				case ExcludeTests(exclude) => excludeTestsSet ++= exclude
+				case TestListeners(listeners) => testListeners ++= listeners
+				case TestSetup(setupFunction) => setup += setupFunction
+				case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
+			}
+			
+			if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))
+			{
+				log.debug("Excluding tests: ")
+				excludeTestsSet.foreach(test => log.debug("\t" + test))
+			}
+			def includeTest(test: TestDefinition) = !excludeTestsSet.contains(test.testClassName) && testFilters.forall(filter => filter(test.testClassName))
+			val tests = HashSet.empty[TestDefinition] ++ analysis.allTests.filter(includeTest)
+			TestFramework.testTasks(frameworks, classpath.get, tests, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly)
+	}
+	private def flatten[T](i: Iterable[Iterable[T]]) = i.flatMap(x => x)
+	
+	protected def testQuickMethod(testAnalysis: CompileAnalysis, options: => Seq[TestOption])(toRun: Seq[TestOption] => Task) =
+		task { tests =>
+			val (exactFilters, testFilters) = tests.toList.map(GlobFilter.apply).partition(_.isInstanceOf[ExactFilter])
+			val includeTests = exactFilters.map(_.asInstanceOf[ExactFilter].matchName)
+			val toCheck = scala.collection.mutable.HashSet(includeTests: _*)
+			toCheck --= testAnalysis.allTests.map(_.testClassName)
+			if(!toCheck.isEmpty && log.atLevel(Level.Warn))
+			{
+				log.warn("Test(s) not found:")
+				toCheck.foreach(test => log.warn("\t" + test))
+			}
+			val includeTestsSet = scala.collection.mutable.HashSet(includeTests: _*)
+			val newOptions =
+				if(includeTests.isEmpty && testFilters.isEmpty) options
+				else TestFilter(test => includeTestsSet.contains(test) || testFilters.exists(_.accept(test))) :: options.toList
+			toRun(newOptions)
+		} completeWith testAnalysis.allTests.map(_.testClassName).toList
+		
+	protected final def maximumErrors[T <: ActionOption](options: Seq[T]) =
+		(for( MaxCompileErrors(maxErrors) <- options) yield maxErrors).firstOption.getOrElse(DefaultMaximumCompileErrors)
+}
+trait WebScalaProject extends ScalaProject
+{
+	@deprecated protected def prepareWebappTask(webappContents: PathFinder, warPath: => Path, classpath: PathFinder, extraJars: => Iterable[File]): Task =
+		prepareWebappTask(webappContents, warPath, classpath, Path.lazyPathFinder(extraJars.map(Path.fromFile)))
+	protected def prepareWebappTask(webappContents: PathFinder, warPath: => Path, classpath: PathFinder, extraJars: PathFinder): Task =
+		task
+		{
+			val webInfPath = warPath / "WEB-INF"
+			val webLibDirectory = webInfPath / "lib"
+			val classesTargetDirectory = webInfPath / "classes"
+			
+			val (libs, directories) = classpath.get.toList.partition(ClasspathUtilities.isArchive)
+			val classesAndResources = descendents(Path.lazyPathFinder(directories) ##, "*")
+			if(log.atLevel(Level.Debug))
+				directories.foreach(d => log.debug(" Copying the contents of directory " + d + " to " + classesTargetDirectory))
+			
+			import FileUtilities.{copy, copyFlat, copyFilesFlat, clean}
+			(copy(webappContents.get, warPath, log).right flatMap { copiedWebapp =>
+			copy(classesAndResources.get, classesTargetDirectory, log).right flatMap { copiedClasses =>
+			copyFlat(libs, webLibDirectory, log).right flatMap { copiedLibs =>
+			copyFilesFlat(extraJars.get.map(_.asFile), webLibDirectory, log).right flatMap { copiedExtraLibs =>
+				{
+					val toRemove = scala.collection.mutable.HashSet((warPath ** "*").get.toSeq : _*)
+					toRemove --= copiedWebapp
+					toRemove --= copiedClasses
+					toRemove --= copiedLibs
+					toRemove --= copiedExtraLibs
+					val (directories, files) = toRemove.toList.partition(_.isDirectory)
+					if(log.atLevel(Level.Debug))
+						files.foreach(r => log.debug("Pruning file " + r))
+					val result =
+						clean(files, true, log) orElse
+						{
+							val emptyDirectories = directories.filter(directory => directory.asFile.listFiles.isEmpty)
+							if(log.atLevel(Level.Debug))
+								emptyDirectories.foreach(r => log.debug("Pruning directory " + r))
+							clean(emptyDirectories, true, log)
+						}
+					result.toLeft(())
+				}
+			}}}}).left.toOption
+		}
+	def jettyRunTask(warPath: => Path, defaultContextPath: => String, port: Int, classpath: PathFinder, classpathName: String, scanDirectories: Seq[File], scanInterval: Int): Task =
+		task { JettyRun(classpath.get, classpathName, warPath, defaultContextPath, port, scanDirectories, scanInterval, log) }
+	def jettyRunTask(warPath: => Path, defaultContextPath: => String, classpath: PathFinder, classpathName: String, scanDirectories: Seq[File], scanInterval: Int): Task =
+		jettyRunTask(warPath, defaultContextPath, JettyRun.DefaultPort, classpath, classpathName, scanDirectories, scanInterval)
+	def jettyRunTask(warPath: => Path, defaultContextPath: => String, classpath: PathFinder, classpathName: String,
+		jettyConfigurationXML: scala.xml.NodeSeq, jettyConfigurationFiles: Seq[File]): Task =
+			task { JettyRun(classpath.get, classpathName, warPath, defaultContextPath, jettyConfigurationXML, jettyConfigurationFiles, log) }
+	def jettyStopTask = task { JettyRun.stop(); None }
+}
+object ScalaProject
+{
+	val DefaultMaximumCompileErrors = 100
+	val AnalysisDirectoryName = "analysis"
+	val MainClassKey = "Main-Class"
+	val TestResourcesProperty = "sbt.test.resources"
+	def optionsAsString(options: Seq[ScalaProject#CompileOption]) = options.map(_.asString).filter(!_.isEmpty)
+	def javaOptionsAsString(options: Seq[ScalaProject#JavaCompileOption]) = options.map(_.asString)
+}
diff --git a/src/main/scala/sbt/ScalaVersion.scala b/src/main/scala/sbt/ScalaVersion.scala
new file mode 100644
index 000000000..6366359d2
--- /dev/null
+++ b/src/main/scala/sbt/ScalaVersion.scala
@@ -0,0 +1,47 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt
+
+/** Provides access to the current version of Scala being used to build a project.  These methods typically
+* return None or the empty string when the loader is not used. */
+object ScalaVersion
+{
+	/** The name of the system property containing the Scala version used for this project.*/
+	private[sbt] val LiveKey = "sbt.scala.version"
+	private[sbt] def crossString(v: String) = "scala_" + v
+	/** Returns the current version of Scala being used to build the project, unless the sbt loader is not being used,
+	* in which case this is the empty string.*/
+	def currentString =
+	{
+		val v = System.getProperty(LiveKey)
+		if(v == null)
+			""
+		else
+			v.trim
+	}
+	/** Returns the current version of Scala being used to build the project.  If the sbt loader is not being
+	* used, this returns None.  Otherwise, the value returned by this method is fixed for the duration of
+	* a Project's existence.  It only changes on reboot (during which a Project is recreated).*/
+	val current: Option[String] =
+	{
+		val sv = currentString
+		if(sv.isEmpty)
+			None
+		else
+			Some(sv)
+	}
+	private[sbt] def withCross[T](crossDisabled: Boolean)(withVersion: String => T, disabled: => T): T =
+	{
+		if(crossDisabled)
+			disabled
+		else
+		{
+			current match
+			{
+				case Some(scalaV) => withVersion(scalaV)
+				case _ => disabled
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/SourceModificationWatch.scala b/src/main/scala/sbt/SourceModificationWatch.scala
new file mode 100644
index 000000000..9e737f70c
--- /dev/null
+++ b/src/main/scala/sbt/SourceModificationWatch.scala
@@ -0,0 +1,32 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mikko Peltonen, Mark Harrah
+ */
+package sbt
+
+object SourceModificationWatch
+{
+	def watchUntil(project: Project, pollDelaySec: Int)(terminationCondition: => Boolean)(onSourcesModified: => Unit)
+	{
+		def sourceFiles: Iterable[java.io.File] =
+			sourcesFinder.get.map(Path.relativize(project.info.projectPath, _)).filter(_.isDefined).map(_.get.asFile)
+		def sourcesFinder: PathFinder = (Path.emptyPathFinder /: project.topologicalSort)(_ +++ _.watchPaths)
+		def loop(lastCallbackCallTime: Long, previousFileCount: Int)
+		{
+			val (lastModifiedTime, fileCount) = sourceFiles.foldLeft((0L, 0)){(acc, file) => (Math.max(acc._1, file.lastModified), acc._2 + 1)}
+			val newCallbackCallTime =
+				// check if sources are modified
+				if (lastModifiedTime > lastCallbackCallTime || previousFileCount != fileCount)
+				{
+					val now = System.currentTimeMillis
+					onSourcesModified
+					now
+				}
+				else
+					lastCallbackCallTime
+			Thread.sleep(pollDelaySec * 1000)
+			if(!terminationCondition)
+				loop(newCallbackCallTime, fileCount)
+		}
+		loop(0L, 0)
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/TaskManager.scala b/src/main/scala/sbt/TaskManager.scala
new file mode 100644
index 000000000..23678c6d2
--- /dev/null
+++ b/src/main/scala/sbt/TaskManager.scala
@@ -0,0 +1,88 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 David MacIver, Mark Harrah
+ */
+package sbt
+
+trait Described extends NotNull
+{
+	def description: Option[String]
+}
+trait TaskManager{
+	type ManagerType >: this.type <: TaskManager
+	type ManagedTask >: Task <: TaskManager#Task with Dag[ManagedTask]
+	/** Creates a task that executes the given action when invoked.*/
+	def task(action : => Option[String]) = new Task(None, Nil, false, action)
+	/** An interactive task is one that is not executed across all dependent projects when
+	* it is called directly.  The dependencies of the task are still invoked across all dependent
+	* projects, however. */
+	def interactiveTask(action: => Option[String]) = new Task(None, Nil, true, action)
+	/** Creates a method task that executes the given action when invoked. */
+	def task(action: Array[String] => ManagedTask) = new MethodTask(None, action, Nil)
+	
+	def taskName(t: Task): String
+	
+	/** A method task is an action that has parameters.  Note that it is not a Task, though,
+	* because it requires arguments to perform its work.  It therefore cannot be a dependency of
+	* a Task..*/
+	final class MethodTask(val description: Option[String], action: Array[String] => ManagedTask, getCompletions: => Seq[String]) extends Described
+	{
+		/** Creates a new method task, identical to this method task, except with thE[String]e given description.*/
+		def describedAs(description : String) = new MethodTask(Some(description), action, getCompletions)
+		/** Invokes this method task with the given arguments.*/
+		def apply(arguments: Array[String]) = action(arguments)
+		def manager: ManagerType = TaskManager.this
+		def completeWith(add: => Seq[String]) = new MethodTask(description, action, add)
+		def completions = getCompletions
+	}
+	
+	sealed class Task(val explicitName: Option[String], val description : Option[String], val dependencies : List[ManagedTask],
+		 val interactive: Boolean, action : => Option[String]) extends Dag[ManagedTask] with Described
+	{
+		def this(description : Option[String], dependencies : List[ManagedTask], interactive: Boolean, action : => Option[String]) =
+			this(None, description, dependencies, interactive, action)
+		checkTaskDependencies(dependencies)
+		def manager: ManagerType = TaskManager.this
+		def name = explicitName.getOrElse(taskName(this))
+		def named(name: String) = construct(Some(name), description,dependencies, interactive, action)
+		override def toString = "Task " + name
+		
+		/** Creates a new task, identical to this task, except with the additional dependencies specified.*/
+		def dependsOn(tasks : ManagedTask*) = setDependencies(tasks.toList ::: dependencies)
+		private[sbt] def setDependencies(dependencyList: List[ManagedTask]) =
+		{
+			checkTaskDependencies(dependencyList)
+			construct(explicitName, description, dependencyList, interactive, action)
+		}
+		/** Creates a new task, identical to this task, except with the given description.*/
+		def describedAs(description : String) = construct(explicitName, Some(description), dependencies, interactive, action);
+		private[sbt] def invoke = action;
+	
+		final def setInteractive = construct(explicitName, description, dependencies, true, action)
+		final def run = runSequentially(topologicalSort)
+		final def runDependenciesOnly = runSequentially(topologicalSort.dropRight(1))
+		private def runSequentially(tasks: List[ManagedTask]) = Control.lazyFold(tasks)(_.invoke)
+	
+		def &&(that : Task) =
+			construct(explicitName, None, dependencies ::: that.dependencies, interactive || that.interactive, this.invoke.orElse(that.invoke))
+		
+		protected def construct(explicitName: Option[String], description: Option[String], dependencies: List[ManagedTask], interactive: Boolean,
+			action : => Option[String]): Task = new Task(explicitName, description, dependencies, interactive, action)
+	}
+	final class CompoundTask private (explicitName: Option[String], description : Option[String], dependencies : List[ManagedTask], interactive: Boolean,
+		action : => Option[String], createWork: => SubWork[Project#Task]) extends Task(description, dependencies, interactive, action)
+		with CompoundWork[Project#Task]
+	{
+		def this(createWork: => SubWork[Project#Task]) = this(None, None, Nil, false, None, createWork)
+		override protected def construct(explicitName: Option[String], description: Option[String], dependencies: List[ManagedTask],
+			interactive: Boolean, action : => Option[String]) = new CompoundTask(explicitName, description, dependencies, interactive, action, createWork)
+		def work = createWork
+	}
+	
+	private def checkTaskDependencies(dependencyList: List[ManagedTask])
+	{
+		val nullDependencyIndex = dependencyList.findIndexOf(_ == null)
+		require(nullDependencyIndex < 0, "Dependency (at index " + nullDependencyIndex + ") is null.  This may be an initialization issue or a circular dependency.")
+		val interactiveDependencyIndex = dependencyList.findIndexOf(_.interactive)
+		require(interactiveDependencyIndex < 0, "Dependency (at index " + interactiveDependencyIndex + ") is interactive.  Interactive tasks cannot be dependencies.")
+	}
+}
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
new file mode 100644
index 000000000..7e6a59fb4
--- /dev/null
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -0,0 +1,221 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Steven Blundy, Mark Harrah
+ */
+package sbt
+
+object Result extends Enumeration
+{
+	val Error, Passed, Failed = Value
+}
+object ClassType extends Enumeration
+{
+	val Module, Class = Value
+}
+
+trait TestFramework extends NotNull
+{
+	def name: String
+	def testSuperClassName: String
+	def testSubClassType: ClassType.Value
+	
+	def testRunner(classLoader: ClassLoader, listeners: Iterable[TestReportListener], log: Logger): TestRunner
+}
+trait TestRunner extends NotNull
+{
+	def run(testClassName: String): Result.Value
+}
+
+abstract class BasicTestRunner extends TestRunner
+{
+	protected def log: Logger
+	protected def listeners: Seq[TestReportListener]
+
+	final def run(testClass: String): Result.Value =
+	{
+		safeListenersCall(_.startGroup(testClass))
+		try
+		{
+			val result = runTest(testClass)
+			safeListenersCall(_.endGroup(testClass, result))
+			result
+		}
+		catch
+		{
+			case e =>
+			{
+				safeListenersCall(_.endGroup(testClass, e))
+				Result.Error
+			}
+		}
+	}
+	def runTest(testClass: String): Result.Value
+
+	protected def fire(event: TestEvent) = safeListenersCall(_.testEvent(event))
+	protected def safeListenersCall(call: (TestReportListener) => Unit) = TestFramework.safeForeach(listeners, log)(call)
+}
+
+final class NamedTestTask(val name: String, action: => Option[String]) extends NotNull { def run() = action }
+object TestFramework
+{
+	def runTests(frameworks: Iterable[TestFramework], classpath: Iterable[Path], tests: Iterable[TestDefinition], log: Logger,
+		listeners: Iterable[TestReportListener]) =
+	{
+		val (start, runTests, end) = testTasks(frameworks, classpath, tests, log, listeners, true, Nil, Nil)
+		def run(tasks: Iterable[NamedTestTask]) = tasks.foreach(_.run())
+		run(start)
+		run(runTests)
+		run(end)
+	}
+	
+	private val ScalaCompilerJarPackages = "scala.tools.nsc." :: "jline." :: "ch.epfl.lamp." :: Nil
+
+	private val TestStartName = "test-start"
+	private val TestFinishName = "test-finish"
+	
+	private[sbt] def safeForeach[T](it: Iterable[T], log: Logger)(f: T => Unit): Unit = it.foreach(i => Control.trapAndLog(log){ f(i) } )
+	import scala.collection.{Map, Set}
+	def testTasks(frameworks: Iterable[TestFramework], classpath: Iterable[Path], tests: Iterable[TestDefinition], log: Logger,
+		listeners: Iterable[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
+		cleanup: Iterable[() => Option[String]]): (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
+	{
+		val mappedTests = testMap(frameworks, tests)
+		if(mappedTests.isEmpty)
+			(new NamedTestTask(TestStartName, None) :: Nil, Nil, new NamedTestTask(TestFinishName, { log.info("No tests to run."); None }) :: Nil )
+		else
+			createTestTasks(classpath, mappedTests, log, listeners, endErrorsEnabled, setup, cleanup)
+	}
+	private def testMap(frameworks: Iterable[TestFramework], tests: Iterable[TestDefinition]): Map[TestFramework, Set[String]] =
+	{
+		import scala.collection.mutable.{HashMap, HashSet, Set}
+		val map = new HashMap[TestFramework, Set[String]]
+		if(!frameworks.isEmpty)
+		{
+			for(test <- tests)
+			{
+				def isTestForFramework(framework: TestFramework) =
+					(framework.testSubClassType == ClassType.Module) == test.isModule &&
+					framework.testSuperClassName == test.superClassName
+				
+				for(framework <- frameworks.find(isTestForFramework))
+					map.getOrElseUpdate(framework, new HashSet[String]) += test.testClassName
+			}
+		}
+		wrap.Wrappers.readOnly(map)
+	}
+	private def createTasks(work: Iterable[() => Option[String]], baseName: String) =
+		work.toList.zipWithIndex.map{ case (work, index) => new NamedTestTask(baseName + " " + (index+1), work()) }
+		
+	private def createTestTasks(classpath: Iterable[Path], tests: Map[TestFramework, Set[String]], log: Logger,
+		listeners: Iterable[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
+		cleanup: Iterable[() => Option[String]]) =
+	{
+		val filterCompilerLoader = new FilteredLoader(getClass.getClassLoader, ScalaCompilerJarPackages)
+		val loader: ClassLoader = new IntermediateLoader(classpath.map(_.asURL).toSeq.toArray, filterCompilerLoader)
+		val testsListeners = listeners.filter(_.isInstanceOf[TestsListener]).map(_.asInstanceOf[TestsListener])
+		def foreachListenerSafe(f: TestsListener => Unit): Unit = safeForeach(testsListeners, log)(f)
+		
+		import Result.{Error,Passed,Failed}
+		object result
+		{
+			private[this] var value: Result.Value = Passed
+			def apply() = synchronized { value }
+			def update(v: Result.Value): Unit = synchronized { if(value != Error) value = v }
+		}
+		val startTask = new NamedTestTask(TestStartName, {foreachListenerSafe(_.doInit); None}) :: createTasks(setup, "Test setup")
+		val testTasks =
+			tests flatMap { case (framework, testClassNames) =>
+			
+					val runner = framework.testRunner(loader, listeners, log)
+					for(testClassName <- testClassNames) yield
+					{
+						def runTest() =
+						{
+							val oldLoader = Thread.currentThread.getContextClassLoader
+							Thread.currentThread.setContextClassLoader(loader)
+							try {
+								runner.run(testClassName) match
+								{
+									case Error => result() = Error; Some("ERROR occurred during testing.")
+									case Failed => result() = Failed; Some("Test FAILED")
+									case _ => None
+								}
+							}
+							finally {
+								Thread.currentThread.setContextClassLoader(oldLoader)
+							}
+						}
+						new NamedTestTask(testClassName, runTest())
+					}
+			}
+		def end() =
+		{
+			foreachListenerSafe(_.doComplete(result()))
+			result() match
+			{
+				case Error => if(endErrorsEnabled) Some("ERROR occurred during testing.") else None
+				case Failed => if(endErrorsEnabled) Some("One or more tests FAILED.") else None
+				case Passed =>
+				{
+					log.info(" ")
+					log.info("All tests PASSED.")
+					None
+				}
+			}
+		}
+		val endTask = new NamedTestTask(TestFinishName, end() ) :: createTasks(cleanup, "Test cleanup")
+		(startTask, testTasks, endTask)
+	}
+}
+
+abstract class LazyTestFramework extends TestFramework
+{
+	/** The class name of the the test runner that executes
+	* tests for this framework.*/
+	protected def testRunnerClassName: String
+	
+	/** Creates an instance of the runner given by 'testRunnerClassName'.*/
+	final def testRunner(projectLoader: ClassLoader, listeners: Iterable[TestReportListener], log: Logger): TestRunner =
+	{
+		val runnerClassName = testRunnerClassName
+		val frameworkClasspath = FileUtilities.classLocation(getClass)
+		val sbtURL = FileUtilities.sbtJar.toURI.toURL
+		val lazyLoader = new LazyFrameworkLoader(runnerClassName, Array(frameworkClasspath, sbtURL), projectLoader, getClass.getClassLoader)
+		val runnerClass = Class.forName(runnerClassName, true, lazyLoader).asSubclass(classOf[TestRunner])
+
+		runnerClass.getConstructor(classOf[Logger], classOf[Seq[TestReportListener]], classOf[ClassLoader]).newInstance(log, listeners, projectLoader)
+	}
+}
+
+/** The test framework definition for ScalaTest.*/
+object ScalaTestFramework extends LazyTestFramework
+{
+	val name = "ScalaTest"
+	val SuiteClassName = "org.scalatest.Suite"
+	
+	def testSuperClassName = SuiteClassName
+	def testSubClassType = ClassType.Class
+	
+	def testRunnerClassName = "sbt.impl.ScalaTestRunner"
+}
+/** The test framework definition for ScalaCheck.*/
+object ScalaCheckFramework extends LazyTestFramework
+{
+	val name = "ScalaCheck"
+	val PropertiesClassName = "org.scalacheck.Properties"
+	
+	def testSuperClassName = PropertiesClassName
+	def testSubClassType = ClassType.Module
+	
+	def testRunnerClassName = "sbt.impl.ScalaCheckRunner"
+}
+/** The test framework definition for specs.*/
+object SpecsFramework extends LazyTestFramework
+{
+	val name = "specs"
+	val SpecificationClassName = "org.specs.Specification"
+	
+	def testSuperClassName = SpecificationClassName
+	def testSubClassType = ClassType.Module
+	
+	def testRunnerClassName = "sbt.impl.SpecsRunner"
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/TestReportListener.scala b/src/main/scala/sbt/TestReportListener.scala
new file mode 100644
index 000000000..09e2a97d0
--- /dev/null
+++ b/src/main/scala/sbt/TestReportListener.scala
@@ -0,0 +1,316 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Steven Blundy, Mark Harrah
+ */
+
+package sbt
+
+trait TestReportListener
+{
+	/** called for each class or equivalent grouping */
+  def startGroup(name: String)
+	/** called for each test method or equivalent */
+  def testEvent(event: TestEvent)
+	/** called if there was an error during test */
+  def endGroup(name: String, t: Throwable)
+	/** called if test completed */
+  def endGroup(name: String, result: Result.Value)
+}
+
+trait TestsListener extends TestReportListener
+{
+	/** called once, at beginning. */
+  def doInit
+	/** called once, at end. */
+  def doComplete(finalResult: Result.Value)
+	/** called once, at end, if the test framework throws an exception. */
+  @deprecated def doComplete(t: Throwable)
+}
+
+abstract class WriterReportListener(val log: Logger) extends TestsListener
+{
+	import java.io.{IOException, PrintWriter, Writer}
+	import scala.collection.mutable.{Buffer, ListBuffer}
+
+	protected case class Summary(count: Int, failures: Int, errors: Int, skipped: Int, message: Option[String], cause: Option[Throwable]) extends NotNull
+	private var out: Option[PrintWriter] = None
+	private var groupCount: Int = 0
+	private var groupFailures: Int = 0
+	private var groupErrors: Int = 0
+	private var groupSkipped: Int = 0
+	private var groupMessages: Seq[String] = Nil
+
+	protected val passedEventHandler: TestEvent => Summary = (event: TestEvent) => event match
+		{
+			case SpecificationReportEvent(successes, failures, errors, skipped, desc, systems, subSpecs) => Summary(successes, failures, errors, skipped, None, None)
+			case IgnoredEvent(name, Some(message)) => Summary(1, 0, 0, 1, Some(message), None)
+			case IgnoredEvent(name, None) => Summary(1, 0, 0, 1, None, None)
+			case _ => Summary(1, 0, 0, 0, None, None)
+		}
+	protected val failedEventHandler: TestEvent => Summary = (event: TestEvent) => event match
+		{
+			case FailedEvent(name, msg) => Summary(1, 1, 0, 0, Some("! " + name + ": " + msg), None)
+			case TypedErrorEvent(name, event, Some(msg), cause) => Summary(1, 1, 0, 0, Some(event + " - " + name + ": " + msg), cause)
+			case TypedErrorEvent(name, event, None, cause) => Summary(1, 1, 0, 0, Some(event + " - " + name), cause)
+			case ErrorEvent(msg) => Summary(1, 1, 0, 0, Some(msg), None)
+			case SpecificationReportEvent(successes, failures, errors, skipped, desc, systems, subSpecs) => Summary(successes + failures + errors + skipped, failures, errors, skipped, Some(desc), None)
+			case _ => {log.warn("Unrecognized failure: " + event); Summary(1, 1, 0, 0, None, None)}
+		}
+	protected val errorEventHandler: TestEvent => Summary = (event: TestEvent) => event match
+		{
+			case FailedEvent(name, msg) => Summary(1, 0, 1, 0, Some("! " + name + ": " + msg), None)
+			case TypedErrorEvent(name, event, Some(msg), cause) => Summary(1, 0, 1, 0, Some(event + " - " + name + ": " + msg), cause)
+			case TypedErrorEvent(name, event, None, cause) => Summary(1, 0, 1, 0, Some(event + " - " + name), cause)
+			case ErrorEvent(msg) => Summary(1, 0, 1, 0, Some(msg), None)
+			case SpecificationReportEvent(successes, failures, errors, skipped, desc, systems, subSpecs) => Summary(successes + failures + errors + skipped, failures, errors, skipped, Some(desc), None)
+			case _ => {log.warn("Unrecognized error: " + event); Summary(1, 0, 1, 0, None, None)}
+		}
+	protected def open: Writer
+	protected def close =
+	{
+		onOut(_.close())
+		out = None
+	}
+	def doInit = Control.trapAndLog(log){ out = Some(new PrintWriter(open)) }
+	def doComplete(finalResult: Result.Value) =
+	{
+		finalResult match
+		{
+			case Result.Error => println("Error during Tests")
+			case Result.Passed => println("All Tests Passed")
+			case Result.Failed => println("Tests Failed")
+		}
+		close
+	}
+	def doComplete(t: Throwable) =
+	{
+		println("Exception in Test Framework")
+		onOut(t.printStackTrace(_))
+		close
+	}
+	def startGroup(name: String) =
+	{
+		groupCount = 0
+		groupFailures = 0
+		groupErrors = 0
+		groupSkipped = 0
+		groupMessages = Nil
+	}
+	def testEvent(event: TestEvent) = event.result match
+		{
+			case Some(result) =>
+			{
+				val Summary(count, failures, errors, skipped, msg, cause) = result match
+				{
+					case Result.Passed => passedEventHandler(event)
+					case Result.Failed => failedEventHandler(event)
+					case Result.Error => errorEventHandler(event)
+				}
+				groupCount += count
+				groupFailures += failures
+				groupErrors += errors
+				groupSkipped += skipped
+				groupMessages ++= msg.toList
+			}
+			case None => {}
+		}
+	def endGroup(name: String, t: Throwable) =
+	{
+		groupMessages = Nil
+		println("Exception in " + name)
+		onOut(t.printStackTrace(_))
+	}
+	def endGroup(name: String, result: Result.Value) =
+	{
+		result match
+		{
+			case Result.Error => println("Error: " + name + " - Count " + groupCount + ", Failed " + groupFailures + ", Errors " + groupErrors)
+			case Result.Passed => println("Passed: " + name + " - Count " + groupCount + ", Failed " + groupFailures + ", Errors " + groupErrors)
+			case Result.Failed => println("Failed: " + name + " - Count " + groupCount + ", Failed " + groupFailures + ", Errors " + groupErrors)
+		}
+		if(!groupMessages.isEmpty)
+		{
+			groupMessages.foreach(println(_))
+			groupMessages = Nil
+			println("")
+		}
+	}
+	protected def onOut(f: PrintWriter => Unit) = Control.trapAndLog(log){
+			out match
+			{
+				case Some(pw) => f(pw)
+				case None => log.warn("Method called when output was not open")
+			}
+		}
+	protected def println(s: String) = onOut(_.println(s))
+}
+
+class FileReportListener(val file: Path, log: Logger) extends WriterReportListener(log)
+{
+	def open = new java.io.FileWriter(file.asFile)
+}
+
+abstract class TestEvent extends NotNull
+{
+	def result: Option[Result.Value]
+}
+
+sealed abstract class ScalaCheckEvent extends TestEvent
+final case class PassedEvent(name: String, msg: String) extends ScalaCheckEvent { def result = Some(Result.Passed) }
+final case class FailedEvent(name: String, msg: String) extends ScalaCheckEvent { def result = Some(Result.Failed) }
+
+sealed abstract class ScalaTestEvent(val result: Option[Result.Value]) extends TestEvent
+final case class TypedEvent(name: String, `type`: String, msg: Option[String])(result: Option[Result.Value]) extends ScalaTestEvent(result)
+final case class TypedErrorEvent(name: String, `type`: String, msg: Option[String], cause: Option[Throwable])(result: Option[Result.Value]) extends ScalaTestEvent(result)
+final case class MessageEvent(msg: String) extends ScalaTestEvent(None)
+final case class ErrorEvent(msg: String) extends ScalaTestEvent(None)
+final case class IgnoredEvent(name: String, msg: Option[String]) extends ScalaTestEvent(Some(Result.Passed))
+
+sealed abstract class SpecsEvent extends TestEvent
+final case class SpecificationReportEvent(successes: Int, failures: Int, errors: Int, skipped: Int, pretty: String, systems: Seq[SystemReportEvent], subSpecs: Seq[SpecificationReportEvent]) extends SpecsEvent
+{
+	def result = if(errors > 0) Some(Result.Error) else if(failures > 0) Some(Result.Failed) else Some(Result.Passed)
+}
+final case class SystemReportEvent(description: String, verb: String, skippedSus:Option[Throwable], literateDescription: Option[Seq[String]], examples: Seq[ExampleReportEvent]) extends SpecsEvent { def result = None }
+final case class ExampleReportEvent(description: String, errors: Seq[Throwable], failures: Seq[RuntimeException], skipped: Seq[RuntimeException], subExamples: Seq[ExampleReportEvent]) extends SpecsEvent { def result = None }
+
+trait EventOutput[E <: TestEvent]
+{
+	def output(e: E): Unit
+}
+
+sealed abstract class LazyEventOutput[E <: TestEvent](val log: Logger) extends EventOutput[E]
+
+class ScalaCheckOutput(log: Logger) extends LazyEventOutput[ScalaCheckEvent](log)
+{
+	def output(event: ScalaCheckEvent) = event match
+		{
+			case PassedEvent(name, msg) => log.info("+ " + name + ": " + msg)
+			case FailedEvent(name, msg) => log.error("! " + name + ": " + msg)
+		}
+}
+
+class ScalaTestOutput(log: Logger) extends LazyEventOutput[ScalaTestEvent](log)
+{
+	def output(event: ScalaTestEvent) = event match
+		{
+			case TypedEvent(name, event, Some(msg)) => log.info(event + " - " + name + ": " + msg)
+			case TypedEvent(name, event, None) => log.info(event + " - " + name)
+			case TypedErrorEvent(name, event, Some(msg), cause) => logError(event + " - " + name + ": " + msg, cause)
+			case TypedErrorEvent(name, event, None, cause) => logError(event + " - " + name, cause)
+			case MessageEvent(msg) => log.info(msg)
+			case ErrorEvent(msg) => logError(msg, None)
+			case IgnoredEvent(name, Some(msg)) => log.info("Test ignored - " + name + ": " + msg)
+			case IgnoredEvent(name, None) => log.info("Test ignored - " + name)
+		}
+	private def logError(message: String, cause: Option[Throwable])
+	{
+		cause.foreach(x => log.trace(x))
+		log.error(message)
+	}
+}
+
+class SpecsOutput(val log: Logger) extends EventOutput[SpecsEvent]
+{
+		private val Indent = "  "
+
+	def output(event: SpecsEvent) = event match
+		{
+			case sre: SpecificationReportEvent => reportSpecification(sre, "")
+			case sre: SystemReportEvent => reportSystem(sre, "")
+			case ere: ExampleReportEvent => reportExample(ere, "")
+		}
+
+	/* The following is closely based on org.specs.runner.OutputReporter,
+	* part of specs, which is Copyright 2007-2008 Eric Torreborre.
+	* */
+
+	private def reportSpecification(specification: SpecificationReportEvent, padding: String)
+	{
+		val newIndent = padding + Indent
+		reportSpecifications(specification.subSpecs, newIndent)
+		reportSystems(specification.systems, newIndent)
+	}
+	private def reportSpecifications(specifications: Iterable[SpecificationReportEvent], padding: String)
+	{
+		for(specification <- specifications)
+			reportSpecification(specification, padding)
+	}
+	private def reportSystems(systems: Iterable[SystemReportEvent], padding: String)
+	{
+		for(system <- systems)
+			reportSystem(system, padding)
+	}
+	private def reportSystem(sus: SystemReportEvent, padding: String)
+	{
+		log.info(padding + sus.description + " " + sus.verb + sus.skippedSus.map(" (skipped: " + _.getMessage + ")").getOrElse(""))
+		for(description <- sus.literateDescription)
+			log.info(padding + description.mkString)
+		reportExamples(sus.examples, padding)
+		log.info(" ")
+	}
+	private def reportExamples(examples: Iterable[ExampleReportEvent], padding: String)
+	{
+		for(example <- examples)
+		{
+			reportExample(example, padding)
+			reportExamples(example.subExamples, padding + Indent)
+		}
+	}
+	private def status(example: ExampleReportEvent) =
+	{
+		if (example.errors.size + example.failures.size > 0)
+			"x "
+		else if (example.skipped.size > 0)
+			"o "
+		else
+			"+ "
+	}
+	private def reportExample(example: ExampleReportEvent, padding: String)
+	{
+		log.info(padding + status(example) + example.description)
+		for(skip <- example.skipped)
+		{
+			log.trace(skip)
+			log.warn(padding + skip.toString)
+		}
+		for(e <- example.failures ++ example.errors)
+		{
+			log.trace(e)
+			log.error(padding + e.toString)
+		}
+	}
+}
+
+class LogTestReportListener(val log: Logger) extends TestReportListener
+{
+	lazy val scalaCheckOutput: EventOutput[ScalaCheckEvent] = createScalaCheckOutput
+	lazy val scalaTestOutput: EventOutput[ScalaTestEvent] = createScalaTestOutput
+	lazy val specsOutput: EventOutput[SpecsEvent] = createSpecsOutput
+
+	protected def createScalaCheckOutput = new ScalaCheckOutput(log)
+	protected def createScalaTestOutput = new ScalaTestOutput(log)
+	protected def createSpecsOutput = new SpecsOutput(log)
+	
+	def startGroup(name: String) {}
+	def testEvent(event: TestEvent)
+	{
+		log.debug("in testEvent:" + event)
+		event match
+		{
+			case sce: ScalaCheckEvent => scalaCheckOutput.output(sce)
+			case ste: ScalaTestEvent => scalaTestOutput.output(ste)
+			case se: SpecsEvent => specsOutput.output(se)
+			case e => handleOtherTestEvent(e)
+		}
+	}
+	protected def handleOtherTestEvent(event: TestEvent) {}
+	def endGroup(name: String, t: Throwable)
+	{
+		log.error("Could not run test " + name + ": " + t.toString)
+		log.trace(t)
+	}
+	def endGroup(name: String, result: Result.Value)
+	{
+		log.debug("in endGroup:" + result)
+	}
+}
diff --git a/src/main/scala/sbt/TrapExit.scala b/src/main/scala/sbt/TrapExit.scala
new file mode 100644
index 000000000..c66b8f208
--- /dev/null
+++ b/src/main/scala/sbt/TrapExit.scala
@@ -0,0 +1,238 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ *
+ * Partially based on exit trapping in Nailgun by Pete Kirkham,
+ * copyright 2004, Martian Software, Inc
+ * licensed under Apache 2.0 License.
+ */
+package sbt
+
+import scala.collection.Set
+import scala.reflect.Manifest
+
+/** This provides functionality to catch System.exit calls to prevent the JVM from terminating.
+* This is useful for executing user code that may call System.exit, but actually exiting is
+* undesirable.  This file handles the call to exit by disposing all top-level windows and interrupting
+* all user started threads.  It does not stop the threads and does not call shutdown hooks.  It is
+* therefore inappropriate to use this with code that requires shutdown hooks or creates threads that
+* do not terminate.  This category of code should only be called by forking the JVM. */
+object TrapExit
+{
+	/** Executes the given thunk in a context where System.exit(code) throws
+	* a custom SecurityException, which is then caught and the exit code returned.
+	* Otherwise, 0 is returned.  No other exceptions are handled by this method.*/
+	def apply(execute: => Unit, log: Logger): Int =
+	{
+		log.debug("Starting sandboxed run...")
+		
+		/** Take a snapshot of the threads that existed before execution in order to determine
+		* the threads that were created by 'execute'.*/
+		val originalThreads = allThreads
+		val code = new ExitCode
+		val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code))
+		val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { execute } }
+		
+		val originalSecurityManager = System.getSecurityManager
+		try
+		{
+			val newSecurityManager = new TrapExitSecurityManager(originalSecurityManager, customThreadGroup)
+			System.setSecurityManager(newSecurityManager)
+
+			executionThread.start()
+
+			log.debug("Waiting for threads to exit or System.exit to be called.")
+			waitForExit(originalThreads, log)
+			log.debug("Interrupting remaining threads (should be all daemons).")
+			interruptAll(originalThreads) // should only be daemon threads left now
+			log.debug("Sandboxed run complete..")
+			code.value.getOrElse(0)
+		}
+		finally { System.setSecurityManager(originalSecurityManager) }
+	}
+	 // wait for all non-daemon threads to terminate
+	private def waitForExit(originalThreads: Set[Thread], log: Logger)
+	{
+		var daemonsOnly = true
+		processThreads(originalThreads, thread =>
+			if(!thread.isDaemon)
+			{
+				daemonsOnly = false
+				waitOnThread(thread, log)
+			}
+		)
+		if(!daemonsOnly)
+			waitForExit(originalThreads, log)
+	}
+	/** Waits for the given thread to exit. */
+	private def waitOnThread(thread: Thread, log: Logger)
+	{
+		log.debug("Waiting for thread " + thread.getName + " to exit")
+		thread.join
+		log.debug("\tThread " + thread.getName + " exited.")
+	}
+	/** Returns the exit code of the System.exit that caused the given Exception, or rethrows the exception
+	* if its cause was not calling System.exit.*/
+	private def exitCode(e: Throwable) =
+		withCause[TrapExitSecurityException, Int](e)
+			{exited => exited.exitCode}
+			{other => throw other}
+	/** Recurses into the causes of the given exception looking for a cause of type CauseType.  If one is found, `withType` is called with that cause.
+	*  If not, `notType` is called with the root cause.*/
+	private def withCause[CauseType <: Throwable, T](e: Throwable)(withType: CauseType => T)(notType: Throwable => T)(implicit mf: Manifest[CauseType]): T =
+	{
+		val clazz = mf.erasure
+		if(clazz.isInstance(e))
+			withType(e.asInstanceOf[CauseType])
+		else
+		{
+			val cause = e.getCause
+			if(cause == null)
+				notType(e)
+			else
+				withCause(cause)(withType)(notType)(mf)
+		}
+	}
+	
+	/** Returns all threads that are not in the 'system' thread group and are not the AWT implementation
+	* thread (AWT-XAWT, AWT-Windows, ...)*/
+	private def allThreads: Set[Thread] =
+	{
+		val allThreads = wrap.Wrappers.toList(Thread.getAllStackTraces.keySet)
+		val threads = new scala.collection.mutable.HashSet[Thread]
+		for(thread <- allThreads if !isSystemThread(thread))
+			threads += thread
+		threads
+	}
+	/** Returns true if the given thread is in the 'system' thread group and is an AWT thread other than
+	* AWT-EventQueue or AWT-Shutdown.*/
+	private def isSystemThread(t: Thread) =
+	{
+		val name = t.getName
+		if(name.startsWith("AWT-"))
+			!(name.startsWith("AWT-EventQueue") || name.startsWith("AWT-Shutdown"))
+		else
+		{
+			val group = t.getThreadGroup
+			(group != null) && (group.getName == "system")
+		}
+	}
+	/** Calls the provided function for each thread in the system as provided by the 
+	* allThreads function except those in ignoreThreads.*/
+	private def processThreads(ignoreThreads: Set[Thread], process: Thread => Unit)
+	{
+		allThreads.filter(thread => !ignoreThreads.contains(thread)).foreach(process)
+	}
+	/** Handles System.exit by disposing all frames and calling interrupt on all user threads */
+	private def stopAll(originalThreads: Set[Thread])
+	{
+		disposeAllFrames()
+		interruptAll(originalThreads)
+	}
+	private def disposeAllFrames()
+	{
+		val allFrames = java.awt.Frame.getFrames
+		if(allFrames.length > 0)
+		{
+			allFrames.foreach(_.dispose) // dispose all top-level windows, which will cause the AWT-EventQueue-* threads to exit
+			Thread.sleep(2000) // AWT Thread doesn't exit immediately, so wait to interrupt it
+		}
+	}
+	// interrupt all threads that appear to have been started by the user
+	private def interruptAll(originalThreads: Set[Thread]): Unit =
+		processThreads(originalThreads, safeInterrupt)
+	// interrupts the given thread, but first replaces the exception handler so that the InterruptedException is not printed
+	private def safeInterrupt(thread: Thread)
+	{
+		if(!thread.getName.startsWith("AWT-"))
+		{
+			thread.setUncaughtExceptionHandler(new TrapInterrupt(thread.getUncaughtExceptionHandler))
+			thread.interrupt
+		}
+	}
+	// an uncaught exception handler that swallows InterruptedExceptions and otherwise defers to originalHandler
+	private final class TrapInterrupt(originalHandler: Thread.UncaughtExceptionHandler) extends Thread.UncaughtExceptionHandler
+	{
+		def uncaughtException(thread: Thread, e: Throwable)
+		{
+			withCause[InterruptedException, Unit](e)
+				{interrupted => ()}
+				{other => originalHandler.uncaughtException(thread, e) }
+			thread.setUncaughtExceptionHandler(originalHandler)
+		}
+	}
+	/** An uncaught exception handler that delegates to the original uncaught exception handler except when
+	* the cause was a call to System.exit (which generated a SecurityException)*/
+	private final class ExitHandler(originalHandler: Thread.UncaughtExceptionHandler, originalThreads: Set[Thread], codeHolder: ExitCode) extends Thread.UncaughtExceptionHandler
+	{
+		def uncaughtException(t: Thread, e: Throwable)
+		{
+			try
+			{
+				codeHolder.set(exitCode(e)) // will rethrow e if it was not because of a call to System.exit
+				stopAll(originalThreads)
+			}
+			catch
+			{
+				case _ => originalHandler.uncaughtException(t, e)
+			}
+		}
+	}
+	private final class ExitThreadGroup(handler: Thread.UncaughtExceptionHandler) extends ThreadGroup("trap.exit")
+	{
+		override def uncaughtException(t: Thread, e: Throwable) = handler.uncaughtException(t, e)
+	}
+}
+private final class ExitCode extends NotNull
+{
+	private var code: Option[Int] = None
+	def set(c: Int): Unit = synchronized { code = code orElse Some(c) }
+	def value: Option[Int] = synchronized { code }
+}
+///////  These two classes are based on similar classes in Nailgun
+/** A custom SecurityManager to disallow System.exit. */
+private final class TrapExitSecurityManager(delegateManager: SecurityManager, group: ThreadGroup) extends SecurityManager
+{
+	import java.security.Permission
+	override def checkExit(status: Int)
+	{
+		val stack = Thread.currentThread.getStackTrace
+		if(stack == null || stack.exists(isRealExit))
+			throw new TrapExitSecurityException(status)
+	}
+	/** This ensures that only actual calls to exit are trapped and not just calls to check if exit is allowed.*/
+	private def isRealExit(element: StackTraceElement): Boolean =
+		element.getClassName == "java.lang.Runtime" && element.getMethodName == "exit"
+	override def checkPermission(perm: Permission)
+	{
+		if(delegateManager != null)
+			delegateManager.checkPermission(perm)
+	}
+	override def checkPermission(perm: Permission, context: AnyRef)
+	{
+		if(delegateManager != null)
+			delegateManager.checkPermission(perm, context)
+	}
+	override def getThreadGroup = group
+}
+/** A custom SecurityException that tries not to be caught.*/
+private final class TrapExitSecurityException(val exitCode: Int) extends SecurityException
+{
+	private var accessAllowed = false
+	def allowAccess
+	{
+		accessAllowed = true
+	}
+	override def printStackTrace = ifAccessAllowed(super.printStackTrace)
+	override def toString = ifAccessAllowed(super.toString)
+	override def getCause = ifAccessAllowed(super.getCause)
+	override def getMessage = ifAccessAllowed(super.getMessage)
+	override def fillInStackTrace = ifAccessAllowed(super.fillInStackTrace)
+	override def getLocalizedMessage = ifAccessAllowed(super.getLocalizedMessage)
+	private def ifAccessAllowed[T](f: => T): T =
+	{
+		if(accessAllowed)
+			f
+		else
+			throw this
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Version.scala b/src/main/scala/sbt/Version.scala
new file mode 100644
index 000000000..b14e8ae52
--- /dev/null
+++ b/src/main/scala/sbt/Version.scala
@@ -0,0 +1,65 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ */
+package sbt
+
+sealed trait Version extends NotNull
+case class BasicVersion(major: Int, minor: Option[Int], micro: Option[Int], extra: Option[String]) extends Version
+{
+	import Version._
+	require(major >= 0, "Major revision must be nonnegative.")
+	require(minor.isDefined || micro.isEmpty, "Cannot define micro revision without defining minor revision.")
+	requirePositive(minor)
+	requirePositive(micro)
+	require(isValidExtra(extra))
+	
+	def incrementMicro = BasicVersion(major, minor orElse Some(0), increment(micro), extra)
+	def incrementMinor = BasicVersion(major, increment(minor), micro, extra)
+	def incrementMajor = BasicVersion(major+1, minor, micro, extra)
+	
+	override def toString = major +
+		minor.map(minorI => "." + minorI + micro.map(microI => "." + microI).getOrElse("")).getOrElse("") +
+			extra.map(x => "-" + x).getOrElse("")
+}
+case class OpaqueVersion(value: String) extends Version
+{
+	require(!value.trim.isEmpty)
+	override def toString = value
+}
+object Version
+{
+	private[sbt] def increment(i: Option[Int]) = Some(i.getOrElse(0) + 1)
+	private[sbt] def requirePositive(i: Option[Int]) { i.foreach(x => require(x >= 0)) }
+	
+	import java.util.regex.Pattern
+	val versionPattern = Pattern.compile("""(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:-(.+))?""")
+	def fromString(v: String): Either[String, Version] =
+	{
+		val trimmed = v.trim
+		if(trimmed.isEmpty)
+			Left("Version cannot be empty.")
+		else
+		{
+			val matcher = versionPattern.matcher(trimmed)
+			import matcher._
+			if(matches)
+			{
+				def toOption(index: Int) =
+				{
+					val v = group(index)
+					if(v == null) None else Some(v)
+				}
+				def toInt(index: Int) = toOption(index).map(_.toInt)
+				val extra = toOption(4)
+				if(isValidExtra(extra))
+					Right(BasicVersion(group(1).toInt, toInt(2), toInt(3), extra))
+				else
+					Right(OpaqueVersion(trimmed))
+			}
+			else
+				Right(OpaqueVersion(trimmed))
+		}
+	}
+	def isValidExtra(e: Option[String]): Boolean = e.map(isValidExtra).getOrElse(true)
+	def isValidExtra(s: String): Boolean = !(s.trim.isEmpty || s.exists(java.lang.Character.isISOControl))
+}
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
new file mode 100644
index 000000000..392c4ba12
--- /dev/null
+++ b/src/main/scala/sbt/WebApp.scala
@@ -0,0 +1,245 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import java.net.{URL, URLClassLoader}
+import scala.xml.NodeSeq
+
+object JettyRun extends ExitHook
+{
+	val DefaultPort = 8080
+	
+	ExitHooks.register(this)
+	
+	def name = "jetty-shutdown"
+	def runBeforeExiting() { stop() }
+	private var running: Option[Stoppable] = None
+	private def started(s: Stoppable) { running = Some(s) }
+	def stop()
+	{
+		synchronized
+		{
+			running.foreach(_.stop())
+			running = None
+		}
+	}
+	def apply(classpath: Iterable[Path], classpathName: String, war: Path, defaultContextPath: String, jettyConfigurationXML: NodeSeq,
+		jettyConfigurationFiles: Seq[File], log: Logger): Option[String] =
+			run(classpathName, new JettyRunConfiguration(war, defaultContextPath, DefaultPort, jettyConfigurationXML,
+				jettyConfigurationFiles, Nil, 0, toURLs(classpath)), log)
+	def apply(classpath: Iterable[Path], classpathName: String, war: Path, defaultContextPath: String, port: Int, scanDirectories: Seq[File],
+		scanPeriod: Int, log: Logger): Option[String] =
+			run(classpathName, new JettyRunConfiguration(war, defaultContextPath, port, NodeSeq.Empty, Nil, scanDirectories, scanPeriod, toURLs(classpath)), log)
+	private def toURLs(paths: Iterable[Path]) = paths.map(_.asURL).toSeq
+	private def run(classpathName: String, configuration: JettyRunConfiguration, log: Logger): Option[String] =
+		synchronized
+		{
+			import configuration._
+			def runJetty() =
+			{
+				val baseLoader = this.getClass.getClassLoader
+				val loader: ClassLoader = new SelectiveLoader(classpathURLs.toArray, baseLoader, "org.mortbay." :: "javax.servlet." :: Nil)
+				val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.sbtJar.toURI.toURL), loader, baseLoader)
+				val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
+				runner(configuration, log)
+			}
+			
+			if(running.isDefined)
+				Some("Jetty is already running.")
+			else
+			{
+				try
+				{
+					started(runJetty())
+					None
+				}
+				catch
+				{
+					case e: NoClassDefFoundError => runError(e, "Jetty and its dependencies must be on the " + classpathName + " classpath: ", log)
+					case e => runError(e, "Error running Jetty: ", log)
+				}
+			}
+		}
+	private val implClassName = "sbt.LazyJettyRun"
+	
+	private def runError(e: Throwable, messageBase: String, log: Logger) =
+	{
+		log.trace(e)
+		Some(messageBase + e.toString)
+	}
+}
+
+private trait Stoppable
+{
+	def stop(): Unit
+}
+private trait JettyRun
+{
+	def apply(configuration: JettyRunConfiguration, log: Logger): Stoppable
+}
+private class JettyRunConfiguration(val war: Path, val defaultContextPath: String, val port: Int,
+	val jettyConfigurationXML: NodeSeq, val jettyConfigurationFiles: Seq[File],
+	val scanDirectories: Seq[File], val scanInterval: Int, val classpathURLs: Seq[URL]) extends NotNull
+
+/* This class starts Jetty.
+* NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
+*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
+*  the Jetty libraries provided on the project classpath instead of requiring them to be
+*  available on sbt's classpath at startup.
+*/
+private object LazyJettyRun extends JettyRun
+{
+	import org.mortbay.jetty.{Handler, Server}
+	import org.mortbay.jetty.nio.SelectChannelConnector
+	import org.mortbay.jetty.webapp.WebAppContext
+	import org.mortbay.log.Log
+	import org.mortbay.util.Scanner
+	import org.mortbay.xml.XmlConfiguration
+	
+	import java.lang.ref.{Reference, WeakReference}
+	
+	val DefaultMaxIdleTime = 30000
+	
+	def apply(configuration: JettyRunConfiguration, log: Logger): Stoppable =
+	{
+		import configuration._
+		val oldLog = Log.getLog
+		Log.setLog(new JettyLogger(log))
+		val server = new Server
+		val useDefaults = jettyConfigurationXML.isEmpty && jettyConfigurationFiles.isEmpty
+		
+		val listener =
+			if(useDefaults)
+			{
+				configureDefaultConnector(server, port)
+				def createLoader = new URLClassLoader(classpathURLs.toArray, this.getClass.getClassLoader)
+				val webapp = new WebAppContext(war.absolutePath, defaultContextPath)
+				webapp.setClassLoader(createLoader)
+				server.setHandler(webapp)
+				
+				Some(new Scanner.BulkListener {
+					def filesChanged(files: java.util.List[_]) {
+						reload(server, webapp.setClassLoader(createLoader), log)
+					}
+				})
+			}
+			else
+			{
+				for(x <- jettyConfigurationXML)
+					(new XmlConfiguration(x.toString)).configure(server)
+				for(file <- jettyConfigurationFiles)
+					(new XmlConfiguration(file.toURI.toURL)).configure(server)
+				None
+			}
+		
+		def configureScanner() =
+		{
+			if(listener.isEmpty || scanDirectories.isEmpty)
+				None
+			else
+			{
+				log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
+				val scanner = new Scanner
+				val list = new java.util.ArrayList[File]
+				scanDirectories.foreach(x => list.add(x))
+				scanner.setScanDirs(list)
+				scanner.setRecursive(true)
+				scanner.setScanInterval(scanInterval)
+				scanner.setReportExistingFilesOnStartup(false)
+				scanner.addListener(listener.get)
+				scanner.start()
+				Some(new WeakReference(scanner))
+			}
+		}
+		
+		try
+		{
+			server.start()
+			new StopServer(new WeakReference(server), configureScanner(), oldLog)
+		}
+		catch { case e => server.stop(); throw e }
+	}
+	private def configureDefaultConnector(server: Server, port: Int)
+	{
+		val defaultConnector = new SelectChannelConnector
+		defaultConnector.setPort(port)
+		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
+		server.addConnector(defaultConnector)
+	}
+	private class StopServer(serverReference: Reference[Server], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: org.mortbay.log.Logger) extends Stoppable
+	{
+		def stop()
+		{
+			val server = serverReference.get
+			if(server != null)
+				server.stop()
+			for(scannerReference <- scannerReferenceOpt)
+			{
+				val scanner = scannerReference.get
+				if(scanner != null)
+					scanner.stop()
+			}
+			Log.setLog(oldLog)
+		}
+	}
+	private def reload(server: Server, reconfigure: => Unit, log: Logger)
+	{
+		JettyRun.synchronized
+		{
+			log.info("Reloading web application...")
+			val handlers = wrapNull(server.getHandlers, server.getHandler)
+			log.debug("Stopping handlers: " + handlers.mkString(", "))
+			handlers.foreach(_.stop)
+			log.debug("Reconfiguring...")
+			reconfigure
+			log.debug("Restarting handlers: " + handlers.mkString(", "))
+			handlers.foreach(_.start)
+			log.info("Reload complete.")
+		}
+	}
+	private def wrapNull(a: Array[Handler], b: Handler) =
+		(a, b) match
+		{
+			case (null, null) => Nil
+			case (null, notB) => notB :: Nil
+			case (notA, null) => notA.toList
+			case (notA, notB) => notB :: notA.toList
+		}
+	private class JettyLogger(delegate: Logger) extends org.mortbay.log.Logger
+	{
+		def isDebugEnabled = delegate.atLevel(Level.Debug)
+		def setDebugEnabled(enabled: Boolean) = delegate.setLevel(if(enabled) Level.Debug else Level.Info)
+	
+		def getLogger(name: String) = this
+		def info(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.info(format(msg, arg0, arg1)) }
+		def debug(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.debug(format(msg, arg0, arg1)) }
+		def warn(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.warn(format(msg, arg0, arg1)) }
+		def warn(msg: String, th: Throwable)
+		{
+			delegate.warn(msg)
+			delegate.trace(th)
+		}
+		def debug(msg: String, th: Throwable)
+		{
+			delegate.debug(msg)
+			delegate.trace(th)
+		}
+		private def format(msg: String, arg0: AnyRef, arg1: AnyRef) =
+		{
+			def toString(arg: AnyRef) = if(arg == null) "" else arg.toString
+			val pieces = msg.split("""\{\}""", 3)
+			if(pieces.length == 1)
+				pieces(0)
+			else
+			{
+				val base = pieces(0) + toString(arg0) + pieces(1)
+				if(pieces.length == 2)
+					base
+				else
+					base + toString(arg1) + pieces(2)
+			}
+		}
+	}
+}
diff --git a/src/main/scala/sbt/Webstart.scala b/src/main/scala/sbt/Webstart.scala
new file mode 100644
index 000000000..e717ec026
--- /dev/null
+++ b/src/main/scala/sbt/Webstart.scala
@@ -0,0 +1,277 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import scala.xml.{Elem, NodeSeq}
+import Control._
+
+/** Defines the configurable parameters for the webstart task. */
+trait WebstartOptions extends NotNull
+{
+	/** The main jar to use for webstart.*/
+	def webstartMainJar: Path
+	/** The location to put all generated files for webstart.*/
+	def webstartOutputDirectory: Path
+	/** Generates the .jnlp file using the provided resource descriptions.  Each resource description
+	* provides the path of the jar relative to 'webstartOutputDirectory' and whether or not
+	* it is the main jar.*/
+	def jnlpXML(jars: Seq[WebstartJarResource]): Elem
+	/** The location to write the .jnlp file to.  It must be in 'webstartOutputDirectory'.*/
+	def jnlpFile: Path
+	/** The location to put all jars that are not the main jar.  It must be in 'webstartOutputDirectory'.*/
+	def webstartLibDirectory: Path
+	/** The libraries needed for webstart.  Note that only jars are used; directories are discarded.*/
+	def webstartLibraries: PathFinder
+	/** Libraries external to the project needed for webstart.  This is mainly for scala libraries.*/
+	def webstartExtraLibraries: PathFinder
+	/** Resources to copy to the webstart output directory.*/
+	def webstartResources: PathFinder
+	/** If defined, this specifies where to create a zip of the webstart output directory.  It cannot be
+	* in the output directory.*/
+	def webstartZip: Option[Path]
+
+	/** If defined, configures signing of jars.  All jars (main and libraries) are signed using
+	* this configuration.*/
+	def webstartSignConfiguration: Option[SignConfiguration]
+	/** If true, pack200 compression is applied to all jars (main and libraries).  A version of each jar
+	* without pack200 compression is still created in the webstart output directory.*/
+	def webstartPack200: Boolean
+	/** If true, gzip compression will be applied to all jars.  If pack200 compression is enabled,
+	* gzip compression is also applied to the archives with pack200 compression.  A version of
+	* each file without gzip compression is still created in the webstart output directory. */
+	def webstartGzip: Boolean
+}
+/** Represents a library included in the webstart distribution.  Name is the filename of the jar.
+* href is the path of the jar relative to the webstart output directory.  isMain is true only for
+* the main jar. */
+final class WebstartJarResource(val name: String, val href: String, val isMain: Boolean) extends NotNull
+/** Configuration for signing jars. */
+final class SignConfiguration(val alias: String, val options: Seq[SignJar.SignOption]) extends NotNull
+/** A scala project that produces a webstart distribution. */
+trait WebstartScalaProject extends ScalaProject
+{
+	import WebstartScalaProject._
+	/** Creates a task that produces a webstart distribution using the given options.*/
+	def webstartTask(options: WebstartOptions) =
+		task
+		{
+			import options._
+			FileUtilities.createDirectories(webstartOutputDirectory :: webstartLibDirectory :: Nil, log) // ignore errors
+			verifyOptions(options)
+			
+			def relativize(jar: Path) = Path.relativize(webstartOutputDirectory ##, jar) getOrElse
+				error("Jar (" + jar + ") was not in webstart output directory (" + webstartOutputDirectory + ").")
+			def signAndPack(jars: List[Path], targetDirectory: Path): Either[String, List[Path]] =
+			{
+				lazyFold(jars, Nil: List[Path])
+				{ (allJars, jar) =>
+					val signPackResult =
+						webstartSignConfiguration match
+						{
+							case Some(config) =>
+								if(webstartPack200)
+									signAndPack200(jar, config, targetDirectory, log)
+								else
+									signOnly(jar, config, targetDirectory, log)
+							case None =>
+								if(webstartPack200)
+									pack200Only(jar, targetDirectory, log)
+								else
+									copyJar(jar, targetDirectory, log).right.map(jars => new Jars(jars, Nil))
+						}
+					val deleteOriginal = webstartPack200
+					signPackResult.right flatMap { addJars =>
+						if(webstartGzip)
+							Control.lazyFold(addJars.gzippable, addJars.allJars ::: allJars)
+								{ (accumulate, jar) => gzipJar(jar, deleteOriginal, log).right.map(_ ::: accumulate) }
+						else
+							Right(addJars.allJars ::: allJars)
+					}
+				}
+			}
+		
+			import FileUtilities._
+			
+			val jars = (webstartLibraries +++ webstartExtraLibraries).get.filter(ClasspathUtilities.isArchive)
+			def process(jars: Iterable[Path]) = for(jar <- jars if jar.asFile.getName.endsWith(".jar")) yield relativize(jar)
+			
+			thread(signAndPack(webstartMainJar :: Nil, webstartOutputDirectory)) { mainJars =>
+				thread(signAndPack(jars.toList, webstartLibDirectory)) { libJars =>
+					writeXML(jnlpXML(jarResources(process(mainJars), process(libJars))), jnlpFile, log) orElse
+					thread(copy(webstartResources.get, webstartOutputDirectory, log)) { copiedResources =>
+						val keep = jnlpFile +++ Path.lazyPathFinder(mainJars ++ libJars ++ copiedResources) +++
+							webstartOutputDirectory +++ webstartLibDirectory
+						prune(webstartOutputDirectory, keep.get, log) orElse
+						webstartZip.flatMap( zipPath => zip(List(webstartOutputDirectory ##), zipPath, true, log) )
+					}
+				}
+			}
+		}
+	/** Creates default XML elements for a JNLP file for the given resources.*/
+	protected def defaultElements(resources: Seq[WebstartJarResource]): NodeSeq = NodeSeq.fromSeq(resources.map(defaultElement))
+	/** Creates a default XML element for a JNLP file for the given resource.*/
+	protected def defaultElement(resource: WebstartJarResource): Elem =
+		<jar href={resource.href} main={resource.isMain.toString}/>
+		
+}
+private class Jars(val gzippable: List[Path], val nonGzippable: List[Path]) extends NotNull
+{
+	def allJars = gzippable ::: nonGzippable
+}
+private object WebstartScalaProject
+{
+	import FileTasks.{runOption, wrapProduct, wrapProducts}
+	/** Changes the extension of the Path of the given jar from ".jar" to newExtension.  If append is true,
+	* the new extension is simply appended to the jar's filename. */
+	private def appendExtension(jar: Path, newExtension: String) =
+		jar match
+		{
+			case rp: RelativePath => rp.parentPath / (rp.component + newExtension)
+			case x => x
+		}
+	private def gzipJarPath(jar: Path) = appendExtension(jar, ".gz")
+	private def packPath(jar: Path) = appendExtension(jar, ".pack")
+	private def signOnly(jar: Path, signConfiguration: SignConfiguration, targetDirectory: Path, log: Logger) =
+	{
+		val targetJar = targetDirectory / jar.asFile.getName
+		runOption("sign", targetJar from jar, log) {
+			log.debug("Signing " + jar)
+			signAndVerify(jar, signConfiguration, targetJar, log)
+		}.toLeft(new Jars(targetJar :: Nil, Nil))
+	}
+	private def signAndVerify(jar: Path, signConfiguration: SignConfiguration, targetJar: Path, log: Logger) =
+	{
+		import SignJar._
+		sign(jar, signConfiguration.alias, signedJar(targetJar) :: signConfiguration.options.toList, log) orElse
+			verify(jar, signConfiguration.options, log).map(err => "Signed jar failed verification: " + err)
+	}
+	private def gzipJar(jar: Path, deleteOriginal: Boolean, log: Logger) =
+	{
+		val gzipJar = gzipJarPath(jar)
+		runOption("gzip", gzipJar from jar, log)
+		{
+			log.debug("Gzipping " + jar)
+			FileUtilities.gzip(jar, gzipJar, log) orElse
+				(if(deleteOriginal) FileUtilities.clean(jar :: Nil, true, log) else None)
+		}.toLeft(gzipJar :: Nil)
+	}
+	/** Properly performs both signing and pack200 compression and verifies the result.  This method only does anything if
+	* its outputs are out of date with respect to 'jar'.  Note that it does not determine if the signing configuration has changed.
+	* See java.util.jar.Pack200 for more information.*/
+	private def signAndPack200(jar: Path, signConfiguration: SignConfiguration, targetDirectory: Path, log: Logger) =
+	{
+		val signedJar = targetDirectory / jar.asFile.getName
+		val packedJar = packPath(signedJar)
+		import signConfiguration._
+		
+		runOption("sign and pack200", List(packedJar, signedJar) from jar, log) {
+			log.debug("Applying pack200 compression and signing " + jar)
+			signAndPack(jar, signedJar, packedJar, alias, options, log) orElse
+			signAndVerify(jar, signConfiguration, signedJar, log)
+		}.toLeft(new Jars(packedJar :: Nil, signedJar :: Nil))
+	}
+	/** Properly performs both signing and pack200 compression and verifies the result.  See java.util.jar.Pack200 for more information.*/
+	private def signAndPack(jarPath: Path, signedPath: Path, out: Path, alias: String, options: Seq[SignJar.SignOption], log: Logger): Option[String] =
+	{
+		import Pack._
+		import SignJar._
+		pack(jarPath, out, log) orElse
+		unpack(out, signedPath, log) orElse
+		sign(signedPath, alias, options, log) orElse
+		pack(signedPath, out, log) orElse
+		unpack(out, signedPath, log) orElse
+		verify(signedPath, options, log)
+	}
+	private def pack200Only(jar: Path, targetDirectory: Path, log: Logger) =
+	{
+		val targetJar = targetDirectory / jar.asFile.getName
+		val packedJar = packPath(targetJar)
+		val packResult =
+			runOption("pack200", packedJar from jar, log)
+			{
+				log.debug("Applying pack200 compression to " + jar)
+				Pack.pack(jar, packedJar, log)
+			}
+		packResult match
+		{
+			case Some(err) => Left(err)
+			case None => copyJar(jar, targetDirectory, log).right.map(jars => new Jars(packedJar :: Nil, jars))
+		}
+	}
+	private def copyJar(jar: Path, targetDirectory: Path, log: Logger) =
+	{
+		val targetJar = targetDirectory / jar.asFile.getName
+		runOption("copy jar", targetJar from jar, log)( FileUtilities.copyFile(jar, targetJar, log) ).toLeft(targetJar :: Nil)
+	}
+	/** Writes the XML string 'xmlString' to the file 'outputPath'.*/
+	private def writeXML(xmlString: String, outputPath: Path, log: Logger): Option[String] =
+		FileUtilities.write(outputPath.asFile, xmlString, log)
+	/** Writes the XML string 'xmlString' to the file 'outputPath' if the hashes are different.*/
+	private def writeXML(xml: Elem, outputPath: Path, log: Logger): Option[String] =
+	{
+		val xmlString = scala.xml.Utility.toXML(xml, false)
+		if(!outputPath.exists)
+		{
+			log.debug("JNLP file did not exist, writing inline XML to " + outputPath)
+			writeXML(xmlString, outputPath, log)
+		}
+		else
+		{
+			val result =
+				for( xmlHash <- Hash(xmlString, log).right; fileHash <- Hash(outputPath, log).right ) yield
+				{
+					if(xmlHash deepEquals fileHash)
+					{
+						log.debug("JNLP file " + outputPath + " uptodate.")
+						None
+					}
+					else
+					{
+						log.debug("Inline JNLP XML modified, updating file " + outputPath + ".")
+						writeXML(xmlString, outputPath, log)
+					}
+				}
+			result.fold(err => Some(err), x => x)
+		}
+	}
+	private def jarResource(isMain: Boolean)(jar: Path): WebstartJarResource =
+		new WebstartJarResource(jar.asFile.getName, jar.relativePathString("/"), isMain)
+	private def jarResources(mainJars: Iterable[Path], libraries: Iterable[Path]): Seq[WebstartJarResource] =
+		mainJars.map(jarResource(true)).toList ::: libraries.map(jarResource(false)).toList
+	
+	/** True iff 'directory' is an ancestor (strictly) of 'check'.*/
+	private def isInDirectory(directory: Path, check: Path) = Path.relativize(directory, check).isDefined && directory != check
+	/** Checks the paths in the given options for validity.  See the documentation for WebstartOptions.*/
+	private def verifyOptions(options: WebstartOptions)
+	{
+		import options._
+		require(isInDirectory(webstartOutputDirectory, webstartLibDirectory), 
+			"Webstart dependency directory (" + webstartLibDirectory + ") must be a subdirectory of webstart output directory (" +
+				webstartOutputDirectory + ").")
+		require(isInDirectory(webstartOutputDirectory, jnlpFile), "Webstart JNLP file output location (" + jnlpFile +
+			") must be in the webstart output directory (" + webstartOutputDirectory + ").")
+		for(wz <- webstartZip)
+			require(!isInDirectory(webstartOutputDirectory, wz),
+				"Webstart output zip location (" + wz + " cannot be in webstart output directory (" + webstartOutputDirectory + ").")
+	}
+}
+/** The default extension point for a webstart project.  There is one method that is required to be defined: jnlpXML.
+* 'webstartSignConfiguration', 'webstartPack200', and 'webstartGzip' are methods of interest. */
+abstract class DefaultWebstartProject(val info: ProjectInfo) extends BasicWebstartProject with MavenStyleWebstartPaths
+/** Defines default implementations of all methods in WebstartOptions except for jnlpXML.  packageAction is overridden
+* to create a webstart distribution after the normal package operation. */
+abstract class BasicWebstartProject extends BasicScalaProject with WebstartScalaProject with WebstartOptions with WebstartPaths
+{
+	def webstartSignConfiguration: Option[SignConfiguration] = None
+	
+	def webstartExtraLibraries = mainDependencies.scalaJars
+	def webstartLibraries = publicClasspath +++ jarsOfProjectDependencies
+	def webstartResources = descendents(jnlpResourcesPath ##, AllPassFilter)
+
+	def webstartPack200 = true
+	def webstartGzip = true
+	
+	override def packageAction = super.packageAction && webstartTask(this)
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/CommandParser.scala b/src/main/scala/sbt/impl/CommandParser.scala
new file mode 100644
index 000000000..b64011fed
--- /dev/null
+++ b/src/main/scala/sbt/impl/CommandParser.scala
@@ -0,0 +1,54 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt.impl
+
+import scala.util.parsing.combinator.Parsers
+import scala.util.parsing.input.CharSequenceReader
+import scala.util.parsing.input.CharArrayReader.EofCh
+
+/** Parses a command of the form:
+* identifier argument*
+* where argument may be quoted to include spaces and
+* quotes and backslashes should be escaped.
+* (Most of the complexity is for decent error handling.)*/
+private[sbt] object CommandParser extends Parsers
+{
+	type Elem = Char
+	def parse(commandString: String): Either[String, (String, List[String])] =
+	{
+		command(new CharSequenceReader(commandString.trim, 0)) match
+		{
+			case Success(id ~ args, next) => Right((id, args))
+			case err: NoSuccess =>
+			{
+				val pos = err.next.pos
+				Left("Could not parse command: (" + pos.line + "," + pos.column + "): " + err.msg)
+			}
+		}
+	}
+	def command = phrase(identifier ~! (argument*))
+	def identifier = unquoted | err("Expected identifier")
+	def argument = ( (whitespaceChar+) ~> (unquoted | quoted) )
+	
+	def unquoted: Parser[String] = ((unquotedChar ~! (unquotedMainChar*)) ^^ { case a ~ tail => (a :: tail).mkString("") })
+	def quoted: Parser[String] = quote ~> quotedChars <~ (quote | err("Missing closing quote character"))
+
+	def quotedChars: Parser[String] = (escape | nonescapeChar)*
+	def escape: Parser[Char] = backslash ~> (escapeChar | err("Illegal escape"))
+	def escapeChar: Parser[Char] = quote | backslash
+	def nonescapeChar: Parser[Char] = elem("", ch => !isEscapeChar(ch) && ch != EofCh)
+	def unquotedChar: Parser[Char] = elem("", ch => !isEscapeChar(ch) && !Character.isWhitespace(ch) && ch != EofCh)
+	def unquotedMainChar: Parser[Char] = unquotedChar | (errorIfEscape ~> failure(""))
+
+	private def errorIfEscape = (not(quote) | err("Unexpected quote character")) ~>
+		(not(backslash) | err("Escape sequences can only occur in a quoted argument"))
+
+	private def isEscapeChar(ch: Char) = ch == '\\' || ch == '"'
+	
+	def quote: Parser[Char] = '"'
+	def backslash: Parser[Char] = '\\'
+	def whitespaceChar: Parser[Char] = elem("whitespace", ch => Character.isWhitespace(ch))
+
+	private implicit def toString(p: Parser[List[Char]]): Parser[String] = p ^^ {_ mkString "" }
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/MapUtilities.scala b/src/main/scala/sbt/impl/MapUtilities.scala
new file mode 100644
index 000000000..66a56c98f
--- /dev/null
+++ b/src/main/scala/sbt/impl/MapUtilities.scala
@@ -0,0 +1,59 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+
+package sbt.impl
+
+import java.util.Properties
+import java.io.{File, FileInputStream, FileOutputStream, InputStream, OutputStream}
+import scala.collection.mutable.{HashMap, HashSet, ListBuffer, Map, Set}
+
+private[sbt] object PropertiesUtilities
+{
+	def write(properties: Properties, label: String, to: Path, log: Logger) =
+		FileUtilities.writeStream(to.asFile, log)(output => { properties.store(output, label); None })
+	def load(properties: Properties, from: Path, log: Logger): Option[String] =
+	{
+		val file = from.asFile
+		if(file.exists)
+			FileUtilities.readStream(file, log)( input => { properties.load(input); None })
+		else
+			None
+	}
+	def propertyNames(properties: Properties): Iterable[String] =
+		wrap.Wrappers.toList(properties.propertyNames).map(_.toString)
+}
+
+private[sbt] object MapUtilities
+{
+	def write[Key, Value](map: Map[Key, Value], label: String, to: Path, log: Logger)(implicit keyFormat: Format[Key], valueFormat: Format[Value]): Option[String] =
+	{
+		val properties = new Properties
+		map foreach { pair => properties.setProperty(keyFormat.toString(pair._1), valueFormat.toString(pair._2)) }
+		PropertiesUtilities.write(properties, label, to, log)
+	}
+	def read[Key, Value](map: Map[Key, Value], from: Path, log: Logger)(implicit keyFormat: Format[Key], valueFormat: Format[Value]): Option[String] =
+	{
+		map.clear
+		val properties = new Properties
+		PropertiesUtilities.load(properties, from, log) orElse
+		{
+			for(name <- PropertiesUtilities.propertyNames(properties))
+				map.put( keyFormat.fromString(name), valueFormat.fromString(properties.getProperty(name)))
+			None
+		}
+	}
+	def all[Key, Value](map: Map[Key, Set[Value]]): Iterable[Value] =
+		map.values.toList.flatMap(set => set.toList)
+	
+	def readOnlyIterable[Key, Value](i: Map[Key, Set[Value]]): Iterable[(Key, scala.collection.Set[Value])] =
+		for( (key, set) <- i.elements.toList) yield (key, wrap.Wrappers.readOnly(set))//.readOnly)
+		
+	def mark[Key, Value](source: Key, map: Map[Key, Set[Value]])
+	{
+		if(!map.contains(source))
+			map.put(source, new HashSet[Value])
+	}
+	def add[Key, Value](key: Key, value: Value, map: Map[Key, Set[Value]]): Unit =
+		map.getOrElseUpdate(key, new HashSet[Value]) + value
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
new file mode 100644
index 000000000..0d5373bfa
--- /dev/null
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -0,0 +1,353 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt
+
+import java.lang.{Process => JProcess, ProcessBuilder => JProcessBuilder}
+import java.io.{BufferedReader, Closeable, InputStream, InputStreamReader, IOException, OutputStream}
+import java.io.{PipedInputStream, PipedOutputStream}
+import java.io.{File, FileInputStream, FileOutputStream}
+import java.net.URL
+
+import scala.concurrent.ops.future
+import scala.concurrent.SyncVar
+
+/** Runs provided code in a new Thread and returns the Thread instance. */
+private object Spawn
+{
+	def apply(f: => Unit): Thread =
+	{
+		val thread = new Thread() { override def run() = { f } }
+		thread.start()
+		thread
+	}
+}
+
+private object BasicIO
+{
+	def apply(log: Logger) = new ProcessIO(ignoreOut, processFully(log, Level.Info), processFully(log, Level.Error))
+
+	def ignoreOut = (i: OutputStream) => ()
+	val BufferSize = 8192
+	def close(c: java.io.Closeable) = try { c.close() } catch { case _: java.io.IOException => () }
+	def processFully(log: Logger, level: Level.Value)(i: InputStream) { processFully(line => log.log(level, line))(i) }
+	def processFully(processLine: String => Unit)(i: InputStream)
+	{
+		val reader = new BufferedReader(new InputStreamReader(i))
+		def readFully()
+		{
+			val line = reader.readLine()
+			if(line != null)
+			{
+				processLine(line)
+				readFully()
+			}
+		}
+		readFully()
+	}
+	def standard: ProcessIO = new ProcessIO(ignoreOut, processFully(System.out.println), processFully(System.err.println))
+
+	def transferFully(in: InputStream, out: OutputStream)
+	{
+		val continueCount = 1//if(in.isInstanceOf[PipedInputStream]) 1 else 0
+		val buffer = new Array[Byte](BufferSize)
+		def read
+		{
+			val byteCount = in.read(buffer)
+			if(byteCount >= continueCount)
+			{
+				out.write(buffer, 0, byteCount)
+				read
+			}
+		}
+		read
+	}
+}
+
+
+private abstract class AbstractProcessBuilder extends ProcessBuilder
+{
+	def #&&(other: ProcessBuilder): ProcessBuilder = new AndProcessBuilder(this, other)
+	def #||(other: ProcessBuilder): ProcessBuilder = new OrProcessBuilder(this, other)
+	def #|(other: ProcessBuilder): ProcessBuilder =
+	{
+		require(other.canPipeTo, "Piping to multiple processes is not supported.")
+		new PipedProcessBuilder(this, other, false)
+	}
+	def ##(other: ProcessBuilder): ProcessBuilder = new SequenceProcessBuilder(this, other)
+	
+	def #< (f: File): ProcessBuilder = new PipedProcessBuilder(new FileInput(f), this, false)
+	def #< (url: URL): ProcessBuilder = new PipedProcessBuilder(new URLInput(url), this, false)
+	def #> (f: File): ProcessBuilder = new PipedProcessBuilder(this, new FileOutput(f, false), false)
+	def #>> (f: File): ProcessBuilder = new PipedProcessBuilder(this, new FileOutput(f, true), true)
+	
+	def run(): Process = run(BasicIO.standard)
+	def run(log: Logger): Process = run(BasicIO(log))
+	
+	def ! = run().exitValue()
+	def !(log: Logger) =
+	{
+		val log2 = new BufferedLogger(log)
+		log2.startRecording()
+		try { run(log2).exitValue() }
+		finally { log2.playAll(); log2.clearAll() }
+	}
+	def !(io: ProcessIO) = run(io).exitValue()
+
+	def canPipeTo = false
+}
+private[sbt] class URLBuilder(url: URL) extends URLPartialBuilder
+{
+	def #>(b: ProcessBuilder): ProcessBuilder = b #< url
+	def #>>(file: File): ProcessBuilder = toFile(file, true)
+	def #>(file: File): ProcessBuilder = toFile(file, false)
+	private def toFile(file: File, append: Boolean) = new PipedProcessBuilder(new URLInput(url), new FileOutput(file, append), false)
+}
+private[sbt] class FileBuilder(base: File) extends FilePartialBuilder
+{
+	def #>(b: ProcessBuilder): ProcessBuilder = b #< base
+	def #<(b: ProcessBuilder): ProcessBuilder = b #> base
+	def #<(url: URL): ProcessBuilder = new URLBuilder(url) #> base
+	def #>>(file: File): ProcessBuilder = pipe(base, file, true)
+	def #>(file: File): ProcessBuilder = pipe(base, file, false)
+	def #<(file: File): ProcessBuilder = pipe(file, base, false)
+	def #<<(file: File): ProcessBuilder = pipe(file, base, true)
+	private def pipe(from: File, to: File, append: Boolean) = new PipedProcessBuilder(new FileInput(from), new FileOutput(to, append), false)
+}
+
+private abstract class BasicBuilder extends AbstractProcessBuilder
+{
+	protected[this] def checkNotThis(a: ProcessBuilder) = require(a != this, "Compound process '" + a + "' cannot contain itself.")
+	final def run(io: ProcessIO): Process =
+	{
+		val p = createProcess(io)
+		p.start()
+		p
+	}
+	protected[this] def createProcess(io: ProcessIO): BasicProcess
+}
+private abstract class BasicProcess extends Process
+{
+	def start(): Unit
+}
+
+private abstract class CompoundProcess extends BasicProcess
+{
+	def destroy() { destroyer() }
+	def exitValue() = getExitValue().getOrElse(error("No exit code: process destroyed."))
+
+	def start() = getExitValue
+	
+	protected lazy val (getExitValue, destroyer) =
+	{
+		val code = new SyncVar[Option[Int]]()
+		code.set(None)
+		val thread = Spawn(code.set(runAndExitValue()))
+		
+		(
+			future { thread.join(); code.get },
+			() => thread.interrupt()
+		)
+	}
+	
+	/** Start and block until the exit value is available and then return it in Some.  Return None if destroyed (use 'run')*/
+	protected[this] def runAndExitValue(): Option[Int]
+
+	protected[this] def runInterruptible[T](action: => T)(destroyImpl: => Unit): Option[T] =
+	{
+		try { Some(action) }
+		catch { case _: InterruptedException => destroyImpl; None }
+	}
+}
+
+private abstract class SequentialProcessBuilder(a: ProcessBuilder, b: ProcessBuilder, operatorString: String) extends BasicBuilder
+{
+	checkNotThis(a)
+	checkNotThis(b)
+	override def toString = " ( " + a + " " + operatorString + " " + b + " ) "
+}
+private class PipedProcessBuilder(first: ProcessBuilder, second: ProcessBuilder, toError: Boolean) extends SequentialProcessBuilder(first, second, if(toError) "#|!" else "#|")
+{
+	override def createProcess(io: ProcessIO) = new PipedProcesses(first, second, io, toError)
+}
+private class AndProcessBuilder(first: ProcessBuilder, second: ProcessBuilder) extends SequentialProcessBuilder(first, second, "#&&")
+{
+	override def createProcess(io: ProcessIO) = new AndProcess(first, second, io)
+}
+private class OrProcessBuilder(first: ProcessBuilder, second: ProcessBuilder) extends SequentialProcessBuilder(first, second, "#||")
+{
+	override def createProcess(io: ProcessIO) = new OrProcess(first, second, io)
+}
+private class SequenceProcessBuilder(first: ProcessBuilder, second: ProcessBuilder) extends SequentialProcessBuilder(first, second, "##")
+{
+	override def createProcess(io: ProcessIO) = new ProcessSequence(first, second, io)
+}
+
+private class SequentialProcess(a: ProcessBuilder, b: ProcessBuilder, io: ProcessIO, evaluateSecondProcess: Int => Boolean) extends CompoundProcess
+{
+	protected[this] override def runAndExitValue() =
+	{
+		val first = a.run(io)
+		runInterruptible(first.exitValue)(first.destroy()) flatMap
+		{ codeA =>
+			if(evaluateSecondProcess(codeA))
+			{
+				val second = b.run(io)
+				runInterruptible(second.exitValue)(second.destroy())
+			}
+			else
+				Some(codeA)
+		}
+	}
+}
+private class AndProcess(a: ProcessBuilder, b: ProcessBuilder, io: ProcessIO) extends SequentialProcess(a, b, io, _ == 0)
+private class OrProcess(a: ProcessBuilder, b: ProcessBuilder, io: ProcessIO) extends SequentialProcess(a, b, io, _ != 0)
+private class ProcessSequence(a: ProcessBuilder, b: ProcessBuilder, io: ProcessIO) extends SequentialProcess(a, b, io, ignore => true)
+
+
+private class PipedProcesses(a: ProcessBuilder, b: ProcessBuilder, defaultIO: ProcessIO, toError: Boolean) extends CompoundProcess
+{
+	protected[this] override def runAndExitValue() =
+	{
+		val currentSource = new SyncVar[Option[InputStream]]
+		val pipeOut = new PipedOutputStream
+		val source = new PipeSource(currentSource, pipeOut, a.toString)
+		source.start()
+		
+		val pipeIn = new PipedInputStream(pipeOut)
+		val currentSink = new SyncVar[Option[OutputStream]]
+		val sink = new PipeSink(pipeIn, currentSink, b.toString)
+		sink.start()
+
+		def handleOutOrError(fromOutput: InputStream) = currentSource.put(Some(fromOutput))
+
+		val firstIO =
+			if(toError)
+				defaultIO.withError(handleOutOrError)
+			else
+				defaultIO.withOutput(handleOutOrError)
+		val secondIO = defaultIO.withInput(toInput => currentSink.put(Some(toInput)) )
+		
+		val second = b.run(secondIO)
+		val first = a.run(firstIO)
+		try
+		{
+			runInterruptible {
+				first.exitValue
+				currentSource.put(None)
+				currentSink.put(None)
+				val result = second.exitValue
+				result
+			} {
+				first.destroy()
+				second.destroy()
+			}
+		}
+		finally
+		{
+			BasicIO.close(pipeIn)
+			BasicIO.close(pipeOut)
+		}
+	}
+}
+private class PipeSource(currentSource: SyncVar[Option[InputStream]], pipe: PipedOutputStream, label: => String) extends Thread
+{
+	final override def run()
+	{
+		currentSource.get match
+		{
+			case Some(source) =>
+				try { BasicIO.transferFully(source, pipe) }
+				catch { case e: IOException => println("I/O error " + e.getMessage + " for process: " + label); e.printStackTrace() }
+				finally
+				{
+					BasicIO.close(source)
+					currentSource.unset()
+				}
+				run()
+			case None =>
+				currentSource.unset()
+				BasicIO.close(pipe)
+		}
+	}
+}
+private class PipeSink(pipe: PipedInputStream, currentSink: SyncVar[Option[OutputStream]], label: => String) extends Thread
+{
+	final override def run()
+	{
+		currentSink.get match
+		{
+			case Some(sink) =>
+				try { BasicIO.transferFully(pipe, sink) }
+				catch { case e: IOException => println("I/O error " + e.getMessage + " for process: " + label); e.printStackTrace() }
+				finally
+				{
+					BasicIO.close(sink)
+					currentSink.unset()
+				}
+				run()
+			case None =>
+				currentSink.unset()
+		}
+	}
+}
+
+
+/** Represents a simple command without any redirection or combination. */
+private[sbt] class SimpleProcessBuilder(p: JProcessBuilder) extends AbstractProcessBuilder
+{
+	override def run(io: ProcessIO): Process =
+	{
+		val process = p.start() // start the external process
+		import io.{writeInput, processOutput, processError}
+		// spawn threads that process the input, output, and error streams using the functions defined in `io`
+		val inThread = Spawn(writeInput(process.getOutputStream))
+		val outThread = Spawn(processOutput(process.getInputStream))
+		val errorThread =
+			if(!p.redirectErrorStream)
+				Spawn(processError(process.getErrorStream)) :: Nil
+			else
+				Nil
+		new SimpleProcess(process, inThread :: outThread :: errorThread)
+	}
+	override def toString = p.command.toString
+	override def canPipeTo = true
+}
+/** A thin wrapper around a java.lang.Process.  `ioThreads` are the Threads created to do I/O.
+* The implementation of `exitValue` waits until these threads die before returning. */
+private class SimpleProcess(p: JProcess, ioThreads: Iterable[Thread]) extends Process
+{
+	override def exitValue() =
+	{
+		p.waitFor() // wait for the process to terminate
+		ioThreads.foreach(_.join()) // this ensures that all output is complete before returning (waitFor does not ensure this)
+		p.exitValue()
+	}
+	override def destroy() = p.destroy()
+}
+
+private class FileOutput(file: File, append: Boolean) extends OutputStreamBuilder(new FileOutputStream(file, append), file.getAbsolutePath)
+private class URLInput(url: URL) extends InputStreamBuilder(url.openStream, url.toString)
+private class FileInput(file: File) extends InputStreamBuilder(new FileInputStream(file), file.getAbsolutePath)
+
+private class OutputStreamBuilder(stream: => OutputStream, label: String) extends ThreadProcessBuilder(label, _.writeInput(stream))
+private class InputStreamBuilder(stream: => InputStream, label: String) extends ThreadProcessBuilder(label, _.processOutput(stream))
+
+private abstract class ThreadProcessBuilder(override val toString: String, runImpl: ProcessIO => Unit) extends AbstractProcessBuilder
+{
+	override def run(io: ProcessIO): Process =
+	{
+		val success = new SyncVar[Boolean]
+		success.put(false)
+		new ThreadProcess(Spawn {runImpl(io); success.set(true) }, success)
+	}
+}
+private class ThreadProcess(thread: Thread, success: SyncVar[Boolean]) extends Process
+{
+	override def exitValue() =
+	{
+		thread.join()
+		if(success.get) 0 else 1
+	}
+	override def destroy() { thread.interrupt() }
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/RunTask.scala b/src/main/scala/sbt/impl/RunTask.scala
new file mode 100644
index 000000000..8b87e4143
--- /dev/null
+++ b/src/main/scala/sbt/impl/RunTask.scala
@@ -0,0 +1,164 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+ package sbt.impl
+
+import scala.collection.{immutable, mutable}
+import scala.collection.Map
+import sbt.wrap.Wrappers.identityMap
+
+private[sbt] object RunTask
+{
+	final type Task = Project#Task
+	def apply(root: Task, rootName: String): List[WorkFailure[Task]]  = apply(root, rootName, true)
+	def apply(root: Task, rootName: String, parallelExecution: Boolean): List[WorkFailure[Task]] =
+		apply(root, rootName, if(parallelExecution) Runtime.getRuntime.availableProcessors else 1)
+	def apply(root: Task, rootName: String, maximumTasks: Int): List[WorkFailure[Task]]  = (new RunTask(root, rootName, maximumTasks)).run()
+}
+import RunTask._
+private final class RunTask(root: Task, rootName: String, maximumTasks: Int) extends NotNull
+{
+	require(maximumTasks >= 1)
+	def parallel = maximumTasks > 1
+	def multiProject = allProjects.size >= 2
+	def run(): List[WorkFailure[Task]]  =
+	{
+		try
+		{
+			runTasksExceptRoot() match
+			{
+				case Nil =>
+					val result = runTask(root, rootName)
+					result.map( errorMessage => WorkFailure(root, "Error running " + rootName + ": " + errorMessage) ).toList
+				case failures => failures
+			}
+		}
+		finally
+		{
+			for(project <- allProjects; saveError <- project.saveEnvironment)
+				project.log.warn("Could not save properties for project " + project.name + ": " + saveError)
+		}
+	}
+	// This runs all tasks except the root.task.
+	// It uses a buffered logger in record mode to ensure that all output for a given task is consecutive
+	// it ignores the root task so that the root task may be run with buffering disabled so that the output
+	// occurs without delay.
+	private def runTasksExceptRoot() =
+	{
+		withBuffered(_.startRecording())
+		try { ParallelRunner.run(expandedRoot, expandedTaskName, runIfNotRoot, maximumTasks, (t: Task) => t.manager.log) }
+		finally { withBuffered(_.stop()) }
+	}
+	private def withBuffered(f: BufferedLogger => Unit)
+	{
+		for(buffered <- bufferedLoggers)
+			Control.trap(f(buffered))
+	}
+	/** Will be called in its own thread. Runs the given task if it is not the root task.*/
+	private def runIfNotRoot(action: Task): Option[String] =
+	{
+		if(isRoot(action))
+			None
+		else
+			runTask(action, expandedTaskName(action))
+	}
+	private def isRoot(t: Task) = t == expandedRoot
+	/** Will be called in its own thread except for the root task. */
+	private def runTask(action: Task, actionName: String): Option[String] =
+	{
+		val label = if(multiProject) (action.manager.name + " / " + actionName) else actionName
+		def banner(event: ControlEvent.Value, firstSeparator: String, secondSeparator: String) =
+			Control.trap(action.manager.log.control(event, firstSeparator + " " + label + " " + secondSeparator))
+		if(parallel)
+		{
+			try { banner(ControlEvent.Start, "\n  ", "...") }
+			finally { flush(action) }
+		}
+		banner(ControlEvent.Header, "\n==", "==")
+		try { action.invoke }
+		catch { case e: Exception => action.manager.log.trace(e); Some(e.toString) }
+		finally
+		{
+			banner(ControlEvent.Finish, "==", "==")
+			if(parallel)
+				flush(action)
+		}
+	}
+	private def trapFinally(toTrap: => Unit)(runFinally: => Unit)
+	{
+		try { toTrap }
+		catch { case e: Exception => () }
+		finally { try { runFinally } catch { case e: Exception => () } }
+	}
+	private def flush(action: Task)
+	{
+		for(buffered <- bufferedLogger(action.manager))
+			Control.trap(flush(buffered))
+	}
+	private def flush(buffered: BufferedLogger)
+	{
+		buffered.play()
+		buffered.clear()
+	}
+
+	/* Most of the following is for implicitly adding dependencies (see the expand method)*/
+	private val projectDependencyCache = identityMap[Project, Iterable[Project]]
+	private def dependencies(project: Project) = projectDependencyCache.getOrElseUpdate(project, project.topologicalSort.dropRight(1))
+
+	private val expandedCache = identityMap[Task, Task]
+	private def expanded(task: Task): Task = expandedCache.getOrElseUpdate(task, expandImpl(task))
+
+	private val expandedTaskNameCache = identityMap[Task, String]
+	private def expandedTaskName(task: Task) =
+		if(task == expandedRoot)
+			rootName
+		else
+			expandedTaskNameCache.getOrElse(task, task.name)
+
+	private val nameToTaskCache = identityMap[Project, Map[String, Task]]
+	private def nameToTaskMap(project: Project): Map[String, Task] = nameToTaskCache.getOrElseUpdate(project, project.tasks)
+	private def taskForName(project: Project, name: String): Option[Task] = nameToTaskMap(project).get(name)
+	
+	private val taskNameCache = identityMap[Project, Map[Task, String]]
+	private def taskName(task: Task) =
+	{
+		val project = task.manager
+		taskNameCache.getOrElseUpdate(project, taskNameMap(project)).get(task)
+	}
+	
+	private val expandedRoot = expand(root)
+	private val allTasks = expandedRoot.topologicalSort
+	private val allProjects = Set(allTasks.map(_.manager).toSeq : _*)
+	private val bufferedLoggers = if(parallel) allProjects.toList.flatMap(bufferedLogger) else Nil
+	
+	/** Adds implicit dependencies, which are tasks with the same name in the project dependencies
+	* of the enclosing project of the task.*/
+	private def expand(root: Task): Task = expanded(root)
+	private def expandImpl(task: Task): Task =
+	{
+		val nameOption = taskName(task)
+		val explicitDependencies = task.dependencies
+		val implicitDependencies = nameOption.map(name => dependencies(task.manager).flatMap(noninteractiveTask(name)) ).getOrElse(Nil)
+		val allDependencies = mutable.HashSet( (explicitDependencies ++ implicitDependencies).toSeq  : _* )
+		val expandedTask = task.setDependencies(allDependencies.toList.map(expanded))
+		nameOption.foreach(name => expandedTaskNameCache(expandedTask) = name)
+		expandedTask
+	}
+	private def noninteractiveTask(name: String)(project: Project): Option[Task] =
+		taskForName(project, name) flatMap { task =>
+			if(task.interactive)
+			{
+				project.log.debug("Not including task " + name + " in project " + project.name + ": interactive tasks can only be run directly.")
+				None
+			}
+			else
+				Some(task)
+		}
+	private def taskNameMap(project: Project) = mutable.Map(nameToTaskMap(project).map(_.swap).toSeq : _*)
+	private def bufferedLogger(project: Project): Option[BufferedLogger] =
+		project.log match
+		{
+			case buffered: BufferedLogger => Some(buffered)
+			case _ => None
+		}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/SelectMainClass.scala b/src/main/scala/sbt/impl/SelectMainClass.scala
new file mode 100644
index 000000000..f24b5deee
--- /dev/null
+++ b/src/main/scala/sbt/impl/SelectMainClass.scala
@@ -0,0 +1,44 @@
+package sbt.impl
+
+private[sbt] object SelectMainClass
+{
+	def apply(promptIfMultipleChoices: Boolean, mainClasses: List[String]) =
+	{
+		mainClasses match
+		{
+			case Nil => None
+			case head :: Nil => Some(head)
+			case multiple =>
+				if(promptIfMultipleChoices)
+				{
+					println("\nMultiple main classes detected, select one to run:\n")
+					for( (className, index) <- multiple.zipWithIndex )
+						println(" [" + (index+1) + "] " + className)
+					val line = trim(SimpleReader.readLine("\nEnter number: "))
+					println("")
+					toInt(line, multiple.length) map multiple.apply
+				}
+				else
+					None
+		}
+	}
+	private def trim(s: Option[String]) = s.getOrElse("")
+	private def toInt(s: String, size: Int) =
+		try
+		{
+			val i = s.toInt
+			if(i > 0 && i <= size)
+				Some(i-1)
+			else
+			{
+				println("Number out of range: was " + i + ", expected number between 1 and " + size)
+				None
+			}
+		}
+		catch
+		{
+			case nfe: NumberFormatException =>
+				println("Invalid number: " + nfe.toString)
+				None
+		}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/TestFrameworkImpl.scala b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
new file mode 100755
index 000000000..2603eed3f
--- /dev/null
+++ b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
@@ -0,0 +1,186 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Steven Blundy, Mark Harrah
+ */
+
+package sbt.impl
+
+import scala.xml.{Elem, Group}
+
+/* The following classes run tests for their associated test framework.
+* NOTE #1: DO NOT actively use these classes.  Only specify their names to LazyTestFramework
+*  for reflective loading.  This allows using the test libraries provided on the
+*  project classpath instead of requiring global versions.
+* NOTE #2: Keep all active uses of these test frameworks inside these classes so that sbt
+*  runs without error when a framework is not available at runtime and no tests for that
+*  framework are defined.*/
+
+/** The test runner for ScalaCheck tests. */
+private[sbt] class ScalaCheckRunner(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
+{
+	import org.scalacheck.{Pretty, Properties, Test}
+	def runTest(testClassName: String): Result.Value =
+	{
+		val test = ModuleUtilities.getObject(testClassName, testLoader).asInstanceOf[Properties]
+		if(Test.checkProperties(test, Test.defaultParams, propReport, testReport).find(!_._2.passed).isEmpty)
+			Result.Passed
+		else
+			Result.Failed
+	}
+	private def propReport(pName: String, s: Int, d: Int) {}
+	private def testReport(pName: String, res: Test.Result) =
+	{
+		if(res.passed)
+			fire(PassedEvent(pName, Pretty.pretty(res)))
+		else
+			fire(FailedEvent(pName, Pretty.pretty(res)))
+	}
+}
+/** The test runner for ScalaTest suites. */
+private[sbt] class ScalaTestRunner(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
+{
+	def runTest(testClassName: String): Result.Value =
+	{
+		import org.scalatest.{Stopper, Suite}
+		val testClass = Class.forName(testClassName, true, testLoader).asSubclass(classOf[Suite])
+		val test = testClass.newInstance
+		val reporter = new ScalaTestReporter
+		val stopper = new Stopper { override def stopRequested = false }
+		test.execute(None, reporter, stopper, Set.empty, Set("org.scalatest.Ignore"), Map.empty, None)
+		if(reporter.succeeded)
+			Result.Passed
+		else
+			Result.Failed
+	}
+	
+	/** An implementation of Reporter for ScalaTest. */
+	private class ScalaTestReporter extends org.scalatest.Reporter with NotNull
+	{
+		import org.scalatest.Report
+		override def testIgnored(report: Report) =
+		{
+			if(report.message.trim.isEmpty) fire(IgnoredEvent(report.name, None))
+			else fire(IgnoredEvent(report.name, Some(report.message.trim)))
+		}
+		override def testStarting(report: Report) { info(report, "Test starting", None) }
+		override def testSucceeded(report: Report) { info(report, "Test succeeded", Some(Result.Passed)) }
+		override def testFailed(report: Report)
+		{
+			succeeded = false
+			error(report, "Test failed", Some(Result.Failed))
+		}
+		
+		override def infoProvided(report : Report) { info(report, "", None) }
+		
+		override def suiteStarting(report: Report) { info(report, "Suite starting", None) }
+		override def suiteCompleted(report: Report) { info(report, "Suite completed", None) }
+		override def suiteAborted(report: Report) { error(report, "Suite aborted", None) }
+		
+		override def runStarting(testCount: Int) { fire(MessageEvent("Run starting")) }
+		override def runStopped()
+		{
+			succeeded = false
+			fire(ErrorEvent("Run stopped"))
+		}
+		override def runAborted(report: Report)
+		{
+			succeeded = false
+			error(report, "Run aborted", None)
+		}
+		override def runCompleted() { log.info("Run completed.") }
+		
+		private def error(report: Report, event: String, result: Option[Result.Value]) { logReport(report, event, result, Level.Error) }
+		private def info(report: Report, event: String, result: Option[Result.Value]) { logReport(report, event, result, Level.Info) }
+		private def logReport(report: Report, event: String, result: Option[Result.Value], level: Level.Value)
+		{
+			level match
+			{
+				case Level.Error =>
+					if(report.message.trim.isEmpty)
+						fire(TypedErrorEvent(report.name, event, None, report.throwable)(result))
+					else
+						fire(TypedErrorEvent(report.name, event, Some(report.message.trim), report.throwable)(result))
+				case Level.Info =>
+					if(report.message.trim.isEmpty)
+						fire(TypedEvent(report.name, event, None)(result))
+					else
+						fire(TypedEvent(report.name, event, Some(report.message.trim))(result))
+				case l => log.warn("Level not expected:" + l)
+			}
+		}
+		
+		var succeeded = true
+	}
+}
+/** The test runner for specs tests. */
+private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
+{
+	import org.specs.Specification
+	import org.specs.specification.{Example, Sus}
+
+	def runTest(testClassName: String): Result.Value =
+	{
+		val test = ModuleUtilities.getObject(testClassName, testLoader).asInstanceOf[Specification]
+		val event = reportSpecification(test)
+		fire(event)
+		if(test.isFailing)
+			Result.Failed
+		else
+			Result.Passed
+	}
+	
+	/* The following is closely based on org.specs.runner.OutputReporter,
+	* part of specs, which is Copyright 2007-2008 Eric Torreborre.
+	* */
+	
+	private def reportSpecification(spec: Specification): SpecificationReportEvent =
+	{
+		 // this is for binary compatibility between specs 1.4.x and 1.5.0: the ancestor of Specification containing these two methods changed
+		val reflectedSpec: { def systems: Seq[Sus]; def subSpecifications: Seq[Specification] } = spec
+		
+		return SpecificationReportEvent(spec.successes.size, spec.failures.size, spec.errors.size, spec.skipped.size, spec.pretty,
+			reportSystems(reflectedSpec.systems), reportSpecifications(reflectedSpec.subSpecifications))
+	}
+	private def reportSpecifications(specifications: Seq[Specification]): Seq[SpecificationReportEvent] =
+	{
+		for(specification <- specifications) yield
+			reportSpecification(specification)
+	}
+	private def reportSystems(systems: Seq[Sus]): Seq[SystemReportEvent] =
+	{
+		for(system <- systems) yield
+			reportSystem(system)
+	}
+	private def reportSystem(sus: Sus): SystemReportEvent =
+	{
+		def format =
+		{
+			class ElemDesc(e: Elem) { def desc = e.child }
+			implicit def elemToDesc(e: Elem): ElemDesc = new ElemDesc(e)
+			
+			for(description <- sus.literateDescription) yield
+			{
+				// for source compatibility between specs 1.4.x and 1.5.0:
+				// in specs 1.5.0, description is LiterateDescription
+				// in specs < 1.5.0, description is Elem
+				// LiterateDescription.desc is a Node
+				// Elem.child is a Seq[Node]
+				// each has a map[T](f: Node => T): Seq[T] defined so we implicitly convert
+				// an Elem e to an intermediate object that has desc defined to be e.child
+				
+				//description.child.map(_.text) // Elem equivalent
+				description.desc.map(_.text)  // LiterateDescription
+			}
+		}
+
+		SystemReportEvent(sus.description, sus.verb, sus.skippedSus, format, reportExamples(sus.examples))
+	}
+	private def reportExamples(examples: Seq[Example]): Seq[ExampleReportEvent] =
+	{
+		for(example <- examples) yield
+			reportExample(example)
+	}
+	private def reportExample(example: Example): ExampleReportEvent =
+	{
+		ExampleReportEvent(example.description, example.errors, example.failures, example.skipped, reportExamples(example.subExamples))
+	}
+}
diff --git a/src/main/scala/sbt/impl/TestParser.scala b/src/main/scala/sbt/impl/TestParser.scala
new file mode 100644
index 000000000..69c7b5c72
--- /dev/null
+++ b/src/main/scala/sbt/impl/TestParser.scala
@@ -0,0 +1,47 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+/* The following implements the simple syntax for storing test definitions.
+* The syntax is:
+*
+* definition := isModule? className separator className
+* isModule := '<module>'
+* separator := '<<'
+*/
+
+import scala.util.parsing.combinator._
+
+import TestParser._
+/** Represents a test implemented by 'testClassName' of type 'superClassName'.*/
+final case class TestDefinition(isModule: Boolean, testClassName: String, superClassName: String) extends NotNull
+{
+	override def toString =
+		(if(isModule) IsModuleLiteral else "") + testClassName + SubSuperSeparator + superClassName
+}
+final class TestParser extends RegexParsers with NotNull
+{
+	def test: Parser[TestDefinition] =
+		( isModule ~! className ~! SubSuperSeparator ~! className ) ^^
+			{ case module ~ testName ~ SubSuperSeparator ~ superName => TestDefinition(module, testName.trim, superName.trim) }
+	def isModule: Parser[Boolean] = (IsModuleLiteral?) ^^ (_.isDefined)
+	def className: Parser[String] = ClassNameRegexString.r
+	
+	def parse(testDefinitionString: String): Either[String, TestDefinition] =
+	{
+		def parseError(msg: String) = Left("Could not parse test definition '" + testDefinitionString + "': " + msg)
+		parseAll(test, testDefinitionString) match
+		{
+			case Success(result, next) => Right(result)
+			case err: NoSuccess => parseError(err.msg)
+		}
+	}
+}
+object TestParser
+{
+	val IsModuleLiteral = "<module>"
+	val SubSuperSeparator = "<<"
+	val ClassNameRegexString = """[^<]+"""
+	def parse(testDefinitionString: String): Either[String, TestDefinition] = (new TestParser).parse(testDefinitionString)
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/TestStatusReporter.scala b/src/main/scala/sbt/impl/TestStatusReporter.scala
new file mode 100644
index 000000000..dddf0eb5a
--- /dev/null
+++ b/src/main/scala/sbt/impl/TestStatusReporter.scala
@@ -0,0 +1,74 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.impl
+
+import java.io.File
+import scala.collection.mutable.{HashMap, Map}
+
+/** Only intended to be used once per instance. */
+private[sbt] class TestStatusReporter(path: Path, log: Logger) extends TestsListener
+{
+	private lazy val succeeded: Map[String, Long] = TestStatus.read(path, log)
+
+	def doInit {}
+	def startGroup(name: String) { succeeded removeKey name }
+	def testEvent(event: TestEvent) {}
+	def endGroup(name: String, t: Throwable) {}
+	def endGroup(name: String, result: Result.Value)
+	{
+		if(result == Result.Passed)
+			succeeded(name) = System.currentTimeMillis
+	}
+	def doComplete(finalResult: Result.Value) { complete() }
+	def doComplete(t: Throwable) { complete() }
+	
+	private def complete()
+	{
+		TestStatus.write(succeeded, "Successful Tests", path, log)
+	}
+}
+
+private[sbt] class TestQuickFilter(testAnalysis: CompileAnalysis, failedOnly: Boolean, path: Path, log: Logger) extends (String => Boolean) with NotNull
+{
+	private lazy val exclude = TestStatus.read(path, log)
+	private lazy val map = testAnalysis.testSourceMap
+	def apply(test: String) =
+		exclude.get(test) match
+		{
+			case None => true // include because this test has not been run or did not succeed
+			case Some(lastSuccessTime) => // succeeded the last time it was run
+				if(failedOnly)
+					false // don't include because the last time succeeded
+				else
+					testAnalysis.products(map(test)) match
+					{
+						case None => true
+						case Some(products) => products.exists(lastSuccessTime <= _.lastModified) // include if the test is newer than the last run
+					}
+		}
+}
+private object TestStatus
+{
+	import java.util.Properties
+	def read(path: Path, log: Logger): Map[String, Long] =
+	{
+		val map = new HashMap[String, Long]
+		val properties = new Properties
+		logError(PropertiesUtilities.load(properties, path, log), "loading", log)
+		for(test <- PropertiesUtilities.propertyNames(properties))
+			map.put(test, properties.getProperty(test).toLong)
+		map
+	}
+	def write(map: Map[String, Long], label: String, path: Path, log: Logger)
+	{
+		val properties = new Properties
+		for( (test, lastSuccessTime) <- map)
+			properties.setProperty(test, lastSuccessTime.toString)
+		logError(PropertiesUtilities.write(properties, label, path, log), "writing", log)
+	}
+	private def logError(result: Option[String], action: String, log: Logger)
+	{
+		result.foreach(msg => log.error("Error " + action + " test status: " + msg))
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/wrap/Wrappers.scala b/src/main/scala/sbt/wrap/Wrappers.scala
new file mode 100644
index 000000000..34f0ba55b
--- /dev/null
+++ b/src/main/scala/sbt/wrap/Wrappers.scala
@@ -0,0 +1,112 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+package sbt.wrap
+
+// This file exists for compatibility between Scala 2.7.x and 2.8.0
+
+import java.util.{Map => JMap, Set => JSet}
+
+private[sbt] object Wrappers
+{
+	def identityMap[K,V] = new MutableMapWrapper(new java.util.IdentityHashMap[K,V])
+	def weakMap[K,V] = new MutableMapWrapper(new java.util.WeakHashMap[K,V])
+	def toList[K,V](s: java.util.Map[K,V]): List[(K,V)] = toList(s.entrySet).map(e => (e.getKey, e.getValue))
+	def toList[T](s: java.util.Collection[T]): List[T] = toList(s.iterator)
+	def toList[T](s: java.util.Iterator[T]): List[T] =
+	{
+		def add(l: List[T]): List[T] =
+			if(s.hasNext)
+				add(s.next() :: l)
+			else
+				l
+		add(Nil).reverse
+	}
+	def toList[T](s: java.util.Enumeration[T]): List[T] =
+	{
+		def add(l: List[T]): List[T] =
+			if(s.hasMoreElements)
+				add(s.nextElement() :: l)
+			else
+				l
+		add(Nil).reverse
+	}
+	def readOnly[K,V](map: scala.collection.mutable.Map[K,V]): scala.collection.Map[K,V] = map//.readOnly
+	def readOnly[T](set: scala.collection.mutable.Set[T]): scala.collection.Set[T] = set//.readOnly
+	def readOnly[T](buffer: scala.collection.mutable.Buffer[T]): Seq[T] = buffer//.readOnly
+}
+
+private[sbt] sealed abstract class Iterable[T] extends NotNull
+{
+	def foreach(f: T => Unit) = toList.foreach(f)
+	def toList: List[T]
+}
+private[sbt] sealed trait Removable[T] extends NotNull
+{
+	def -=(t: T) : Unit
+	def --=(all: Iterable[T]) { all.foreach(-=) }
+	def --=(all: scala.Iterable[T]) { all.foreach(-=) }
+}
+private[sbt] sealed trait Addable[T] extends NotNull
+{
+	def +=(t: T) : Unit
+	def ++=(all: Iterable[T]) { all.foreach(+=) }
+	def ++=(all: scala.Iterable[T]) { all.foreach(+=) }
+}
+private[sbt] sealed abstract class Set[T] extends Iterable[T]
+{
+	def contains(t: T): Boolean
+}
+private[sbt] sealed class SetWrapper[T](val underlying: JSet[T]) extends Set[T]
+{
+	def contains(t: T) = underlying.contains(t)
+	def toList =Wrappers.toList(underlying.iterator)
+}
+private[sbt] final class MutableSetWrapper[T](wrapped: JSet[T]) extends SetWrapper[T](wrapped) with Addable[T] with Removable[T]
+{
+	def +=(t: T) { underlying.add(t) }
+	def -=(t: T) { underlying.remove(t) }
+	def readOnly: Set[T] = this
+}
+private[sbt] sealed abstract class Map[K,V] extends Iterable[(K,V)]
+{
+	def apply(key: K): V
+	def get(key: K): Option[V]
+	final def getOrElse[V2 >: V](key: K, default: => V2): V2 =
+		get(key) match
+		{
+			case Some(value) => value
+			case None => default
+		}
+}
+private[sbt] sealed abstract class MapWrapper[K,V](val underlying: JMap[K,V]) extends Map[K,V]
+{
+	final def apply(key: K) = underlying.get(key)
+	final def get(key: K) =
+	{
+		val value = underlying.get(key)
+		if(value == null)
+			None
+		else
+			Some(value)
+	}
+	final def toList = Wrappers.toList(underlying)
+	final def values = toList.map(_._2)
+}
+private[sbt] sealed class MutableMapWrapper[K,V](wrapped: JMap[K,V]) extends MapWrapper[K,V](wrapped) with Removable[K] with Addable[(K,V)]
+{
+	final def getOrElseUpdate(key: K, default: => V): V =
+		get(key) match
+		{
+			case Some(value) => value
+			case None =>
+				val newValue = default
+				underlying.put(key, newValue)
+				newValue
+		}
+	final def clear() = underlying.clear()
+	final def update(key: K, value: V) { underlying.put(key, value) }
+	final def +=(pair: (K, V) ) { update(pair._1, pair._2) }
+	final def -=(key: K) { underlying.remove(key) }
+	final def readOnly: Map[K,V] = this
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject2.scala b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject2.scala
new file mode 100644
index 000000000..2cb141caa
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject2.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info) with Marker
+{
+	lazy val interactiveTest = interactiveTask { mark() }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject3.scala b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject3.scala
new file mode 100644
index 000000000..dc958905b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject3.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info) with Marker
+{
+	val subA = project("a", "A")
+	lazy val interactiveTest = interactiveTask { mark() }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject4.scala b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject4.scala
new file mode 100644
index 000000000..cc75690a1
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject4.scala
@@ -0,0 +1,10 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val subA = project("a", "A", new SubA(_))
+	class SubA(info: ProjectInfo) extends DefaultProject(info) with Marker
+	{
+		lazy val interactiveTest = interactiveTask { mark() }
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject5.scala b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject5.scala
new file mode 100644
index 000000000..4488a08b5
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject5.scala
@@ -0,0 +1,12 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info) with Marker
+{
+	val subA = project("a", "A", new SubA(_))
+	lazy val interactiveTest = interactiveTask { mark() }
+	
+	class SubA(info: ProjectInfo) extends DefaultProject(info)
+	{
+		lazy val interactiveTest = interactiveTask { Some("Child interactive task should not be called.") }
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject6.scala b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject6.scala
new file mode 100644
index 000000000..ecd8ab4b0
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject6.scala
@@ -0,0 +1,12 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val subA = project("a", "A", new SubA(_))
+	lazy val interactiveTest = task { Some("Parent task should not be called") }
+	
+	class SubA(info: ProjectInfo) extends DefaultProject(info)
+	{
+		lazy val interactiveTest = interactiveTask { Some("Child task should not be called.") }
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject7.scala b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject7.scala
new file mode 100644
index 000000000..82a3ed6f8
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject7.scala
@@ -0,0 +1,12 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info) with Marker
+{
+	val subA = project("a", "A", new SubA(_))
+	lazy val interactiveTest = task { mark() }
+	
+	class SubA(info: ProjectInfo) extends DefaultProject(info) with Marker
+	{
+		lazy val interactiveTest = task { mark() }
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/project/build.properties b/src/test/resources/sbt-test-resources/actions/interactive/project/build.properties
new file mode 100644
index 000000000..a7e217501
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Fri Jan 30 20:49:57 EST 2009
+project.name=Interactive Actions Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/Marker.scala b/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/Marker.scala
new file mode 100644
index 000000000..693fdd31e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/Marker.scala
@@ -0,0 +1,13 @@
+import sbt._
+
+trait Marker extends NotNull
+{ self: Project =>
+	def toMark: Path = "ran"
+	def mark() =
+	{
+		if(toMark.exists)
+			Some("Already ran")
+		else
+			FileUtilities.touch(toMark, log)
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/TestProject.scala
new file mode 100644
index 000000000..993915379
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/TestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info) with Marker
+{
+	lazy val interactiveTest = task { mark() }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/test b/src/test/resources/sbt-test-resources/actions/interactive/test
new file mode 100644
index 000000000..58946fe31
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/actions/interactive/test
@@ -0,0 +1,46 @@
+# This test verifies the behavior of actions declared interactive
+
+# Single project, non-interactive task
+> interactive-test [success]
+$ exists ran [success]
+$ delete ran [success]
+
+# Single project, interactive task
+$ copy-file changes/TestProject2.scala project/build/src/TestProject.scala [success]
+$ reload [success]
+> interactive-test [success]
+$ exists ran [success]
+$ delete ran [success]
+
+# Multi-project, single interactive task on parent project
+$ copy-file changes/TestProject3.scala project/build/src/TestProject.scala [success]
+$ reload [success]
+> interactive-test [success]
+$ exists ran [success]
+$ delete ran [success]
+
+# Multi-project, single interactive task on child project
+$ copy-file changes/TestProject4.scala project/build/src/TestProject.scala [success]
+$ reload [success]
+> interactive-test [failure]
+
+# Multi-project, two interactive tasks with same name, which is allowed because it is defined on parent
+$ copy-file changes/TestProject5.scala project/build/src/TestProject.scala [success]
+$ reload [success]
+> interactive-test [success]
+$ exists "ran" [success]
+$ delete "ran" [success]
+
+# Multi-project, interactive on subproject + non-interactive on parent, which cannot be run from parent
+$ copy-file changes/TestProject6.scala project/build/src/TestProject.scala [success]
+$ reload [success]
+> interactive-test [failure]
+
+# Multi-project, two non-interactive tasks with same name, which is allowed
+$ copy-file changes/TestProject7.scala project/build/src/TestProject.scala [success]
+$ reload [success]
+> interactive-test [success]
+$ exists "ran" [success]
+$ exists "a/ran" [success]
+$ delete "ran" [success]
+$ delete "a/ran" [success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build.properties b/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build.properties
new file mode 100644
index 000000000..0d1673349
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build.properties
@@ -0,0 +1,3 @@
+project.organization=test
+project.name=Interpreter Project Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build/src/TestProject.scala
new file mode 100644
index 000000000..868aa0cff
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build/src/TestProject.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def useMavenConfigurations = true
+	val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default"
+}
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/src/main/scala/Foo.scala b/src/test/resources/sbt-test-resources/compiler-project/run-test/src/main/scala/Foo.scala
new file mode 100644
index 000000000..871a9d9b7
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/compiler-project/run-test/src/main/scala/Foo.scala
@@ -0,0 +1,27 @@
+package foo.bar
+
+class Holder { var value: Any = _ }
+
+import scala.tools.nsc.{Interpreter, Settings}
+
+class Foo {
+	val settings = new Settings()
+	settings.classpath.value = new java.io.File(classOf[Holder].getProtectionDomain.getCodeSource.getLocation.toURI).getAbsolutePath
+	val inter = new Interpreter(settings)
+
+	def eval(code: String): Any = {
+		val h = new Holder
+		inter.bind("$r_", h.getClass.getName, h)
+		val r = inter.interpret("$r_.value = " + code)
+		h.value
+	}
+}
+
+object Test
+{
+	def main(args: Array[String])
+	{
+		val foo = new Foo
+		foo.eval("3")
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/src/test/scala/FooTest.scala b/src/test/resources/sbt-test-resources/compiler-project/run-test/src/test/scala/FooTest.scala
new file mode 100644
index 000000000..fb0601e2d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/compiler-project/run-test/src/test/scala/FooTest.scala
@@ -0,0 +1,12 @@
+package foo.bar
+
+import org.scalacheck._
+
+object FooTest extends Properties("Foo")
+{
+	specify("Set", (i: Int) => { try {
+		val foo = new Foo
+		foo.eval(i.toString) == i
+	} catch { case e => e.printStackTrace(); false } 
+	})
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/test b/src/test/resources/sbt-test-resources/compiler-project/run-test/test
new file mode 100644
index 000000000..dd9d7d54a
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/compiler-project/run-test/test
@@ -0,0 +1,11 @@
+> update
+[success]
+
+> run
+[success]
+
+> clean
+[success]
+
+> test
+[success]
diff --git a/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build.properties
new file mode 100644
index 000000000..e66951c84
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Exclude Transitive
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build/src/TestProject.scala
new file mode 100644
index 000000000..cf2d2ef40
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build/src/TestProject.scala
@@ -0,0 +1,26 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	def transitive(dep: ModuleID) = if("transitive".asFile.exists) dep else dep.intransitive()
+	val javaMail = transitive("javax.mail" % "mail" % "1.4.1")
+	
+	lazy val checkTransitive = task { check(true) }
+	lazy val checkIntransitive = task { check(false) }
+
+	private def check(transitive: Boolean) =
+	{
+		val downloaded = compileClasspath.get
+		val jars = downloaded.size
+		if(transitive)
+		{
+			if(jars > 1) None
+			else Some("Transitive dependencies not downloaded")
+		}
+		else
+		{
+			if(jars == 1) None
+			else Some("Transitive dependencies downloaded (" + downloaded.mkString(", ") + ")")
+		}
+	}
+}
diff --git a/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/test b/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/test
new file mode 100644
index 000000000..2a5c10a79
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/test
@@ -0,0 +1,32 @@
+# load the project definition with transitive dependencies enabled
+# and check that they are not downloaded
+
+$ touch transitive
+[success]
+$ reload
+[success]
+
+> update
+[success]
+
+> check-transitive
+[success]
+> check-intransitive
+[failure]
+
+
+# load the project definition with transitive dependencies disabled
+# and check that they are not downloaded
+
+$ delete transitive
+[success]
+$ reload
+[success]
+
+> update
+[success]
+
+> check-transitive
+[failure]
+> check-intransitive
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject.scala b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject.scala
new file mode 100644
index 000000000..6a247bcd2
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject.scala
@@ -0,0 +1,19 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
+	val sub = project("sub", "Sub Project", new SubProject(_))
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	class SubProject(info: ProjectInfo) extends DefaultProject(info)
+	{
+		def ivyCacheDirectory = outputPath / "ivy-cache"
+		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+		override def ivyXML =
+			<dependencies>
+				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
+			</dependencies>
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject2.scala b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject2.scala
new file mode 100644
index 000000000..a51ad119d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject2.scala
@@ -0,0 +1,21 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
+	val sub = project("sub", "Sub Project", new SubProject(_))
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	class SubProject(info: ProjectInfo) extends DefaultProject(info)
+	{
+		val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
+		
+		def ivyCacheDirectory = outputPath / "ivy-cache"
+		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+		override def ivyXML =
+			<dependencies>
+				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
+			</dependencies>
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject3.scala b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject3.scala
new file mode 100644
index 000000000..a51ad119d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject3.scala
@@ -0,0 +1,21 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
+	val sub = project("sub", "Sub Project", new SubProject(_))
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	class SubProject(info: ProjectInfo) extends DefaultProject(info)
+	{
+		val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
+		
+		def ivyCacheDirectory = outputPath / "ivy-cache"
+		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+		override def ivyXML =
+			<dependencies>
+				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
+			</dependencies>
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build.properties
new file mode 100644
index 000000000..e82b3b326
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Wed Apr 29 17:43:40 EDT 2009
+project.organization=sbt
+project.name=Repository Inheritance
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build/src/TestProject.scala
new file mode 100644
index 000000000..a576d9609
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build/src/TestProject.scala
@@ -0,0 +1,18 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val sub = project("sub", "Sub Project", new SubProject(_))
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	class SubProject(info: ProjectInfo) extends DefaultProject(info)
+	{
+		def ivyCacheDirectory = outputPath / "ivy-cache"
+		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+		override def ivyXML =
+			<dependencies>
+				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
+			</dependencies>
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/test b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/test
new file mode 100644
index 000000000..3c58ae287
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/test
@@ -0,0 +1,31 @@
+# This should fail because the sub project declares a dependency that exists in an extra repository, which we haven't declared
+> update
+[failure]
+
+# Copy the project definition with the extra repository declared in the parent and reload
+$ copy-file changes/CorrectProject.scala project/build/src/TestProject.scala
+[success]
+$ reload
+[success]
+
+# Try updating again, which should work because the repository declared in the parent should be inherited by the child
+> update
+[success]
+
+# Copy the project definition with the extra repository declared in the child and parent and reload
+$ copy-file changes/CorrectProject2.scala project/build/src/TestProject.scala
+[success]
+$ reload
+[success]
+
+> update
+[success]
+
+# Copy the project definition with the extra repository declared in the child and reload
+$ copy-file changes/CorrectProject3.scala project/build/src/TestProject.scala
+[success]
+$ reload
+[success]
+
+> update
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build.properties
new file mode 100644
index 000000000..7c89429d7
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build.properties
@@ -0,0 +1,2 @@
+project.name=test
+project.version=1.0.0
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build/src/TestProject.scala
new file mode 100644
index 000000000..36c4016f4
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build/src/TestProject.scala
@@ -0,0 +1,20 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val httpclient = "org.apache.httpcomponents" % "httpclient" % "4.0-beta2" intransitive()
+	
+	override def useDefaultConfigurations =
+		if("useDefaultConfigurations".asFile.exists) true
+		else false
+
+	lazy val checkDefault = task { check(Configurations.Default) }
+	lazy val checkCompile = task { check(Configurations.Compile) }
+	lazy val checkClasspath = task { if(compileClasspath.get.isEmpty) Some("Dependency in default configuration not added to classpath") else None }
+
+	private def check(config: Configuration) =
+		if(configurationClasspath(config).get.isEmpty)
+			Some("Dependency in " + config.name + " configuration not downloaded")
+		else
+			None
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-default/test b/src/test/resources/sbt-test-resources/dependency-management/inline-default/test
new file mode 100644
index 000000000..025cf0969
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inline-default/test
@@ -0,0 +1,42 @@
+## run test with useDefaultConfigurations=false
+
+# Download jars.  If successful, httpclient should be downloaded to the 'default' configuration 
+> update
+[success]
+
+# The jar should exist in the 'default' configuration ...
+> check-default
+[success]
+# but not in the 'compile' configuration ...
+> check-compile
+[failure]
+# It should be present on the compile classpath
+> check-classpath
+[success]
+
+# reset test
+> clean-lib
+[success]
+# Indicate to the project definition that we now want useDefaultConfigurations = true
+$ touch useDefaultConfigurations
+[success]
+# Reload for change to take effect
+$ reload
+[success]
+
+## Rerun test with useDefaultConfigurations=true
+
+# Download jars.  If successful,  httpclient should be downloaded to the 'compile' configuration
+> update
+[success]
+
+
+# The jar should not exist in the 'default' configuration ...
+> check-default
+[failure]
+# It should exist in the 'compile' configuration
+> check-compile
+[success]
+# It should be present on the compile classpath
+> check-classpath
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build.properties
new file mode 100644
index 000000000..2a3934bd8
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Fri Jan 30 20:49:57 EST 2009
+project.name=Inline Dependency Test A
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
new file mode 100644
index 000000000..272ff3250
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
@@ -0,0 +1,8 @@
+import sbt._
+
+class UpdateTestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val sc = "org.scalacheck" % "scalacheck" % "1.5"
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/test b/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/test
new file mode 100644
index 000000000..2110da54b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/test
@@ -0,0 +1,5 @@
+> update
+[success]
+
+$ exists lib_managed/compile/scalacheck-1.5.jar
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
new file mode 100644
index 000000000..ea1584c39
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
@@ -0,0 +1,19 @@
+<ivysettings>
+	<settings defaultResolver="test-chain"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+	
+	<caches defaultCacheDir="${ivy.settings.dir}/target/cache"/>
+	<resolvers>
+		<ibiblio name="scala-tools" m2compatible="true" root="http://scala-tools.org/repo-releases/"/>
+		<chain name="test-chain" returnFirst="true" checkmodified="true">
+			<resolver ref="local"/>
+			<resolver ref="shared"/>
+			<resolver ref="main"/>
+			<resolver ref="scala-tools"/>
+		</chain>
+	</resolvers>
+</ivysettings> 
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
new file mode 100644
index 000000000..522e78a48
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
+	<info organisation="org" module="ivy-settings-test"/>
+	<dependencies>
+		<dependency org="org.scalacheck" name="scalacheck" rev="1.5"/>
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivy.xml b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivy.xml
new file mode 100644
index 000000000..000bffbdd
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivy.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
+  <info organisation="org" module="ivy-settings-test"/>
+</ivy-module>
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivysettings.xml b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivysettings.xml
new file mode 100644
index 000000000..03b905979
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivysettings.xml
@@ -0,0 +1,3 @@
+<ivysettings>
+	<caches defaultCacheDir="${ivy.settings.dir}/target/cache"/>
+</ivysettings>
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/project/build.properties
new file mode 100644
index 000000000..6f75f736f
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Sun Feb 01 13:49:30 EST 2009
+project.name=Ivy Settings Test
+project.version=1.0.0
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/test b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/test
new file mode 100644
index 000000000..04e8dd8c9
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/test
@@ -0,0 +1,20 @@
+> update
+[success]
+
+$ copy-file changes/scalacheck-ivy.xml ivy.xml
+[success]
+
+> update
+[failure]
+
+$ absent lib_managed/default/scalacheck-1.5.jar
+[success]
+
+$ copy-file changes/scala-tools-ivysettings.xml ivysettings.xml
+[success]
+
+> update
+[success]
+
+$ exists lib_managed/default/scalacheck-1.5.jar
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
new file mode 100644
index 000000000..ea1584c39
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
@@ -0,0 +1,19 @@
+<ivysettings>
+	<settings defaultResolver="test-chain"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
+	
+	<caches defaultCacheDir="${ivy.settings.dir}/target/cache"/>
+	<resolvers>
+		<ibiblio name="scala-tools" m2compatible="true" root="http://scala-tools.org/repo-releases/"/>
+		<chain name="test-chain" returnFirst="true" checkmodified="true">
+			<resolver ref="local"/>
+			<resolver ref="shared"/>
+			<resolver ref="main"/>
+			<resolver ref="scala-tools"/>
+		</chain>
+	</resolvers>
+</ivysettings> 
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/ivysettings.xml b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/ivysettings.xml
new file mode 100644
index 000000000..03b905979
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/ivysettings.xml
@@ -0,0 +1,3 @@
+<ivysettings>
+	<caches defaultCacheDir="${ivy.settings.dir}/target/cache"/>
+</ivysettings>
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build.properties
new file mode 100644
index 000000000..c7a658215
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Sun Feb 01 15:33:35 EST 2009
+project.name=Ivy Settings Test B
+project.version=1.0.1
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
new file mode 100644
index 000000000..0f45f4a59
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class UpdateTestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val sc = "org.scalacheck" % "scalacheck" % "1.5"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/test b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/test
new file mode 100644
index 000000000..90953e12e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/test
@@ -0,0 +1,14 @@
+> update
+[error]
+
+$ absent lib_managed/compile/scalacheck-1.5.jar
+[success]
+
+$ copy-file changes/scala-tools-ivysettings.xml ivysettings.xml
+[success]
+
+> update
+[success]
+
+$ exists lib_managed/compile/scalacheck-1.5.jar
+[success]
diff --git a/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build.properties
new file mode 100644
index 000000000..7c89429d7
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build.properties
@@ -0,0 +1,2 @@
+project.name=test
+project.version=1.0.0
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build/src/TestProject.scala
new file mode 100644
index 000000000..c98c0e6b0
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build/src/TestProject.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val javaNet = JavaNet1Repository
+	val ejb = "javax.ejb" % "ejb-api" % "3.0"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/java.net/test b/src/test/resources/sbt-test-resources/dependency-management/java.net/test
new file mode 100644
index 000000000..93397d07c
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/java.net/test
@@ -0,0 +1,2 @@
+> update
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/provided/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/provided/project/build.properties
new file mode 100644
index 000000000..59a846bd8
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/provided/project/build.properties
@@ -0,0 +1,2 @@
+project.version=2.0
+project.name=Test
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/provided/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/provided/project/build/src/TestProject.scala
new file mode 100644
index 000000000..244050208
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/provided/project/build/src/TestProject.scala
@@ -0,0 +1,32 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultWebProject(info)
+{
+	override def useMavenConfigurations = true
+	private val provided = "useProvided".asFile.exists
+	private val configuration = if(provided) Configurations.Provided else Configurations.Compile
+	val j = "javax.servlet" % "servlet-api" % "2.5" % (configuration.name + "->default")
+
+	lazy val checkPublic = check(publicClasspath, !provided)
+	lazy val checkRun = check(runClasspath, true)
+	lazy val checkCompile = check(compileClasspath, true)
+	lazy val checkProvided = check(fullClasspath(Configurations.Provided), provided)
+
+	private def check(classpath: PathFinder, shouldBeIncluded: Boolean) =
+		task { checkServletAPI(shouldBeIncluded, "classpath")(classpath.get) }
+		
+	lazy val checkWar = task { Control.thread(FileUtilities.unzip(warPath, outputPath / "exploded", log))(checkServletAPI(!provided, "war")) }
+	private def checkServletAPI(shouldBeIncluded: Boolean, label: String)(paths: Iterable[Path]) =
+	{
+		val servletAPI = paths.find(_.asFile.getName.contains("servlet-api"))
+		if(shouldBeIncluded)
+		{
+			if(servletAPI.isEmpty)
+				Some("Servlet API should have been included in " + label + ".")
+			else
+				None
+		}
+		else
+			servletAPI.map(_ + " incorrectly included in " + label + ".")
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/provided/test b/src/test/resources/sbt-test-resources/dependency-management/provided/test
new file mode 100644
index 000000000..23adf7948
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/provided/test
@@ -0,0 +1,51 @@
+# verify that the classpaths are correct for when a dependency is in the provided configuration
+$ touch useProvided
+[success]
+$ reload
+[success]
+
+> update
+[success]
+
+> check-run
+[success]
+> check-compile
+[success]
+> check-provided
+[success]
+> check-public
+[success]
+
+> package
+[success]
+
+> check-war
+[success]
+
+# verify that the classpaths are correct for when a dependency is in the compile configuration
+$ delete useProvided
+[success]
+$ reload
+[success]
+
+> update
+[success]
+
+> check-run
+[success]
+> check-compile
+[success]
+> check-provided
+[success]
+> check-public
+[success]
+
+# prepare-webapp is last modified based, so we need to force it to do work
+$ delete target
+[success]
+
+> package
+[success]
+
+> check-war
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/url/project/build.properties b/src/test/resources/sbt-test-resources/dependency-management/url/project/build.properties
new file mode 100644
index 000000000..cefcdcae9
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/url/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/dependency-management/url/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/dependency-management/url/project/build/src/TestProject.scala
new file mode 100644
index 000000000..4b4205da8
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/url/project/build/src/TestProject.scala
@@ -0,0 +1,25 @@
+import sbt._
+
+import java.net.{URL, URLClassLoader}
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def useMavenConfigurations = true
+	val direct = "slinky" % "slinky" % "2.1" % "test->default" from "http://slinky2.googlecode.com/svn/artifacts/2.1/slinky.jar"
+	lazy val checkInTest = checkClasspath(testClasspath)
+	lazy val checkInCompile = checkClasspath(compileClasspath)
+	private def checkClasspath(cp: PathFinder) =
+		task
+		{
+			try
+			{
+				Class.forName("slinky.http.Application", false, new URLClassLoader(cp.get.map(_.asURL).toList.toArray))
+				None
+			}
+			catch
+			{
+				case _: ClassNotFoundException =>
+					Some("Dependency not downloaded.") 
+			}
+		}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/dependency-management/url/test b/src/test/resources/sbt-test-resources/dependency-management/url/test
new file mode 100644
index 000000000..20481d07b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/dependency-management/url/test
@@ -0,0 +1,12 @@
+> check-in-test
+[failure]
+> check-in-compile
+[failure]
+
+> update
+[success]
+
+> check-in-test
+[success]
+> check-in-compile
+[failure]
diff --git a/src/test/resources/sbt-test-resources/java/analysis/project/build.properties b/src/test/resources/sbt-test-resources/java/analysis/project/build.properties
new file mode 100644
index 000000000..274d96c88
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/analysis/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Sat Apr 18 15:26:14 EDT 2009
+project.organization=empty
+project.name=Java Dependency Analysis
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/java/analysis/src/main/java/test/R.java b/src/test/resources/sbt-test-resources/java/analysis/src/main/java/test/R.java
new file mode 100644
index 000000000..df1d987e7
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/analysis/src/main/java/test/R.java
@@ -0,0 +1,16 @@
+package test;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/src/test/resources/sbt-test-resources/java/analysis/test b/src/test/resources/sbt-test-resources/java/analysis/test
new file mode 100644
index 000000000..0e5cfa345
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/analysis/test
@@ -0,0 +1,2 @@
+> compile
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/java/basic/project/build.properties b/src/test/resources/sbt-test-resources/java/basic/project/build.properties
new file mode 100644
index 000000000..3a234a13f
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/basic/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Sat Apr 18 15:22:08 EDT 2009
+project.organization=empty
+project.name=Java Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/java/basic/src/main/java/test/R.java b/src/test/resources/sbt-test-resources/java/basic/src/main/java/test/R.java
new file mode 100644
index 000000000..aef73327d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/basic/src/main/java/test/R.java
@@ -0,0 +1,6 @@
+package test;
+
+public final class R {
+   public static final int y = 4;
+   public static int x = (new stest.S()).y();
+}
diff --git a/src/test/resources/sbt-test-resources/java/basic/src/main/scala/S.scala b/src/test/resources/sbt-test-resources/java/basic/src/main/scala/S.scala
new file mode 100644
index 000000000..f9b30c89e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/basic/src/main/scala/S.scala
@@ -0,0 +1,7 @@
+package stest
+
+class S
+{
+	val x = test.R.y
+	val y = 5
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/java/basic/test b/src/test/resources/sbt-test-resources/java/basic/test
new file mode 100644
index 000000000..0e5cfa345
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/basic/test
@@ -0,0 +1,2 @@
+> compile
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/java/options/project/build.properties b/src/test/resources/sbt-test-resources/java/options/project/build.properties
new file mode 100644
index 000000000..3a234a13f
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/options/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Sat Apr 18 15:22:08 EDT 2009
+project.organization=empty
+project.name=Java Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/java/options/project/build/src/JavaProject.scala b/src/test/resources/sbt-test-resources/java/options/project/build/src/JavaProject.scala
new file mode 100644
index 000000000..99bdd529e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/options/project/build/src/JavaProject.scala
@@ -0,0 +1,8 @@
+import sbt._
+
+// verify that javaCompileOptions are used
+class JavaProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	// make the source target 1.4 so that we get an error when these options are used
+	override def javaCompileOptions = ("-source" :: "1.4" :: Nil).map(JavaCompileOption(_))
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/java/options/src/main/java/test/R.java b/src/test/resources/sbt-test-resources/java/options/src/main/java/test/R.java
new file mode 100644
index 000000000..3fda19f3b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/options/src/main/java/test/R.java
@@ -0,0 +1,9 @@
+package test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class R {
+   public static final int y = 4;
+   private static List<String> z = new ArrayList<String>();
+}
diff --git a/src/test/resources/sbt-test-resources/java/options/src/main/scala/S.scala b/src/test/resources/sbt-test-resources/java/options/src/main/scala/S.scala
new file mode 100644
index 000000000..f9b30c89e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/options/src/main/scala/S.scala
@@ -0,0 +1,7 @@
+package stest
+
+class S
+{
+	val x = test.R.y
+	val y = 5
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/java/options/test b/src/test/resources/sbt-test-resources/java/options/test
new file mode 100644
index 000000000..a10e99135
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/java/options/test
@@ -0,0 +1,2 @@
+> compile
+[failure]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/package/lazy-name/project/build.properties b/src/test/resources/sbt-test-resources/package/lazy-name/project/build.properties
new file mode 100755
index 000000000..8bf006b1e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/lazy-name/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Tue Feb 03 14:28:27 EST 2009
+project.name=Lazy Package Name
+project.version=0.1.1
diff --git a/src/test/resources/sbt-test-resources/package/lazy-name/test b/src/test/resources/sbt-test-resources/package/lazy-name/test
new file mode 100755
index 000000000..3b4b67352
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/lazy-name/test
@@ -0,0 +1,26 @@
+> package
+[success]
+
+$ exists "target/lazy-package-name-0.1.1.jar"
+[success]
+
+> clean
+[success]
+
+> increment-version
+[success]
+
+> package
+[success]
+
+$ exists "target/lazy-package-name-0.1.2.jar"
+[success]
+
+> increment-version
+[success]
+
+> package
+[success]
+
+$ exists "target/lazy-package-name-0.1.3.jar"
+[success]
diff --git a/src/test/resources/sbt-test-resources/package/manifest/project/build.properties b/src/test/resources/sbt-test-resources/package/manifest/project/build.properties
new file mode 100644
index 000000000..e273be069
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/manifest/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Mon Feb 02 20:49:59 EST 2009
+project.name=Jar Manifest Test
+project.version=0.2
diff --git a/src/test/resources/sbt-test-resources/package/manifest/project/build/src/ManifestTestProject.scala b/src/test/resources/sbt-test-resources/package/manifest/project/build/src/ManifestTestProject.scala
new file mode 100644
index 000000000..3cec27fde
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/manifest/project/build/src/ManifestTestProject.scala
@@ -0,0 +1,16 @@
+import sbt._
+
+class ManifestTestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val scalaHome = system[String]("scala.home")
+	override def mainClass = Some("jartest.Main")
+	def manifestExtra =
+	{
+		import java.util.jar._
+		val mf = new Manifest
+		for(scalaH <- scalaHome.get)
+			mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, scalaH + "/lib/scala-library.jar")
+		mf
+	}
+	override def packageOptions = JarManifest(manifestExtra) :: super.packageOptions.toList
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/package/manifest/src/main/scala/jartest/Main.scala b/src/test/resources/sbt-test-resources/package/manifest/src/main/scala/jartest/Main.scala
new file mode 100644
index 000000000..be96a910f
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/manifest/src/main/scala/jartest/Main.scala
@@ -0,0 +1,6 @@
+package jartest
+
+object Main
+{
+	def main(args: Array[String]) {}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/package/manifest/test b/src/test/resources/sbt-test-resources/package/manifest/test
new file mode 100644
index 000000000..61331f4fa
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/manifest/test
@@ -0,0 +1,11 @@
+> package
+[success]
+
+$ "exists" "./target/jar-manifest-test-0.2.jar"
+[success]
+
+$ exec java -jar "./target/jar-manifest-test-0.2.jar"
+[success]
+
+> run
+[success]
diff --git a/src/test/resources/sbt-test-resources/package/resources/project/build.properties b/src/test/resources/sbt-test-resources/package/resources/project/build.properties
new file mode 100644
index 000000000..2c43d1a10
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/resources/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Mon Feb 02 20:49:59 EST 2009
+project.name=Main Resources Test
+project.version=0.1
diff --git a/src/test/resources/sbt-test-resources/package/resources/project/build/src/ManifestTestProject.scala b/src/test/resources/sbt-test-resources/package/resources/project/build/src/ManifestTestProject.scala
new file mode 100644
index 000000000..3cec27fde
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/resources/project/build/src/ManifestTestProject.scala
@@ -0,0 +1,16 @@
+import sbt._
+
+class ManifestTestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val scalaHome = system[String]("scala.home")
+	override def mainClass = Some("jartest.Main")
+	def manifestExtra =
+	{
+		import java.util.jar._
+		val mf = new Manifest
+		for(scalaH <- scalaHome.get)
+			mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, scalaH + "/lib/scala-library.jar")
+		mf
+	}
+	override def packageOptions = JarManifest(manifestExtra) :: super.packageOptions.toList
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/package/resources/src/main/resources/main_resource_test b/src/test/resources/sbt-test-resources/package/resources/src/main/resources/main_resource_test
new file mode 100644
index 000000000..b08a24406
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/resources/src/main/resources/main_resource_test
@@ -0,0 +1 @@
+This is a resource to test that sbt includes main resources in the packaged jar.
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/package/resources/src/main/scala/jartest/Main.scala b/src/test/resources/sbt-test-resources/package/resources/src/main/scala/jartest/Main.scala
new file mode 100644
index 000000000..1998ccc6d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/resources/src/main/scala/jartest/Main.scala
@@ -0,0 +1,10 @@
+package jartest
+
+object Main
+{
+	def main(args: Array[String])
+	{
+		if(getClass.getResource("main_resource_test") == null)
+			System.exit(1)
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/package/resources/test b/src/test/resources/sbt-test-resources/package/resources/test
new file mode 100644
index 000000000..3e4d841cb
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/package/resources/test
@@ -0,0 +1,36 @@
+#This test verifies two things:
+# 1) That sbt properly puts resources from src/main/resources on the runtime classpath
+# 2) That sbt properly packages resources from src/main/resources into the jar
+
+# This should fail because the Main object is in package jartest and the resource is directly
+# in src/main/resources
+> run
+[failure]
+
+> package
+[success]
+
+# This should fail because sbt should include the resource in the jar but it won't have the right
+# directory structure
+$ exec java -jar "./target/main-resources-test-0.1.jar"
+[failure]
+
+# Give the resource the right directory structure
+$ mkdir src/main/resources/jartest [success]
+$ copy-file src/main/resources/main_resource_test src/main/resources/jartest/main_resource_test [success]
+$ delete src/main/resources/main_resource_test [success]
+
+# This should succeed because sbt should put the resource on the runClasspath
+> run
+[success]
+
+# This is necessary because package bases whether or not to run on last modified times, which don't have
+# high enough resolution to notice the above move of main_resource_test
+> clean [success]
+
+> package
+[success]
+
+# This should succeed because sbt should include the resource in the jar with the right directory structure
+$ exec java -jar "./target/main-resources-test-0.1.jar"
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/changes/LibTestProject.scala b/src/test/resources/sbt-test-resources/project/Class.forName/changes/LibTestProject.scala
new file mode 100644
index 000000000..121545671
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/Class.forName/changes/LibTestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class LibTestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	lazy val useJar = task { injar.Test.other; None }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/project/build.properties b/src/test/resources/sbt-test-resources/project/Class.forName/project/build.properties
new file mode 100644
index 000000000..aa5b7e794
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/Class.forName/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Mon Mar 23 16:23:49 EDT 2009
+project.organization=empty
+project.name=definition-lib-forname-test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/src/main/scala/Test.scala b/src/test/resources/sbt-test-resources/project/Class.forName/src/main/scala/Test.scala
new file mode 100644
index 000000000..6e1105cd7
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/Class.forName/src/main/scala/Test.scala
@@ -0,0 +1,8 @@
+package injar
+
+object Test
+{
+	def other = Class.forName("injar.OtherTest")
+}
+
+class OtherTest
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/test b/src/test/resources/sbt-test-resources/project/Class.forName/test
new file mode 100644
index 000000000..00c356c76
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/Class.forName/test
@@ -0,0 +1,19 @@
+# this step builds a test jar for use by the project definition
+> package
+[success]
+
+$ copy-file target/definition-lib-forname-test-1.0.jar project/build/lib/test.jar
+[success]
+
+$ copy-file changes/LibTestProject.scala project/build/src/LibTestProject.scala
+[success]
+
+# the copied project definition depends on the Test module in test.jar and will
+# fail to compile if sbt did not put the jars in project/build/lib/ on the compile classpath
+$ reload
+[success]
+
+# The project definition uses the class in test.jar and will fail here if sbt did not put the
+# jars in project/build/lib on the runtime classpath
+> use-jar
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/project/build.properties b/src/test/resources/sbt-test-resources/project/flatten/project/build.properties
new file mode 100644
index 000000000..6ad62f9f3
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Fri May 15 12:14:00 EDT 2009
+project.organization=test
+project.name=Flatten Source Hierarchy
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/project/flatten/project/build/src/FlatProject.scala b/src/test/resources/sbt-test-resources/project/flatten/project/build/src/FlatProject.scala
new file mode 100644
index 000000000..abafb603e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/project/build/src/FlatProject.scala
@@ -0,0 +1,23 @@
+import sbt._
+
+class FlatProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def useMavenConfigurations = true
+	val sc = "org.scalacheck" % "scalacheck" % "1.5" % "test->default"
+
+	def sourceFilter =  "*.java" | "*.scala"
+	override def mainSources = descendents(sourcePath ##, sourceFilter)
+	override def mainResources = descendents(sourcePath ##, -sourceFilter)
+
+	override def testSourcePath = "test-src"
+	override def testSources = descendents(testSourcePath ##, sourceFilter)
+	override def testResources = descendents(testSourcePath ##, -sourceFilter)
+
+	lazy val unpackageProject =
+		task
+		{
+			FileUtilities.unzip(outputPath / (artifactBaseName + "-project.zip"), info.projectPath, "src/*", log).left.toOption
+		} dependsOn(cleanSrc)
+
+	lazy val cleanSrc = cleanTask(sourcePath +++ testSourcePath)
+}
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/JavaA.java b/src/test/resources/sbt-test-resources/project/flatten/src/JavaA.java
new file mode 100644
index 000000000..4b0a4410c
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/src/JavaA.java
@@ -0,0 +1,4 @@
+public class JavaA
+{
+	public int inc(int i) { return i+1; }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/ScalaA.scala b/src/test/resources/sbt-test-resources/project/flatten/src/ScalaA.scala
new file mode 100644
index 000000000..bf212bddb
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/src/ScalaA.scala
@@ -0,0 +1,6 @@
+package a.b
+
+class ScalaA
+{
+	def increment(i: Int) = i + 1
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/a/JavaB.java b/src/test/resources/sbt-test-resources/project/flatten/src/a/JavaB.java
new file mode 100644
index 000000000..988ed4701
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/src/a/JavaB.java
@@ -0,0 +1,6 @@
+package a;
+
+public class JavaB
+{
+	public int dec(int i) { return i-1; }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/a/ScalaB.scala b/src/test/resources/sbt-test-resources/project/flatten/src/a/ScalaB.scala
new file mode 100644
index 000000000..590ee17bb
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/src/a/ScalaB.scala
@@ -0,0 +1,16 @@
+package b
+
+class ScalaB
+{
+	def decrement(i: Int) = i - 1
+}
+object ScalaC
+{
+	def loadResources()
+	{
+		resource("/main-resource")
+		resource("main-resource-a")
+		resource("/a/main-resource-a")
+	}
+	def resource(s: String) = assert(getClass.getResource(s) != null, "Could not find resource '" + s + "'")
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/a/test-resource-a b/src/test/resources/sbt-test-resources/project/flatten/src/a/test-resource-a
new file mode 100644
index 000000000..9754de6ae
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/src/a/test-resource-a
@@ -0,0 +1 @@
+This is a test resource.
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/test-resource b/src/test/resources/sbt-test-resources/project/flatten/src/test-resource
new file mode 100644
index 000000000..9754de6ae
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/src/test-resource
@@ -0,0 +1 @@
+This is a test resource.
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test b/src/test/resources/sbt-test-resources/project/flatten/test
new file mode 100644
index 000000000..0b85c1c16
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/test
@@ -0,0 +1,25 @@
+# This test verifies that sbt works after the source hierarchy has been flattened and merged
+# so that resources and Java and Scala sources are side by side under src/
+
+> update
+[success]
+
+> test
+[success]
+
+# This part verifies that the package-src action works properly under a flattened/merged source hierarchy
+
+> package-project
+[success]
+
+$ delete src
+[success]
+
+> test
+[failure]
+
+> unpackage-project
+[success]
+
+> test
+[success]
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/SimpleTest.scala b/src/test/resources/sbt-test-resources/project/flatten/test-src/SimpleTest.scala
new file mode 100644
index 000000000..54fa5f2de
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/test-src/SimpleTest.scala
@@ -0,0 +1,10 @@
+import org.scalacheck._
+
+class SimpleTest extends Properties("Simple")
+{
+	specify("increment scala", (i: Int) => (new a.b.ScalaA).increment(i) == i+1)
+	specify("increment java", (i: Int) => (new JavaA).inc(i) == i+1)
+	
+	specify("decrement scala", (i: Int) => (new b.ScalaB).decrement(i) == i+1)
+	specify("decrement java", (i: Int) => (new a.JavaB).dec(i) == i+1)
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/c/ResourcesTest.scala b/src/test/resources/sbt-test-resources/project/flatten/test-src/c/ResourcesTest.scala
new file mode 100644
index 000000000..7f7d60034
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/test-src/c/ResourcesTest.scala
@@ -0,0 +1,19 @@
+package d
+
+import org.scalacheck._
+
+class ResourcesTest extends Properties("Resources")
+{
+	specify("load main resources ok", (a: Boolean) => { b.ScalaC.loadResources(); true })
+	specify("load test resources ok", (a: Boolean) => { ScalaD.loadResources(); true })
+}
+object ScalaD
+{
+	def loadResources()
+	{
+		resource("/test-resource")
+		resource("test-resource-c")
+		resource("/c/test-resource-c")
+	}
+	def resource(s: String) = assert(getClass.getResource(s) != null, "Could not find resource '" + s + "'")
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/c/test-resource-c b/src/test/resources/sbt-test-resources/project/flatten/test-src/c/test-resource-c
new file mode 100644
index 000000000..9754de6ae
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/test-src/c/test-resource-c
@@ -0,0 +1 @@
+This is a test resource.
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/test-resource b/src/test/resources/sbt-test-resources/project/flatten/test-src/test-resource
new file mode 100644
index 000000000..9754de6ae
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/flatten/test-src/test-resource
@@ -0,0 +1 @@
+This is a test resource.
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/lib/changes/LibTestProject.scala b/src/test/resources/sbt-test-resources/project/lib/changes/LibTestProject.scala
new file mode 100644
index 000000000..c586969ae
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/lib/changes/LibTestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class LibTestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	lazy val useJar = task { injar.Test.foo }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/lib/project/build.properties b/src/test/resources/sbt-test-resources/project/lib/project/build.properties
new file mode 100644
index 000000000..237e3120c
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/lib/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Mon Mar 23 16:23:49 EDT 2009
+project.organization=empty
+project.name=definition-lib-test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/project/lib/src/main/scala/Test.scala b/src/test/resources/sbt-test-resources/project/lib/src/main/scala/Test.scala
new file mode 100644
index 000000000..bfa832aec
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/lib/src/main/scala/Test.scala
@@ -0,0 +1,6 @@
+package injar
+
+object Test
+{
+	def foo: Option[String] = None
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/lib/test b/src/test/resources/sbt-test-resources/project/lib/test
new file mode 100644
index 000000000..a6870d084
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/lib/test
@@ -0,0 +1,19 @@
+# this step builds a test jar for use by the project definition
+> package
+[success]
+
+$ copy-file target/definition-lib-test-1.0.jar project/build/lib/test.jar
+[success]
+
+$ copy-file changes/LibTestProject.scala project/build/src/LibTestProject.scala
+[success]
+
+# the copied project definition depends on the Test module in test.jar and will
+# fail to compile if sbt did not put the jars in project/build/lib/ on the compile classpath
+$ reload
+[success]
+
+# The project definition uses the class in test.jar and will fail here if sbt did not put the
+# jars in project/build/lib on the runtime classpath
+> use-jar
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/MultiProject.scala b/src/test/resources/sbt-test-resources/project/multi/changes/MultiProject.scala
new file mode 100644
index 000000000..1fbb3af93
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/multi/changes/MultiProject.scala
@@ -0,0 +1,6 @@
+package test
+
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+class AnotherProject(info: ProjectInfo) extends DefaultProject(info)
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/SingleAndTraitProject.scala b/src/test/resources/sbt-test-resources/project/multi/changes/SingleAndTraitProject.scala
new file mode 100644
index 000000000..46c2904cb
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/multi/changes/SingleAndTraitProject.scala
@@ -0,0 +1,9 @@
+package test
+
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+
+trait NotAProject extends Project
+abstract class AnotherNonProject extends Project
+object YetAnotherNonProject extends DefaultProject(ProjectInfo(new java.io.File("."), Nil, None))
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/SingleProject.scala b/src/test/resources/sbt-test-resources/project/multi/changes/SingleProject.scala
new file mode 100644
index 000000000..f5c85946a
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/multi/changes/SingleProject.scala
@@ -0,0 +1,5 @@
+package test
+
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/SinglePublicProject.scala b/src/test/resources/sbt-test-resources/project/multi/changes/SinglePublicProject.scala
new file mode 100644
index 000000000..9ea008c42
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/multi/changes/SinglePublicProject.scala
@@ -0,0 +1,7 @@
+package test
+
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+protected class NotMainProject(info: ProjectInfo) extends DefaultProject(info)
+private class AnotherNotMainProject(info: ProjectInfo) extends DefaultProject(info)
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/multi/project/build.properties b/src/test/resources/sbt-test-resources/project/multi/project/build.properties
new file mode 100644
index 000000000..2b4d7e5a1
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/multi/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/project/multi/test b/src/test/resources/sbt-test-resources/project/multi/test
new file mode 100644
index 000000000..317a22840
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/project/multi/test
@@ -0,0 +1,31 @@
+# There should be no ambiguity with a single project definition
+
+$ copy-file changes/SingleProject.scala project/build/src/TestProject.scala
+[success]
+
+$ reload
+[success]
+
+# Again, no ambiguity with a single project definition and any number of abstract classes/traits implementing Project
+
+$ copy-file changes/SingleAndTraitProject.scala project/build/src/TestProject.scala
+[success]
+
+$ reload
+[success]
+
+# Multiple public projects should be an error
+
+$ copy-file changes/MultiProject.scala project/build/src/TestProject.scala
+[success]
+
+$ reload
+[failure]
+
+# One public project and any number of non-public projects should not be an error
+
+$ copy-file changes/SinglePublicProject.scala project/build/src/TestProject.scala
+[success]
+
+$ reload
+[success]
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build.properties b/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build.properties
new file mode 100644
index 000000000..f74f0984a
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Tue Feb 17 21:42:42 EST 2009
+project.name=Properties Subproject Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build/src/TestProject.scala
new file mode 100644
index 000000000..263e8c573
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build/src/TestProject.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val a = project("a", "Sub project A")
+	val b = project("b", "Sub project B")
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-a/test b/src/test/resources/sbt-test-resources/properties/multi-project-a/test
new file mode 100644
index 000000000..b21259178
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/properties/multi-project-a/test
@@ -0,0 +1,5 @@
+$ absent a/project
+[success]
+
+$ absent b/project
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build.properties b/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build.properties
new file mode 100644
index 000000000..f74f0984a
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Tue Feb 17 21:42:42 EST 2009
+project.name=Properties Subproject Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build/src/TestProject.scala
new file mode 100644
index 000000000..b16b32c25
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build/src/TestProject.scala
@@ -0,0 +1,11 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends ParentProject(info)
+{
+	val a = subproject("a", "Sub project A")
+	val b = subproject("b", "Sub project B")
+	
+	private def subproject(path: Path, name: String) = project(path, name, new TestSubProject(_))
+	
+	class TestSubProject(info: ProjectInfo) extends DefaultProject(info)
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-b/test b/src/test/resources/sbt-test-resources/properties/multi-project-b/test
new file mode 100644
index 000000000..b21259178
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/properties/multi-project-b/test
@@ -0,0 +1,5 @@
+$ absent a/project
+[success]
+
+$ absent b/project
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/run/daemon-exit/project/build.properties b/src/test/resources/sbt-test-resources/run/daemon-exit/project/build.properties
new file mode 100644
index 000000000..825710b2b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/daemon-exit/project/build.properties
@@ -0,0 +1,3 @@
+project.version=1.0
+project.name=Daemon Thread Test
+project.organization=sbt
diff --git a/src/test/resources/sbt-test-resources/run/daemon-exit/src/main/scala/Daemon.scala b/src/test/resources/sbt-test-resources/run/daemon-exit/src/main/scala/Daemon.scala
new file mode 100644
index 000000000..a56d89708
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/daemon-exit/src/main/scala/Daemon.scala
@@ -0,0 +1,23 @@
+// This test verifies that System.exit from a daemon thread works properly
+
+object DaemonExit
+{
+	def main(args: Array[String])
+	{
+		val t = new Thread {
+			override def run() {
+				Thread.sleep(1000)
+				System.exit(0)
+			}
+		}
+	//	t.setDaemon(true)
+		t.start()
+		
+		val t2 = new Thread {
+			override def run() {
+				synchronized { wait() }
+			}
+		}
+		t2.start()
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/run/daemon-exit/test b/src/test/resources/sbt-test-resources/run/daemon-exit/test
new file mode 100644
index 000000000..57bd0350e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/daemon-exit/test
@@ -0,0 +1,2 @@
+> run
+[success]
diff --git a/src/test/resources/sbt-test-resources/run/daemon/project/build.properties b/src/test/resources/sbt-test-resources/run/daemon/project/build.properties
new file mode 100644
index 000000000..825710b2b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/daemon/project/build.properties
@@ -0,0 +1,3 @@
+project.version=1.0
+project.name=Daemon Thread Test
+project.organization=sbt
diff --git a/src/test/resources/sbt-test-resources/run/daemon/src/main/scala/Daemon.scala b/src/test/resources/sbt-test-resources/run/daemon/src/main/scala/Daemon.scala
new file mode 100644
index 000000000..a15a0e4cf
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/daemon/src/main/scala/Daemon.scala
@@ -0,0 +1,13 @@
+object Daemon
+{
+	def main(args: Array[String])
+	{
+		val t = new Thread {
+			override def run() {
+				synchronized { wait() }
+			}
+		}
+		t.setDaemon(true);
+		t.start
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/run/daemon/test b/src/test/resources/sbt-test-resources/run/daemon/test
new file mode 100644
index 000000000..57bd0350e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/daemon/test
@@ -0,0 +1,2 @@
+> run
+[success]
diff --git a/src/test/resources/sbt-test-resources/run/spawn-exit/project/build.properties b/src/test/resources/sbt-test-resources/run/spawn-exit/project/build.properties
new file mode 100644
index 000000000..825710b2b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/spawn-exit/project/build.properties
@@ -0,0 +1,3 @@
+project.version=1.0
+project.name=Daemon Thread Test
+project.organization=sbt
diff --git a/src/test/resources/sbt-test-resources/run/spawn-exit/src/main/scala/Spawn.scala b/src/test/resources/sbt-test-resources/run/spawn-exit/src/main/scala/Spawn.scala
new file mode 100644
index 000000000..766ed2955
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/spawn-exit/src/main/scala/Spawn.scala
@@ -0,0 +1,30 @@
+// The purpose of this test is to verify that sbt.TrapExit properly waits for Threads started after
+//   the main method exits and that it handles System.exit from a second generation thread.
+// The first thread waits 1s for the main method to exit and then creates another thread.
+//   This thread waits another second before calling System.exit.  The first thread hangs around to
+//   ensure that TrapExit actually processes the exit.
+
+object Spawn
+{
+	def main(args: Array[String])
+	{
+		(new ThreadA).start
+	}
+	class ThreadA extends Thread
+	{
+		override def run()
+		{
+			Thread.sleep(1000)
+			(new ThreadB).start()
+			synchronized { wait() }
+		}
+	}
+	class ThreadB extends Thread
+	{
+		override def run()
+		{
+			Thread.sleep(1000)
+			System.exit(0)
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/run/spawn-exit/test b/src/test/resources/sbt-test-resources/run/spawn-exit/test
new file mode 100644
index 000000000..57bd0350e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/spawn-exit/test
@@ -0,0 +1,2 @@
+> run
+[success]
diff --git a/src/test/resources/sbt-test-resources/run/spawn/project/build.properties b/src/test/resources/sbt-test-resources/run/spawn/project/build.properties
new file mode 100644
index 000000000..825710b2b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/spawn/project/build.properties
@@ -0,0 +1,3 @@
+project.version=1.0
+project.name=Daemon Thread Test
+project.organization=sbt
diff --git a/src/test/resources/sbt-test-resources/run/spawn/src/main/scala/Spawn.scala b/src/test/resources/sbt-test-resources/run/spawn/src/main/scala/Spawn.scala
new file mode 100644
index 000000000..4845e572b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/spawn/src/main/scala/Spawn.scala
@@ -0,0 +1,35 @@
+// The purpose of this test is to verify that sbt.TrapExit properly waits for Threads started after
+//   the main method exits.
+// The first thread waits 1s for the main method to exit and then creates another thread.
+//   This thread waits another second before exiting.
+
+object Spawn
+{
+	def main(args: Array[String])
+	{
+		(new ThreadA).start
+	}
+	class ThreadA extends Thread
+	{
+		override def run()
+		{
+			sleep()
+			(new ThreadB).start()
+		}
+	}
+	class ThreadB extends Thread
+	{
+		override def run() { sleep() }
+	}
+	private def sleep()
+	{
+		try { Thread.sleep(1000) }
+		catch
+		{
+			case e: InterruptedException =>
+				val msg = "TrapExit improperly interrupted non-daemon thread"
+				System.err.println(msg)
+				error(msg)
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/run/spawn/test b/src/test/resources/sbt-test-resources/run/spawn/test
new file mode 100644
index 000000000..57bd0350e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/run/spawn/test
@@ -0,0 +1,2 @@
+> run
+[success]
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A.scala b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A.scala
new file mode 100644
index 000000000..0c52ad165
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A.scala
@@ -0,0 +1,6 @@
+package a
+
+object A
+{
+	def x = "A"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A2.scala b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A2.scala
new file mode 100644
index 000000000..2e85f9808
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A2.scala
@@ -0,0 +1,6 @@
+/*package a
+
+object A
+{
+	def x = "A"
+}*/
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/B.scala b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/B.scala
new file mode 100644
index 000000000..7865ddcec
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/B.scala
@@ -0,0 +1,6 @@
+package a
+
+class B
+{
+	def x = A.x
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/project/build.properties b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/project/build.properties
new file mode 100644
index 000000000..5fe3e1d87
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Tue Jan 27 07:55:42 EST 2009
+project.name=Empty Source Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/test b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/test
new file mode 100644
index 000000000..2e58e8cb9
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/empty-a/test
@@ -0,0 +1,41 @@
+$ copy-file changes/A.scala src/main/scala/A.scala
+[success]
+
+> compile
+[success]
+
+$ copy-file changes/A2.scala src/main/scala/A.scala
+[success]
+
+> compile
+[success]
+
+$ copy-file changes/B.scala src/main/scala/B.scala
+[success]
+
+> compile
+[failure]
+
+$ copy-file changes/A.scala src/main/scala/A.scala
+[success]
+
+> compile
+[success]
+
+$ delete src/main/scala/B.scala
+[success]
+
+$ copy-file changes/A2.scala src/main/scala/A.scala
+[success]
+
+> compile
+[success]
+
+$ copy-file changes/A.scala src/main/scala/A.scala
+[success]
+
+$ copy-file changes/B.scala src/main/scala/B.scala
+[success]
+
+> compile
+[success]
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/changes/A2.scala b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/changes/A2.scala
new file mode 100644
index 000000000..c530efeb4
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/changes/A2.scala
@@ -0,0 +1 @@
+trait A { val x = (new B).y }
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/project/build.properties b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/project/build.properties
new file mode 100644
index 000000000..66fbd1686
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Mon Feb 09 21:05:16 EST 2009
+project.name=Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/A.scala b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/A.scala
new file mode 100644
index 000000000..d6d4ebdd9
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/A.scala
@@ -0,0 +1 @@
+trait A { val x = "hello" }
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/B.scala b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/B.scala
new file mode 100644
index 000000000..4fa74512d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/B.scala
@@ -0,0 +1 @@
+class B extends A { val y = x }
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/test b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/test
new file mode 100644
index 000000000..1a8ead2f3
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/test
@@ -0,0 +1,8 @@
+> compile
+[success]
+
+$ copy-file changes/A2.scala src/main/scala/A.scala
+[success]
+
+> compile
+[failure]
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/changes/1.scala b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/changes/1.scala
new file mode 100644
index 000000000..1444a85e8
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/changes/1.scala
@@ -0,0 +1,6 @@
+package test
+
+object TestScriptTest
+{
+	val x: Int = ""
+}
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/project/build.properties b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/project/build.properties
new file mode 100644
index 000000000..8c4503ca9
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Fri Jan 23 22:29:49 EST 2009
+project.name=Test Project A
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/test b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/test
new file mode 100644
index 000000000..e3d44e4e1
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/test
@@ -0,0 +1,14 @@
+> compile
+[success]
+
+$ copy-file changes/1.scala src/main/scala/1.scala
+[success]
+
+> compile
+[error]
+
+$ delete src/main/scala/1.scala
+[success]
+
+> compile
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/A2.scala b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/A2.scala
new file mode 100644
index 000000000..b971413bf
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/A2.scala
@@ -0,0 +1,6 @@
+package test
+
+object A
+{
+	def test = B.length
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B3.scala b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B3.scala
new file mode 100644
index 000000000..c5a1267df
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B3.scala
@@ -0,0 +1,6 @@
+package test
+
+object B
+{
+	def length: Int = 5
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B4.scala b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B4.scala
new file mode 100644
index 000000000..86a6cb4b9
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B4.scala
@@ -0,0 +1,5 @@
+package test
+
+object B
+{
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B5.scala b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B5.scala
new file mode 100644
index 000000000..8829a8f73
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B5.scala
@@ -0,0 +1,5 @@
+/*package test
+
+object B
+{
+}*/
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/project/build.properties b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/project/build.properties
new file mode 100644
index 000000000..fcc97e13f
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Sat Jan 24 19:12:23 EST 2009
+project.name=Remove Test B
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/A.scala b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/A.scala
new file mode 100644
index 000000000..af481a935
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/A.scala
@@ -0,0 +1,5 @@
+package test
+
+object A
+{
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/B.scala b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/B.scala
new file mode 100644
index 000000000..86a6cb4b9
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/B.scala
@@ -0,0 +1,5 @@
+package test
+
+object B
+{
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/test b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/test
new file mode 100644
index 000000000..4d9f786f3
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/test
@@ -0,0 +1,50 @@
+> compile
+[success]
+
+$ copy-file changes/A2.scala src/main/scala/A.scala
+[success]
+
+> compile
+[error]
+
+$ copy-file changes/B3.scala src/main/scala/B.scala
+[success]
+
+> compile
+[success]
+
+$ delete src/main/scala/B.scala
+[success]
+
+> compile
+[failure]
+
+$ copy-file changes/B3.scala src/main/scala/B.scala
+[success]
+
+> compile
+[success]
+
+$ copy-file changes/B4.scala src/main/scala/B.scala
+[success]
+
+> compile
+[failure]
+
+$ copy-file changes/B3.scala src/main/scala/B.scala
+[success]
+
+> compile
+[success]
+
+$ copy-file changes/B5.scala src/main/scala/B.scala
+[success]
+
+> compile
+[failure]
+
+$ copy-file changes/B3.scala src/main/scala/B.scala
+[success]
+
+> compile
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/first.scala b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/first.scala
new file mode 100644
index 000000000..d21cd83e2
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/first.scala
@@ -0,0 +1,4 @@
+object First
+{
+	def main(args: Array[String]) {}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/second.scala b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/second.scala
new file mode 100644
index 000000000..e64067f1e
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/second.scala
@@ -0,0 +1,4 @@
+object Second
+{
+	def main(args: Array[String]) {}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build.properties b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build.properties
new file mode 100644
index 000000000..2b4d7e5a1
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build/src/TestProject.scala
new file mode 100644
index 000000000..a50180c06
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build/src/TestProject.scala
@@ -0,0 +1,9 @@
+import sbt._
+import java.net.URLClassLoader
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	lazy val checkFirst = checkTask("First")
+	lazy val checkSecond = checkTask("Second")
+	private def checkTask(className: String) = task { doCheck(className); None }
+	private def doCheck(className: String) = Class.forName(className, false, new URLClassLoader(runClasspath.get.map(_.asURL).toList.toArray))
+}
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/test b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/test
new file mode 100644
index 000000000..cdaf24b09
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/test
@@ -0,0 +1,19 @@
+$ copy-file changes/first.scala src/main/scala/A.scala
+[success]
+
+> compile
+[success]
+> check-first
+[success]
+> check-second
+[failure]
+
+$ copy-file changes/second.scala src/main/scala/A.scala
+[success]
+
+> compile
+[success]
+> check-first
+[failure]
+> check-second
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/changes/A2.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/changes/A2.scala
new file mode 100644
index 000000000..8811bc83d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/changes/A2.scala
@@ -0,0 +1,4 @@
+object A
+{
+	val x = 5
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/project/build.properties b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/project/build.properties
new file mode 100644
index 000000000..309b0ced2
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Mon Jan 26 19:13:08 EST 2009
+project.name=Transitive A
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/A.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/A.scala
new file mode 100644
index 000000000..a0121ded0
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/A.scala
@@ -0,0 +1,4 @@
+object A
+{
+	val x = "a"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/B.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/B.scala
new file mode 100644
index 000000000..da3e21492
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/B.scala
@@ -0,0 +1,4 @@
+object B
+{
+	val y = A.x
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/C.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/C.scala
new file mode 100644
index 000000000..0c2345e0f
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/C.scala
@@ -0,0 +1,4 @@
+object C
+{
+	val z = B.y.length
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/test b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/test
new file mode 100644
index 000000000..efa71c72b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/test
@@ -0,0 +1,8 @@
+> compile
+[success]
+
+$ copy-file changes/A2.scala src/main/scala/A.scala
+[success]
+
+> compile
+[failure]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/changes/A2.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/changes/A2.scala
new file mode 100644
index 000000000..3a0001416
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/changes/A2.scala
@@ -0,0 +1,4 @@
+trait A
+{
+	val x = 5
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/project/build.properties b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/project/build.properties
new file mode 100644
index 000000000..309b0ced2
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Mon Jan 26 19:13:08 EST 2009
+project.name=Transitive A
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/A.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/A.scala
new file mode 100644
index 000000000..d49070e79
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/A.scala
@@ -0,0 +1,4 @@
+trait A
+{
+	val x = "a"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/B.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/B.scala
new file mode 100644
index 000000000..310eb5b60
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/B.scala
@@ -0,0 +1 @@
+trait B extends A
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/C.scala b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/C.scala
new file mode 100644
index 000000000..da117fc3f
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/C.scala
@@ -0,0 +1,4 @@
+trait C extends B
+{
+	val z = x.length
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/test b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/test
new file mode 100644
index 000000000..efa71c72b
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/test
@@ -0,0 +1,8 @@
+> compile
+[success]
+
+$ copy-file changes/A2.scala src/main/scala/A.scala
+[success]
+
+> compile
+[failure]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/ivy.xml b/src/test/resources/sbt-test-resources/tests/Class.forName/ivy.xml
new file mode 100644
index 000000000..d1cc76e1a
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/Class.forName/ivy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
+	<info organisation="sbt" module="resources-test"/>
+	<configurations>
+		<conf name="test"/>
+	</configurations>
+	<dependencies>
+		<dependency org="org.specs" name="specs" rev="1.4.1" transitive="false" conf="test->default"/>
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/project/build.properties b/src/test/resources/sbt-test-resources/tests/Class.forName/project/build.properties
new file mode 100644
index 000000000..c2f7ceba7
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/Class.forName/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Tue Mar 24 17:40:29 EDT 2009
+project.organization=empty
+project.name=class-forname
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/src/main/scala/Test.scala b/src/test/resources/sbt-test-resources/tests/Class.forName/src/main/scala/Test.scala
new file mode 100644
index 000000000..906b37f37
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/Class.forName/src/main/scala/Test.scala
@@ -0,0 +1,10 @@
+package lib
+
+object Test
+{
+	def other = Class.forName("lib.OtherTest")
+	def otherThread = Class.forName("lib.OtherTest2", true, Thread.currentThread.getContextClassLoader)
+}
+
+class OtherTest
+class OtherTest2
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/src/test/scala/Test.scala b/src/test/resources/sbt-test-resources/tests/Class.forName/src/test/scala/Test.scala
new file mode 100644
index 000000000..e213f62c7
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/Class.forName/src/test/scala/Test.scala
@@ -0,0 +1,15 @@
+package test
+
+import org.specs._
+
+object TestSpecification extends Specification
+{
+  "Class.forName must work in libraries used in tests" in {
+     val a: AnyRef = lib.Test.other
+     a must notBe(null)
+  }
+  "Class.forName using Thread.getContextLoader must work in libraries used in tests" in {
+     val a: AnyRef = lib.Test.otherThread
+     a must notBe(null)
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/test b/src/test/resources/sbt-test-resources/tests/Class.forName/test
new file mode 100644
index 000000000..401921be5
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/Class.forName/test
@@ -0,0 +1,23 @@
+# Create a jar that contains two classes: Test and OtherTest
+#  Test loads OtherTest using Class.forName
+> package
+[success]
+
+# get the specs jar
+> update
+[success]
+
+# copy to the lib_managed/test directory to simulate
+#  a library on the 'test' configuration
+$ copy-file target/class-forname-1.0.jar lib_managed/test/forname.jar
+[success]
+
+# Remove the classes that created the jar
+$ delete src/main/ target/
+[success]
+
+# Compile and run the test that calls into the jar created above
+#  It won't succeed if something is messed up with class loading
+> test
+[success]
+
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/ScalaCheck.scala b/src/test/resources/sbt-test-resources/tests/extend/changes/ScalaCheck.scala
new file mode 100644
index 000000000..4a436c7aa
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/changes/ScalaCheck.scala
@@ -0,0 +1,41 @@
+/** This tests implementing a test framework in a project definition.  To ensure sbt's builtin ScalaCheck
+* test framework is not used, it flips success and failure so that a failing test is marked as succeeding and
+* a suceeding test is marked as failing. */
+
+package framework
+
+import sbt._
+
+object FrameworkScalaCheck extends LazyTestFramework
+{
+	val name = "ScalaCheck"
+
+	def testSuperClassName = "org.scalacheck.Properties"
+	def testSubClassType = ClassType.Module
+
+	def testRunnerClassName = "framework.RunnerScalaCheck"
+}
+
+class RunnerScalaCheck(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
+{
+	import org.scalacheck.{Pretty, Properties, Test}
+	def runTest(testClassName: String): Result.Value =
+	{
+		val test = ModuleUtilities.getObject(testClassName, testLoader).asInstanceOf[Properties]
+		val result = Test.checkProperties(test, Test.defaultParams, propReport, testReport).find(!_._2.passed)
+		if(result.isEmpty)
+			Result.Failed // intentionally flipped (see top comment)
+		else
+			Result.Passed // intentionally flipped (see top comment)
+	}
+	private def propReport(pName: String, s: Int, d: Int) {}
+	private def testReport(name: String, res: Test.Result)
+	{
+		val msg = Pretty.pretty(res)
+		if(res.passed)
+			log.info("+ " + name + ": " + msg)
+		else
+			log.error("! " + name + ": " + msg)
+		
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestFailure.scala b/src/test/resources/sbt-test-resources/tests/extend/changes/TestFailure.scala
new file mode 100644
index 000000000..cbf7461ac
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/changes/TestFailure.scala
@@ -0,0 +1,6 @@
+
+import org.scalacheck._
+object TestFailure extends Properties("Success -> Failure")
+{
+	specify("Always true", (i: Int) => true)
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject2.scala b/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject2.scala
new file mode 100644
index 000000000..2f0a0c805
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject2.scala
@@ -0,0 +1,8 @@
+import sbt._
+
+class TestProject2(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def testFrameworks = framework.FrameworkScalaCheck :: Nil
+	override def useMavenConfigurations = true	
+	val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default"
+}
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject3.scala b/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject3.scala
new file mode 100644
index 000000000..80205752d
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject3.scala
@@ -0,0 +1,12 @@
+import sbt._
+
+class TestProject3(info: ProjectInfo) extends ParentProject(info)
+{
+	lazy val child = project("child", "Main", new ChildProject(_))
+	class ChildProject(info: ProjectInfo) extends DefaultProject(info)
+	{
+		override def testFrameworks = framework.FrameworkScalaCheck :: Nil
+		override def useMavenConfigurations = true
+		val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default"
+	}
+}
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestSuccess.scala b/src/test/resources/sbt-test-resources/tests/extend/changes/TestSuccess.scala
new file mode 100644
index 000000000..06cd573d0
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/changes/TestSuccess.scala
@@ -0,0 +1,6 @@
+
+import org.scalacheck._
+object TestSuccess extends Properties("Failure -> Success")
+{
+	specify("Always false", (i: Int) => false)
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/extend/project/build.properties b/src/test/resources/sbt-test-resources/tests/extend/project/build.properties
new file mode 100644
index 000000000..6a367a1d6
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Wed Apr 29 15:43:25 EDT 2009
+project.organization=sbt
+project.name=framework
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/tests/extend/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/tests/extend/project/build/src/TestProject.scala
new file mode 100644
index 000000000..95e20dce2
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/project/build/src/TestProject.scala
@@ -0,0 +1,9 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val sc = "org.scalacheck" % "scalacheck" % "1.5"
+
+	override def updateAction = super.updateAction dependsOn addSbt
+	lazy val addSbt = task { FileUtilities.copyFile(FileUtilities.sbtJar, (dependencyPath / "sbt.jar").asFile, log) }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/extend/test b/src/test/resources/sbt-test-resources/tests/extend/test
new file mode 100644
index 000000000..3b0a9ba30
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/extend/test
@@ -0,0 +1,72 @@
+# get ScalaCheck library and copy the main sbt jar to the lib directory
+> update
+[success]
+
+# Copy the source file implementing the framework to the src tree
+$ copy-file changes/ScalaCheck.scala src/main/scala/ScalaCheck.scala
+[success]
+
+# compile and package the framework
+> package
+[success]
+
+# move the test framework jar to the build project and delete the sources and the sbt jar
+# The test framework runs ScalaCheck tests, but swaps success and failure
+# to ensure the custom framework is being used and not sbt's built-in ScalaCheck support
+$ copy-file target/framework-1.0.jar project/build/lib/framework-1.0.jar
+[success]
+$ delete target/framework-1.0.jar
+[success]
+$ delete src/main
+[success]
+$ delete lib
+[success]
+
+# replace the project definition with the one that uses the framework, reload, and update
+# (update moves scalatest.jar to the 'test' configuration)
+$ copy-file changes/TestProject2.scala project/build/src/TestProject.scala
+[success]
+$ reload
+[success]
+> update
+[success]
+
+# Copy a source containing a failing test that the framework should mark as succeeding
+$ copy-file changes/TestSuccess.scala src/test/scala/TestSuccess.scala
+[success]
+> test
+[success]
+
+
+# Copy a source containing a successful test that the framework should mark as failing
+# First, delete the previous test
+$ delete src/test/scala/TestSuccess.scala
+[success]
+$ copy-file changes/TestFailure.scala src/test/scala/TestFailure.scala
+[success]
+> test
+[failure]
+
+
+# replace the project definition with one that tests a child project
+# reload, and update
+$ copy-file changes/TestProject3.scala project/build/src/TestProject.scala
+[success]
+$ reload
+[success]
+> update
+[success]
+
+# remove sources in the parent project
+$ delete src
+[success]
+# Copy a source containing a failing test that the framework should mark as succeeding
+$ copy-file changes/TestSuccess.scala child/src/test/scala/TestSuccess.scala
+[success]
+> test
+[success]
+# Copy a source containing a successful test that the framework should mark as failing
+$ copy-file changes/TestFailure.scala child/src/test/scala/TestFailure.scala
+[success]
+> test
+[failure]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/resources/ivy.xml b/src/test/resources/sbt-test-resources/tests/resources/ivy.xml
new file mode 100644
index 000000000..0a7c1fb35
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/resources/ivy.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://ant.apache.org/ivy/schemas/ivy.xsd">
+	<info organisation="sbt" module="resources-test"/>
+	<dependencies>
+		<dependency org="org.specs" name="specs" rev="1.4.1" transitive="false" conf="default"/>
+	</dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/resources/project/build.properties b/src/test/resources/sbt-test-resources/tests/resources/project/build.properties
new file mode 100644
index 000000000..f6079cb71
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/resources/project/build.properties
@@ -0,0 +1,3 @@
+#Project properties
+project.name=Resources Test
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/tests/resources/src/main/resources/MainResource.txt b/src/test/resources/sbt-test-resources/tests/resources/src/main/resources/MainResource.txt
new file mode 100644
index 000000000..1c9bf4968
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/resources/src/main/resources/MainResource.txt
@@ -0,0 +1 @@
+Main
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/resources/src/test/resources/TestResource.txt b/src/test/resources/sbt-test-resources/tests/resources/src/test/resources/TestResource.txt
new file mode 100644
index 000000000..51da4200a
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/resources/src/test/resources/TestResource.txt
@@ -0,0 +1 @@
+Success
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/resources/src/test/scala/BasicTest.scala b/src/test/resources/sbt-test-resources/tests/resources/src/test/scala/BasicTest.scala
new file mode 100644
index 000000000..9d2540347
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/resources/src/test/scala/BasicTest.scala
@@ -0,0 +1,11 @@
+import org.specs._
+
+object BasicTest extends Specification
+{
+  "Test resource on test classpath" in {
+     getClass.getResource("TestResource.txt") mustNotBe null
+  }
+  "Main resource on test classpath" in {
+     getClass.getResource("MainResource.txt") mustNotBe null
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/resources/test b/src/test/resources/sbt-test-resources/tests/resources/test
new file mode 100644
index 000000000..3653c1158
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/resources/test
@@ -0,0 +1,5 @@
+> update
+[success]
+
+> test
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/BasicTest.scala b/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/BasicTest.scala
new file mode 100755
index 000000000..9478475b2
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/BasicTest.scala
@@ -0,0 +1,21 @@
+import org.scalacheck._
+
+object BasicTest extends Properties("A basic runnable test")
+{
+	specify("startsWith", (a: String, b: String) => (a+b).startsWith(a))
+}
+
+abstract class AbstractNotATest extends Properties("Not a runnable test")
+{
+	specify("Fail", (a: Int, b: Int) => false)
+}
+
+class ClassNotATest extends Properties("Not a runnable test")
+{
+	specify("Fail", (a: Int, b: Int) => false)
+}
+
+trait TraitNotATest
+{ self: Properties =>
+	specify("Fail", (a: Int, b: Int) => false)
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/FailedTest.scala b/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/FailedTest.scala
new file mode 100755
index 000000000..079d0da20
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/FailedTest.scala
@@ -0,0 +1,21 @@
+import org.scalacheck._
+
+object BasicTest extends Properties("A basic runnable test")
+{
+	specify("startsWith", (a: String, b: String) => (a+b).startsWith(a))
+}
+
+abstract class AbstractNotATest extends Properties("Not a runnable test")
+{
+	specify("Fail", (a: Int, b: Int) => false)
+}
+
+object ClassNotATest extends Properties("A failing test")
+{
+	specify("Fail", (a: Int, b: Int) => false)
+}
+
+trait TraitNotATest extends Properties("Not a runnable test")
+{
+	specify("Fail", (a: Int, b: Int) => false)
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build.properties b/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build.properties
new file mode 100755
index 000000000..f9da83551
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Tue Feb 03 14:43:21 EST 2009
+project.name=ScalaCheck Support Test
+project.version=9.3
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build/src/TestProject.scala
new file mode 100755
index 000000000..e5ab1f803
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build/src/TestProject.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val scalacheck = "org.scalacheck" % "scalacheck" % "1.5"
+	val cacheDirectory = outputPath / "cache"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/src/test/scala/DummyTest.scala b/src/test/resources/sbt-test-resources/tests/scalacheck-a/src/test/scala/DummyTest.scala
new file mode 100755
index 000000000..e33905e34
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalacheck-a/src/test/scala/DummyTest.scala
@@ -0,0 +1,2 @@
+
+class DummyTest 
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/test b/src/test/resources/sbt-test-resources/tests/scalacheck-a/test
new file mode 100755
index 000000000..d75fcb579
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalacheck-a/test
@@ -0,0 +1,23 @@
+> test
+[success]
+
+$ copy-file changes/BasicTest.scala src/test/scala/BasicTest.scala
+[success]
+
+$ delete src/test/scala/DummyTest.scala
+[success]
+
+> test-compile
+[error]
+
+> update
+[success]
+
+> test
+[success]
+
+$ copy-file changes/FailedTest.scala src/test/scala/BasicTest.scala
+[success]
+
+> test
+[failure]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build.properties b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build.properties
new file mode 100644
index 000000000..2f60fce89
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Ignore Test
+project.version=3.9.2
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build/Test.scala b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build/Test.scala
new file mode 100644
index 000000000..14c47cd63
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build/Test.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def useMavenConfigurations = true
+	val st = "org.scala-tools.testing" % "scalatest" % "0.9.5" % "test->default"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
new file mode 100644
index 000000000..beb547e75
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
@@ -0,0 +1,11 @@
+import org.scalatest._
+import org.scalatest.matchers._
+
+class IgnoreTest extends Spec with BeforeAndAfter with MustMatchers {
+
+        describe("This test") {
+                ignore("should be ignored") {
+                   error("Test ran")
+                }
+        }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/test b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/test
new file mode 100644
index 000000000..3653c1158
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/scalatest-ignore/test
@@ -0,0 +1,5 @@
+> update
+[success]
+
+> test
+[success]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/changes/BasicTest.scala b/src/test/resources/sbt-test-resources/tests/specs-a/changes/BasicTest.scala
new file mode 100755
index 000000000..fc0834d27
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-a/changes/BasicTest.scala
@@ -0,0 +1,36 @@
+import org.specs._
+
+object BasicTest extends Specification
+{
+ // from specs example
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 11
+  }
+  "'hello world' matches 'h.* w.*'" in {
+     "hello world" must beMatching("h.* w.*")
+  }
+}
+
+trait TraitNotATest extends Specification
+{
+	// would fail if called
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 12
+  }
+}
+
+abstract class AbstractNotATest extends Specification
+{
+	// would fail if called
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 12
+  }
+}
+
+class ClassNotATest extends Specification
+{
+	// would fail if called
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 12
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/changes/FailTest.scala b/src/test/resources/sbt-test-resources/tests/specs-a/changes/FailTest.scala
new file mode 100755
index 000000000..8df53ef80
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-a/changes/FailTest.scala
@@ -0,0 +1,36 @@
+import org.specs._
+
+object BasicTest extends Specification
+{
+ // from specs example
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 11
+  }
+  "'hello world' matches 'h.* w.*'" in {
+     "hello world" must beMatching("h.* w.*")
+  }
+}
+
+trait TraitNotATest extends Specification
+{
+	// would fail if called
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 12
+  }
+}
+
+object FailTest extends Specification
+{
+	// would fail if called
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 12
+  }
+}
+
+class ClassNotATest extends Specification
+{
+	// would fail if called
+  "'hello world' has 11 characters" in {
+     "hello world".size mustEqual 12
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/project/build.properties b/src/test/resources/sbt-test-resources/tests/specs-a/project/build.properties
new file mode 100755
index 000000000..ec1f47dd0
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-a/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Tue Feb 03 15:05:44 EST 2009
+project.name=Specs Support Test
+project.version=5.5.4
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/tests/specs-a/project/build/src/TestProject.scala
new file mode 100755
index 000000000..a286ac738
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-a/project/build/src/TestProject.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val scalacheck = "org.specs" % "specs" % "1.4.1"
+	val cacheDirectory = outputPath / "cache"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/src/test/scala/DummyTest.scala b/src/test/resources/sbt-test-resources/tests/specs-a/src/test/scala/DummyTest.scala
new file mode 100755
index 000000000..71c316a47
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-a/src/test/scala/DummyTest.scala
@@ -0,0 +1,2 @@
+
+class DummyTest
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/test b/src/test/resources/sbt-test-resources/tests/specs-a/test
new file mode 100755
index 000000000..9325193a0
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-a/test
@@ -0,0 +1,23 @@
+> test
+[success]
+
+$ copy-file changes/BasicTest.scala src/test/scala/BasicTest.scala
+[success]
+
+$ delete src/test/scala/DummyTest.scala
+[success]
+
+> test-compile
+[error]
+
+> update
+[success]
+
+> test
+[success]
+
+$ copy-file changes/FailTest.scala src/test/scala/BasicTest.scala
+[success]
+
+> test
+[failure]
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/project/build.properties b/src/test/resources/sbt-test-resources/tests/specs-nested/project/build.properties
new file mode 100755
index 000000000..cc9a4d3b6
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-nested/project/build.properties
@@ -0,0 +1,4 @@
+#Project properties
+#Wed Feb 25 18:38:37 EST 2009
+project.name=Nested Specifications
+project.version=1.0
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/project/build/src/TestProject.scala b/src/test/resources/sbt-test-resources/tests/specs-nested/project/build/src/TestProject.scala
new file mode 100755
index 000000000..e06023159
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-nested/project/build/src/TestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val scalacheck = "org.specs" % "specs" % "1.4.1"
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/src/test/scala/TestSpecification.scala b/src/test/resources/sbt-test-resources/tests/specs-nested/src/test/scala/TestSpecification.scala
new file mode 100755
index 000000000..2380afab5
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-nested/src/test/scala/TestSpecification.scala
@@ -0,0 +1,19 @@
+import org.specs._
+
+object TestSpecification extends Specification {
+  "A sample specification1" should {
+    "return something" in {
+      "hello" mustNotBe "world"
+    }
+  }
+  
+  object sampleSpecification extends Specification {
+    "the first system" should {
+      "skip one example" in { skip("skipped") }
+      "have one example ok" in {}
+      "have one example ko" in { 1 mustBe 2 }
+      "have one example in error" in { throw new Error("error") }
+    }    
+  }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/test b/src/test/resources/sbt-test-resources/tests/specs-nested/test
new file mode 100755
index 000000000..3653c1158
--- /dev/null
+++ b/src/test/resources/sbt-test-resources/tests/specs-nested/test
@@ -0,0 +1,5 @@
+> update
+[success]
+
+> test
+[success]
\ No newline at end of file
diff --git a/src/test/scala/sbt/DagSpecification.scala b/src/test/scala/sbt/DagSpecification.scala
new file mode 100644
index 000000000..4947e0819
--- /dev/null
+++ b/src/test/scala/sbt/DagSpecification.scala
@@ -0,0 +1,56 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah */
+
+package sbt
+
+import org.scalacheck._
+import Prop._
+
+import scala.collection.mutable.HashSet
+
+object DagSpecification extends Properties("Dag")
+{
+	specify("No repeated nodes", (dag: TestDag) => isSet(dag.topologicalSort))
+	specify("Sort contains node", (dag: TestDag) => dag.topologicalSort.contains(dag))
+	specify("Dependencies precede node", (dag: TestDag) => dependenciesPrecedeNodes(dag.topologicalSort))
+
+	implicit lazy val arbTestDag: Arbitrary[TestDag] = Arbitrary(Gen.sized(dagGen))
+	private def dagGen(nodeCount: Int): Gen[TestDag] =
+	{
+		val nodes = new HashSet[TestDag]
+		def nonterminalGen(p: Gen.Params): Gen[TestDag] =
+		{
+			for(i <- 0 until nodeCount; nextDeps <- Gen.someOf(nodes).apply(p))
+				nodes += new TestDag(i, nextDeps)
+			for(nextDeps <- Gen.someOf(nodes)) yield
+				new TestDag(nodeCount, nextDeps)
+		}
+		Gen.parameterized(nonterminalGen)
+	}
+	
+	private def isSet[T](c: Seq[T]) = Set(c: _*).size == c.size
+	private def dependenciesPrecedeNodes(sort: List[TestDag]) =
+	{
+		val seen = new HashSet[TestDag]
+		def iterate(remaining: List[TestDag]): Boolean =
+		{
+			remaining match
+			{
+				case Nil => true
+				case node :: tail =>
+					if(node.dependencies.forall(seen.contains) && !seen.contains(node))
+					{
+						seen += node
+						iterate(tail)
+					}
+					else
+						false
+			}
+		}
+		iterate(sort)
+	}
+}
+class TestDag(id: Int, val dependencies: Iterable[TestDag]) extends Dag[TestDag]
+{
+	override def toString = id + "->" + dependencies.mkString("[", ",", "]")
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/EnvironmentSpecification.scala b/src/test/scala/sbt/EnvironmentSpecification.scala
new file mode 100644
index 000000000..0468ee397
--- /dev/null
+++ b/src/test/scala/sbt/EnvironmentSpecification.scala
@@ -0,0 +1,98 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+import org.scalacheck._
+
+object EnvironmentSpecification extends Properties("Environment")
+{ s =>
+	private[this] type Env = BasicEnvironment { def x: Property[Int] }
+	
+	val log = new ConsoleLogger
+
+	specify("Non-optional user property assignment", testAssign _)
+	specify("Optional user property assignment", testDefaultAssign _)
+	specify("Optional user property default and assignment", testDefault _)
+	specify("Optional user property default and then assignment", testDefaultThenAssign _)
+	specify("Uninitialized empty when all properties are initialized", testUninitializedEmpty _)
+	specify("Uninitialized empty when all properties have defaults", testDefaultUninitializedEmpty _)
+	specify("Property defaulting to another property ok", propertyDefaultsToProperty _)
+	specify("Project-style name+organization", (name: String) => projectEmulation(name.trim))
+	
+	private def projectEmulation(testName: String) =
+	{
+		import Prop._
+		(!testName.isEmpty) ==>
+		withBacking { backing =>
+			def env = new DefaultEnv(backing) {
+				final def name: String = projectName.value
+				final val projectName = propertyLocalF[String](NonEmptyStringFormat)
+				final val projectOrganization = propertyOptional[String](name, true)
+			}
+			val first = env
+			first.projectName() = testName
+			first.saveEnvironment
+			val second = env
+			env.projectOrganization.value == testName
+		}
+	}
+	private def propertyDefaultsToProperty(value: Int) =
+	{
+		withBacking { backing =>
+			val env = new DefaultEnv(backing) {
+				val base = propertyOptional[Int](value)
+				val chained = propertyOptional[Int](base.value)
+			}
+			env.chained.value == value
+		}
+	}
+	private def testAssign(value: Int) =
+	{
+		withEnvironment { env =>
+			env.x() = value
+			env.x.value == value
+		}
+	}
+	private def testDefaultAssign(value: Int, default: Int) =
+	{
+		withDefaultEnvironment(default) { env =>
+			env.x() = value
+			env.x.value == value
+		}
+	}
+	private def testDefault(value: Int, default: Int) =
+	{
+		withDefaultEnvironment(default) { env =>
+			env.x.value == default
+		}
+	}
+	private def testDefaultThenAssign(value: Int, default: Int) =
+	{
+		withDefaultEnvironment(default) { env =>
+			env.x.value == default &&
+			{
+				env.x() = value
+				env.x.value == value
+			}
+		}
+	}
+	private def testUninitializedEmpty(value: Int) =
+	{
+		withEnvironment { env =>
+			env.x() = value
+			env.uninitializedProperties.isEmpty
+		}
+	}
+	private def testDefaultUninitializedEmpty(default: Int) = withDefaultEnvironment(default)(_.uninitializedProperties.isEmpty)
+	
+	private def defaultEnvironment(default: Int)(backing: Path) = new DefaultEnv(backing) { val x = propertyOptional[Int](default) }
+	private def environment(backing: Path) = new DefaultEnv(backing) { val x = property[Int] }
+	
+	private def withBacking[T](f: Path => T): T = Control.getOrError( FileUtilities.withTemporaryFile(log, "env", "")(file => Right(f(Path.fromFile(file))) ) )
+	private def withEnvironment[T](f: Env => T): T = withEnvironmentImpl(environment)(f)
+	private def withDefaultEnvironment[T](default: Int)(f: Env => T): T = withEnvironmentImpl(defaultEnvironment(default))(f)
+	private def withEnvironmentImpl[T](env: Path => Env)(f: Env => T): T = withBacking(f compose env)
+
+	private class DefaultEnv(val envBackingPath: Path) extends BasicEnvironment { def log = s.log }
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/FileUtilitiesSpecification.scala b/src/test/scala/sbt/FileUtilitiesSpecification.scala
new file mode 100644
index 000000000..d36807e11
--- /dev/null
+++ b/src/test/scala/sbt/FileUtilitiesSpecification.scala
@@ -0,0 +1,73 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import org.scalacheck._
+import java.io.File
+
+object WriteContentSpecification extends Properties("Write content")
+{
+	val log = new ConsoleLogger
+	log.setLevel(Level.Warn)
+	
+	specify("Roundtrip string", writeAndCheckString _)
+	specify("Roundtrip bytes", writeAndCheckBytes _)
+	specify("Write string overwrites", overwriteAndCheckStrings _)
+	specify("Write bytes overwrites", overwriteAndCheckBytes _)
+	specify("Append string appends", appendAndCheckStrings _)
+	specify("Append bytes appends", appendAndCheckBytes _)
+
+	// make the test independent of underlying platform and allow any unicode character in Strings to be encoded
+	val charset = java.nio.charset.Charset.forName("UTF-8")
+		
+	import FileUtilities._
+	private def writeAndCheckString(s: String) =
+	{
+		val result = withTemporaryFile( file => writeThen(file, s)( readString(file, charset, log) ) )
+		handleResult[String](result, _ == s)
+	}
+	private def writeAndCheckBytes(b: Array[Byte]) =
+	{
+		val result = withTemporaryFile( file => writeThen(file, b)( readBytes(file, log) ) )
+		handleResult[Array[Byte]](result, _ deepEquals b)
+	}
+	private def overwriteAndCheckStrings(a: String, b: String) =
+	{
+		val result = withTemporaryFile( file => writeThen(file, a)( writeThen(file, b)( readString(file, charset, log) ) ) )
+		handleResult[String](result, _ == b)
+	}
+	private def overwriteAndCheckBytes(a: Array[Byte], b: Array[Byte]) =
+	{
+		val result = withTemporaryFile( file => writeThen(file, a)( writeThen(file, b)( readBytes(file, log) ) ) )
+		handleResult[Array[Byte]](result, _ deepEquals b)
+	}
+	private def appendAndCheckStrings(a: String, b: String) =
+	{
+		val result = withTemporaryFile( file => appendThen(file, a)( appendThen(file, b)( readString(file, charset, log) ) ) )
+		handleResult[String](result, _ == (a+b))
+	}
+	private def appendAndCheckBytes(a: Array[Byte], b: Array[Byte]) =
+	{
+		val result = withTemporaryFile( file => appendThen(file, a)( appendThen(file, b)( readBytes(file, log) ) ) )
+		handleResult[Array[Byte]](result, _ deepEquals (a++b))
+	}
+	
+	private def withTemporaryFile[T](f: File => Either[String, T]): Either[String, T] =
+			doInTemporaryDirectory(log) { dir => f(new java.io.File(dir, "out")) }
+				
+	private def handleResult[T](result: Either[String, T], check: T => Boolean): Boolean =
+		result match
+		{
+			case Left(err) => log.trace(new RuntimeException(err)); log.error(err); false
+			case Right(x) => check(x)
+		}
+	private def writeThen[T](file: File, content: String)(action: => Either[String, T]) =
+		write(file, content, charset, log).toLeft(()).right.flatMap { x =>action }
+	private def writeThen[T](file: File, content: Array[Byte])(action: => Either[String, T]) =
+		write(file, content, log).toLeft(()).right.flatMap { x =>action }
+	private def appendThen[T](file: File, content: String)(action: => Either[String, T]) =
+		append(file, content, charset, log).toLeft(()).right.flatMap { x =>action }
+	private def appendThen[T](file: File, content: Array[Byte])(action: => Either[String, T]) =
+		append(file, content, log).toLeft(()).right.flatMap { x =>action }
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/NameFilterSpecification.scala b/src/test/scala/sbt/NameFilterSpecification.scala
new file mode 100644
index 000000000..ec2dd95a4
--- /dev/null
+++ b/src/test/scala/sbt/NameFilterSpecification.scala
@@ -0,0 +1,39 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah */
+
+package sbt
+
+import org.scalacheck._
+import Prop._
+
+object NameFilterSpecification extends Properties("NameFilter")
+{
+	specify("All pass accepts everything", (s: String) => AllPassFilter.accept(s))
+	specify("Exact filter matches provided string",
+		(s1: String, s2: String) =>  (new ExactFilter(s1)).accept(s2) == (s1 == s2) )
+	specify("Exact filter matches valid string", (s: String) => (new ExactFilter(s)).accept(s) )
+	
+	specify("Glob filter matches provided string if no *s",
+		(s1: String, s2: String) =>
+		{
+			val stripped = stripAsterisksAndControl(s1)
+			(GlobFilter(stripped).accept(s2) == (stripped == s2))
+		})
+	specify("Glob filter matches valid string if no *s",
+		(s: String) =>
+		{
+			val stripped = stripAsterisksAndControl(s)
+			GlobFilter(stripped).accept(stripped)
+		})
+	
+	specify("Glob filter matches valid",
+		(list: List[String]) =>
+		{
+			val stripped = list.map(stripAsterisksAndControl)
+			GlobFilter(stripped.mkString("*")).accept(stripped.mkString)
+		})
+	
+	/** Raw control characters are stripped because they are not allowed in expressions.
+	* Asterisks are stripped because they are added under the control of the tests.*/
+	private def stripAsterisksAndControl(s: String) = s.filter(c => !java.lang.Character.isISOControl(c) && c != '*').toString
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/PathSpecification.scala b/src/test/scala/sbt/PathSpecification.scala
new file mode 100644
index 000000000..a65e2d98f
--- /dev/null
+++ b/src/test/scala/sbt/PathSpecification.scala
@@ -0,0 +1,109 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ */
+package sbt
+
+import org.scalacheck._
+import Arbitrary.arbitrary
+import Prop._
+import java.io.File
+
+object PathSpecification extends Properties("Path")
+{
+	val log = new ConsoleLogger
+	log.setLevel(Level.Warn)
+	
+	implicit val pathComponent: Arbitrary[String] =
+		Arbitrary(for(id <- Gen.identifier) yield trim(id)) // TODO: make a more specific Arbitrary
+	implicit val projectDirectory: Arbitrary[ProjectDirectory] = Arbitrary(Gen.value(new ProjectDirectory(new File("."))))
+	implicit val arbPath: Arbitrary[Path] = Arbitrary(genPath)
+	
+	specify("Project directory relative path empty", (projectPath: ProjectDirectory) => projectPath.relativePath.isEmpty)
+	specify("construction", (dir: ProjectDirectory, components: List[String]) =>
+		pathForComponents(dir, components).asFile == fileForComponents(dir.asFile, components) )
+	specify("Relative path", (dir: ProjectDirectory, a: List[String], b: List[String]) =>
+		pathForComponents(pathForComponents(dir, a) ##, b).relativePath == pathString(b) )
+	specify("Proper URL conversion", (path: Path) => path.asURL == path.asFile.toURI.toURL)
+	specify("Path equality", (dir: ProjectDirectory, components: List[String]) =>
+		pathForComponents(dir, components) == pathForComponents(dir, components))
+	specify("Base path equality", (dir: ProjectDirectory, a: List[String], b: List[String]) =>
+		pathForComponents(pathForComponents(dir, a) ##, b) == pathForComponents(pathForComponents(dir, a) ##, b) )
+	specify("hashCode", (path: Path) => path.hashCode == path.asFile.hashCode)
+	
+	// the relativize tests are a bit of a mess because of a few things:
+	//  1) relativization requires directories to exist
+	//  2) there is an IOException thrown in touch for paths that are too long (probably should limit the size of the Lists)
+	// These problems are addressed by the helper method createFileAndDo
+	
+	specify("relativize fail", (dir: ProjectDirectory, a: List[String], b: List[String]) =>
+	{
+		(!a.contains("") && !b.contains("")) ==>
+		{
+			createFileAndDo(a, b)
+			{ dir =>
+				{
+					val shouldFail = (a == b) || !(b startsWith a) // will be true most of the time
+					val didFail = Path.relativize(pathForComponents(dir, a), pathForComponents(dir, b)).isEmpty
+					shouldFail == didFail
+				}
+			}
+		}
+	})
+	specify("relativize", (a: List[String], b: List[String]) =>
+	{
+		(!b.isEmpty && !a.contains("") && !b.contains("")) ==>
+		{
+			createFileAndDo(a, b)
+			{ dir =>
+				{
+					val base = pathForComponents(dir, a)
+					val path = pathForComponents(base, b)
+					Path.relativize(base, path) == Some(path)
+				}
+			}
+		}
+	})
+	specify("fromString", (dir: ProjectDirectory, a: List[String]) =>
+		pathForComponents(dir, a) == Path.fromString(dir, pathString(a)))
+	
+	private def createFileAndDo(a: List[String], b: List[String])(f: Path => Boolean) =
+	{
+		val result =
+			FileUtilities.doInTemporaryDirectory(log)( dir =>
+			{
+				FileUtilities.touch(fileForComponents(dir, a ::: b), log) match
+				{
+					case None => Right(Some( f(new ProjectDirectory(dir)) ))
+					case Some(err) => Left(err)
+				}
+			})
+		result match
+		{
+			case Left(err) => throw new RuntimeException(err)
+			case Right(opt) => opt.isDefined ==> opt.get
+		}
+	}
+	
+	private def pathString(components: List[String]): String = components.mkString(File.separator)
+	private def pathForComponents(base: Path, components: List[String]): Path =
+		components.foldLeft(base)((path, component) => path / component)
+	private def fileForComponents(base: File, components: List[String]): File =
+		components.foldLeft(base)((file, component) => new File(file, component))
+	private def genPath: Gen[Path] =
+		for(projectPath <- arbitrary[ProjectDirectory];
+			a <- arbitrary[List[String]];
+			b <- arbitrary[Option[List[String]]])
+		yield
+		{
+			val base = pathForComponents(projectPath, trim(a))
+			b match
+			{
+				case None => base
+				case Some(relative) => pathForComponents(base ##, trim(relative))
+			}
+		}
+	private def trim(components: List[String]): List[String] = components.take(MaxComponentCount)
+	private def trim(component: String): String = component.substring(0, Math.min(component.length, MaxFilenameLength))
+	val MaxFilenameLength = 20
+	val MaxComponentCount = 6
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/ProcessSpecification.scala b/src/test/scala/sbt/ProcessSpecification.scala
new file mode 100644
index 000000000..61d530555
--- /dev/null
+++ b/src/test/scala/sbt/ProcessSpecification.scala
@@ -0,0 +1,91 @@
+package sbt
+
+import java.io.File
+import org.scalacheck.{Prop, Properties}
+import Prop._
+
+import Process._
+
+object ProcessSpecification extends Properties("Process I/O")
+{
+	private val log = new ConsoleLogger
+	
+	specify("Correct exit code", (exitCode: Byte) => checkExit(exitCode))
+	specify("#&& correct", (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #&& _)(_ && _))
+	specify("#|| correct", (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #|| _)(_ || _))
+	specify("Pipe to output file", (data: Array[Byte]) => checkFileOut(data))
+	specify("Pipe to input file", (data: Array[Byte]) => checkFileIn(data))
+	specify("Pipe to process", (data: Array[Byte]) => checkPipe(data))
+
+	private def checkBinary(codes: Array[Byte])(reduceProcesses: (ProcessBuilder, ProcessBuilder) => ProcessBuilder)(reduceExit: (Boolean, Boolean) => Boolean) =
+	{
+		(codes.length > 1) ==>
+		{
+			val unsignedCodes = codes.map(unsigned)
+			val exitCode = unsignedCodes.map(code => Process(process("sbt.exit " + code))).reduceLeft(reduceProcesses) !
+			val expectedExitCode = unsignedCodes.map(toBoolean).reduceLeft(reduceExit)
+			toBoolean(exitCode) == expectedExitCode
+		}
+	}
+	private def toBoolean(exitCode: Int) = exitCode == 0
+	private def checkExit(code: Byte) =
+	{
+		val exitCode = unsigned(code)
+		(process("sbt.exit " + exitCode) !) == exitCode
+	}
+	private def checkFileOut(data: Array[Byte]) =
+	{
+		withData(data) { (temporaryFile, temporaryFile2) =>
+			val catCommand = process("sbt.cat " + temporaryFile.getAbsolutePath)
+			catCommand #> temporaryFile2
+		}
+	}
+	private def checkFileIn(data: Array[Byte]) =
+	{
+		withData(data) { (temporaryFile, temporaryFile2) =>
+			val catCommand = process("sbt.cat")
+			temporaryFile #> catCommand #> temporaryFile2
+		}
+	}
+	private def checkPipe(data: Array[Byte]) =
+	{
+		withData(data) { (temporaryFile, temporaryFile2) =>
+			val catCommand = process("sbt.cat")
+			temporaryFile #> catCommand #| catCommand #> temporaryFile2
+		}
+	}
+	private def temp() = File.createTempFile("sbt", "")
+	private def withData(data: Array[Byte])(f: (File, File) => ProcessBuilder) =
+	{
+		val temporaryFile1 = temp()
+		val temporaryFile2 = temp()
+		try
+		{
+			FileUtilities.write(temporaryFile1, data, log)
+			val process = f(temporaryFile1, temporaryFile2)
+			( process ! ) == 0 &&
+			{
+				val result =
+					for(b1 <- FileUtilities.readBytes(temporaryFile1, log).right; b2 <- FileUtilities.readBytes(temporaryFile2, log).right) yield
+						b1 deepEquals b2
+				result.fold(error, x => x)
+			}
+		}
+		finally
+		{
+			temporaryFile1.delete()
+			temporaryFile2.delete()
+		}
+	}
+	private def unsigned(b: Byte): Int = ((b: Int) +256) % 256
+	private def process(command: String) =
+	{
+		val ignore = echo // just for the compile dependency so that this test is rerun when TestedProcess.scala changes, not used otherwise
+		
+		val thisClasspath = List(getSource[ScalaObject], getSource[sbt.Logger], getSource[sbt.SourceTag]).mkString(File.pathSeparator)
+		"java -cp " + thisClasspath + " " + command
+	}
+	private def getSource[T](implicit mf: scala.reflect.Manifest[T]): String =
+		(new File(mf.erasure.getProtectionDomain.getCodeSource.getLocation.toURI)).getAbsolutePath
+}
+private trait SourceTag
\ No newline at end of file
diff --git a/src/test/scala/sbt/ReflectSpecification.scala b/src/test/scala/sbt/ReflectSpecification.scala
new file mode 100644
index 000000000..082359a78
--- /dev/null
+++ b/src/test/scala/sbt/ReflectSpecification.scala
@@ -0,0 +1,181 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ */
+package sbt
+
+// Still TODO:
+//   inheritance- hierarchy, overriding
+
+import org.scalacheck._
+import scala.reflect.Manifest
+
+// specify members
+// specify classes
+// map members to classes
+// compile, instantiate base
+// get all vals
+// validate vals
+
+object ReflectiveSpecification extends Properties("ReflectUtilities")
+{
+	import ReflectiveArbitrary._
+	// pick other modifiers, any name, any type for the member, any type to find,
+	//  pick a class hierarchy, select any class from that hierarchy, add member
+	//  instantiate instance, perform reflection and verify it is empty
+	specify("Public found", publicFound _)
+	specify("Private hidden", privateHidden _)
+	
+	private def publicFound(isFinal: Boolean, decl: DeclarationType, name: Identifier, rType: ReturnType,
+		findType: ReturnType, container: ConcreteContainer) =
+	{
+		val modifiers: Set[Modifier] = if(isFinal) Set(Final) else Set()
+		val member = Member(Public, modifiers, decl, name.toString, rType, true)
+		val shouldFind = decl != Def && rType.manifest <:< findType.manifest
+		allVals(Map(container -> List(member)), container, findType.manifest).isEmpty == !shouldFind
+	}
+	private def privateHidden(isFinal: Boolean, decl: DeclarationType, name: Identifier, rType: ReturnType,
+		findType: ReturnType, container: ConcreteContainer) =
+	{
+		val scope = Private(None)
+		val modifiers: Set[Modifier] = if(isFinal) Set(Final) else Set()
+		val member = Member(scope, modifiers, decl, name.toString, rType, true)
+		allVals(Map(container -> List(member)), container, findType.manifest).isEmpty
+	}
+	private def allVals(classes: Map[Container, List[Member]], check: Container, manifest: Manifest[_]) =
+	{
+		val instance = ReflectiveCreate.compileInstantiate(classes, check)
+		ReflectUtilities.allVals(instance)(manifest)
+	}
+}
+
+object ReflectiveArbitrary
+{
+	implicit val arbIdentifier: Arbitrary[Identifier] = Arbitrary { for(id <- Gen.identifier) yield Identifier(id) }
+	implicit val arbDeclarationType: Arbitrary[DeclarationType] = Arbitrary { Gen.elements(Val, Def, LazyVal) }
+	implicit val arbModifier: Arbitrary[Modifier] = Arbitrary { Gen.elements(Final, Abstract, Override) }
+	// TODO: parameterize
+	implicit val arbType: Arbitrary[ReturnType] =
+		Arbitrary { Gen.elements(classes: _*) }
+	implicit val arbConcrete: Arbitrary[ConcreteContainer] = Arbitrary(genConcrete)
+	//implicit val arbContainer: Arbitrary[Container] = Arbitrary { Gen.oneOf(arbConcreteContainer, arbTrait) }
+	//implicit val arbTrait: Arbitrary[Trait] = Arbitrary {  }
+	
+	//TODO: inheritance
+	def genConcrete = for(name <- Gen.identifier) yield ConcreteClass(name, None, Nil)
+	
+	val classes = List[ReturnType](
+		typ[String]("String", "null"),
+		typ[Object]("Object", "null"),
+		typ[Int]("Int", "0"),
+		typ[List[String]]("List[String]", "Nil"),
+		typ[Option[Int]]("Option[Int]", "None") )
+	
+	def typ[T](name: String, defaultValue: String)(implicit mf: Manifest[T]) =
+		BasicReturnType(name, Nil, mf, defaultValue)
+}
+
+object ReflectiveCreate
+{
+	import scala.collection.mutable
+	
+	def compileInstantiate(classes: Map[Container, List[Member]], instantiate: Container): AnyRef =
+	{
+		val log = new ConsoleLogger
+		log.setLevel(Level.Warn)
+		val code = new StringBuilder
+		def addMember(m: Member)
+		{
+			code.append(m.toString)
+			code.append("\n")
+		}
+		def addClass(c: Container, m: List[Member])
+		{
+			code.append(c.signature)
+			code.append(" {\n")
+			m.foreach(addMember)
+			code.append(" }\n")
+		}
+		for((c, members) <- classes) addClass(c, members)
+		
+		val codeString = code.toString
+		def doCompileInstantiate(dir: java.io.File): Either[String, AnyRef] =
+		{
+			val basePath = new ProjectDirectory(dir)
+			val source = basePath / "a.scala"
+			val sourceFile = source.asFile
+			val outputDirectory = basePath / "target"
+			for(writeOK <- FileUtilities.write(sourceFile, codeString, log).toLeft("").right;
+				compileOK <- (new Compile(100))("reflect", source :: Nil, "", outputDirectory, Nil, log).toLeft("").right)
+			yield
+			{
+				val loader = new java.net.URLClassLoader(Array(outputDirectory.asURL), getClass.getClassLoader)
+				val c = Class.forName(instantiate.name, true, loader)
+				c.newInstance.asInstanceOf[AnyRef]
+			}
+		}
+		FileUtilities.doInTemporaryDirectory(log)(doCompileInstantiate) match
+		{
+			case Left(err) => log.error(err); log.error(codeString); throw new RuntimeException(err)
+			case Right(x) => x
+		}
+	}
+}
+
+final case class Identifier(override val toString: String) extends NotNull
+
+sealed abstract class Modifier(override val toString: String) extends NotNull
+object Final extends Modifier("final")
+object Abstract extends Modifier("abstract")
+object Override extends Modifier("override")
+
+sealed trait Scope extends NotNull
+sealed abstract class QualifiedScope(label: String, qualifier: Option[String]) extends Scope
+{
+	override def toString = label + qualifier.map("[" + _ + "]").getOrElse("")
+}
+final case class Private(qualifier: Option[String]) extends QualifiedScope("private", qualifier)
+final case class Protected(qualifier: Option[String]) extends QualifiedScope("protected", qualifier)
+final object Public extends Scope { override def toString = "" }
+
+
+sealed abstract class DeclarationType(override val toString: String) extends NotNull
+object LazyVal extends DeclarationType("lazy val")
+object Val extends DeclarationType("val")
+object Def extends DeclarationType("def")
+
+sealed abstract class Container(prefix: String) extends NotNull
+{
+	def signature: String = prefix + " " + name + parents.map(_.name).mkString(" extends ", " with ", "")
+	def name: String
+	def mixins: List[Trait]
+	def parents: List[Container] = mixins
+}
+sealed abstract class ClassContainer(prefix: String) extends Container(prefix)
+{
+	def base: Option[ClassContainer]
+	override def parents = base.toList ::: mixins
+}
+sealed abstract class ConcreteContainer(prefix: String) extends ClassContainer(prefix)
+final case class AbstractClass(name: String, base: Option[ClassContainer], mixins: List[Trait]) extends ClassContainer("abstract class")
+final case class ConcreteClass(name: String, base: Option[ClassContainer], mixins: List[Trait]) extends ConcreteContainer("class")
+final case class Module(name: String, base: Option[ClassContainer], mixins: List[Trait]) extends ConcreteContainer("object")
+final case class Trait(name: String, mixins: List[Trait]) extends Container("trait")
+
+trait ReturnType
+{
+	def name: String
+	def parameters: List[ReturnType]
+	def manifest: Manifest[_]
+	def defaultValue: String
+	override def toString = name
+}
+sealed case class BasicReturnType(name: String, parameters: List[ReturnType],
+	manifest: Manifest[_], defaultValue: String) extends ReturnType
+
+case class Member(scope: Scope, modifiers: Set[Modifier], declaration: DeclarationType,
+	name: String, mType: ReturnType, valueSpecified: Boolean) extends NotNull
+{
+	override def toString = scope.toString + modifiers.mkString(" ", " "," ") +
+		declaration.toString + " " + name  + " : " + mType.toString +
+		(if(valueSpecified) " = " + mType.defaultValue else "")
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/TestedProcess.scala b/src/test/scala/sbt/TestedProcess.scala
new file mode 100644
index 000000000..0e9a6a3c4
--- /dev/null
+++ b/src/test/scala/sbt/TestedProcess.scala
@@ -0,0 +1,55 @@
+package sbt
+
+import java.io.File
+
+object exit
+{
+	def main(args: Array[String])
+	{
+		System.exit(java.lang.Integer.parseInt(args(0)))
+	}
+}
+object cat
+{
+	def main(args: Array[String])
+	{
+		val result =
+			if(args.length == 0)
+				FileUtilities.transfer(System.in, System.out, log)
+			else
+				catFiles(args.toList)
+		result match
+		{
+			case Some(err) => System.err.println("Error: " + err); System.exit(1)
+			case None => System.exit(0)
+		}
+	}
+	private val log = new ConsoleLogger
+	private def catFiles(filenames: List[String]): Option[String] =
+	{
+		filenames match
+		{
+			case head :: tail =>
+				val file = new File(head)
+				if(file.isDirectory)
+					Some("Is directory: " + file)
+				else if(file.exists)
+				{
+					FileUtilities.readStream(file, log) { stream =>
+						FileUtilities.transfer(stream, System.out, log)
+					}
+					catFiles(tail)
+				}
+				else
+					Some("No such file or directory: " + file)
+			case Nil => None
+		}
+	}
+}
+object echo
+{
+	def main(args: Array[String])
+	{
+		System.out.println(args.mkString(" "))
+	}
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/VersionSpecification.scala b/src/test/scala/sbt/VersionSpecification.scala
new file mode 100644
index 000000000..2c1c0eb5a
--- /dev/null
+++ b/src/test/scala/sbt/VersionSpecification.scala
@@ -0,0 +1,61 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008 Mark Harrah
+ */
+package sbt
+
+import org.scalacheck._
+
+object VersionSpecification extends Properties("Version")
+{
+	import ArbitraryVersion._
+	specify("Empty or whitespace only string not allowed, all others allowed",
+		(s: String) => Version.fromString(s).isLeft == s.trim.isEmpty)
+	specify("BasicVersion round trips", checkRoundTrip _)
+	specify("BasicVersion increment major", checkIncrementMajor _)
+	specify("BasicVersion increment minor", checkIncrementMinor _)
+	specify("BasicVersion increment micro", checkIncrementMicro _)
+	
+	private def checkRoundTrip(v: BasicVersion) =
+	{
+		val v2 = Version.fromString(v.toString)
+		v2.isRight && v2.right.get == v
+	}
+	private def checkIncrementMinor(v: BasicVersion) = checkIncrement(v, _.incrementMinor)
+	private def checkIncrementMajor(v: BasicVersion) = checkIncrement(v, _.incrementMajor)
+	private def checkIncrementMicro(v: BasicVersion) = checkIncrement(v, _.incrementMicro)
+	private def checkIncrement(v: BasicVersion, increment: (BasicVersion => BasicVersion)) =
+	{
+		val vNew = increment(v)
+		checkRoundTrip(vNew)  && vNew != v
+	}
+}
+object ArbitraryVersion
+{
+	implicit lazy val arbBasicVersion: Arbitrary[BasicVersion] = Arbitrary(genBasicVersion)
+	implicit lazy val arbOpaqueVersion: Arbitrary[OpaqueVersion] = Arbitrary(genOpaqueVersion)
+	implicit lazy val arbVersion: Arbitrary[Version] = Arbitrary(genVersion)
+	
+	import Arbitrary._
+	import Math.abs
+	lazy val genBasicVersion =
+		for{major <- arbInt.arbitrary
+			minor <- arbOption[Int].arbitrary
+			micro <- arbOption[Int].arbitrary
+			extra <- genExtra }
+		yield
+		{
+			 if(minor.isEmpty && micro.isDefined)
+			 	BasicVersion(abs(major), micro.map(abs), None, extra)
+			 else
+			 	BasicVersion(abs(major), minor.map(abs), micro.map(abs), extra)
+		}
+	lazy val genOpaqueVersion = for(versionString <- arbString.arbitrary if !versionString.trim.isEmpty) yield OpaqueVersion(versionString)
+	lazy val genVersion = Gen.frequency((5,genBasicVersion), (1,genOpaqueVersion))
+	
+	private lazy val genExtra =
+		for(extra <- arbOption[String].arbitrary;
+			val trimmedExtra = extra.map(_.trim.filter(c => !java.lang.Character.isISOControl(c)).toString);
+			if Version.isValidExtra(trimmedExtra))
+		yield
+			trimmedExtra
+}
\ No newline at end of file
diff --git a/src/test/scala/sbt/wrap/MutableSetWrapper.scala b/src/test/scala/sbt/wrap/MutableSetWrapper.scala
new file mode 100644
index 000000000..caf562c18
--- /dev/null
+++ b/src/test/scala/sbt/wrap/MutableSetWrapper.scala
@@ -0,0 +1,89 @@
+package sbt.wrap
+
+import org.scalacheck._
+import java.util.{HashSet, LinkedHashSet}
+
+object WrappedHashSetTests extends MutableSetWrapperTests(new HashSet[Int])
+object WrappedLinkedHashSetTests extends MutableSetWrapperTests(new LinkedHashSet[Int])
+{
+	specify("toList preserves order", checkAddOrdered _)
+
+	private def checkAddOrdered(values: List[Int]) =
+	{
+		val set = createWrapped
+		val check = new scala.collection.mutable.HashSet[Int]
+		val list = new scala.collection.mutable.ListBuffer[Int]
+		for(value <- values)
+		{
+			set += value
+			if(!check(value))
+			{
+				check += value
+				list += value
+			}
+		}
+		list.toList sameElements set.toList
+	}
+}
+
+abstract class MutableSetWrapperTests(createUnderlying: => java.util.Set[Int]) extends Properties("Mutable Set wrapper (" + createUnderlying.getClass.getName + ")")
+{
+	protected def createWrapped = new MutableSetWrapper(createUnderlying)
+
+	specify("Contains all added at once", checkBatchAddition _)
+	specify("Contains all added individually", checkSingleAddition _)
+	specify("toList contains all added at once", checkBatchToList _)
+	specify("toList contains all added individually", checkSingleToList _)
+	specify("Contains all added and not removed", checkRemove _)
+
+	private def checkSingleAddition(values: List[Int]) =
+	{
+		val set = createSingleAdd(values)
+		values.forall(set.contains)
+	}
+	private def checkBatchAddition(values: List[Int]) =
+	{
+		val set = createBatchAdd(values)
+		values.forall(set.contains)
+	}
+	private def checkBatchToList(values: List[Int]) =
+	{
+		val set = createBatchAdd(values)
+		val check = scala.collection.mutable.HashSet(set.toList : _*)
+		values.forall(check.contains)
+	}
+	private def checkSingleToList(values: List[Int]) =
+	{
+		val set = createSingleAdd(values)
+		val check = scala.collection.mutable.HashSet(set.toList : _*)
+		values.forall(check.contains)
+	}
+	protected final def createBatchAdd(values: List[Int]) =
+	{
+		val set = createWrapped
+		set ++= values
+		set
+	}
+	protected final def createSingleAdd(values: List[Int]) =
+	{
+		val set = createWrapped
+		values.foreach(set += _)
+		set
+	}
+	private def checkRemove(values: List[(Int, Boolean)]) =
+	{
+		val set = createWrapped
+		val check = new scala.collection.mutable.HashSet[Int]
+		for( (key, _) <- values)
+		{
+			set += key
+			check += key
+		}
+		for( (key, false) <- values)
+		{
+			set -= key
+			check -= key
+		}
+		values.forall { case (key, _) => set.contains(key) == check.contains(key) }
+	}
+}
\ No newline at end of file

From 2f4ba508509fd6ac383b402651e2d6ac95c5fd0a Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 26 Jun 2009 02:09:31 +0000
Subject: [PATCH 002/268]  * Fix installer build  * Revert managedStyle back to
 Auto

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@814 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 install/project/build.properties           | 2 +-
 install/project/build/InstallProject.scala | 2 ++
 src/main/scala/sbt/BasicProjectTypes.scala | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/install/project/build.properties b/install/project/build.properties
index b2811cd24..7dbce4c87 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -2,6 +2,6 @@
 #Thu Jun 25 14:31:30 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=extract
-sbt.version=0.4.7-p13
+sbt.version=0.5
 project.version=0.1
 scala.version=2.7.5
diff --git a/install/project/build/InstallProject.scala b/install/project/build/InstallProject.scala
index b31acfd53..68b99f605 100644
--- a/install/project/build/InstallProject.scala
+++ b/install/project/build/InstallProject.scala
@@ -27,6 +27,8 @@ protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtra
 protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info)
 {
 	override def publishLocalAction = publishAction
+	override def deliverAction = publishAction
+	override def deliverLocalAction = publishAction
 	override def publishAction = task {None}
 	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
 	private lazy val plugin = pluginProject
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index f5020d411..ccce8f088 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -223,9 +223,9 @@ trait PublishConfiguration extends NotNull
 }
 object ManagedStyle extends Enumeration
 {
-	val Maven, Ivy = Value
+	val Maven, Ivy, Auto = Value
 }
-import ManagedStyle.{Ivy, Maven, Value => ManagedType}
+import ManagedStyle.{Auto, Ivy, Maven, Value => ManagedType}
 trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject with BasicDependencyPaths
 {
 	import BasicManagedProject._
@@ -267,13 +267,14 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations))
 	def useMavenConfigurations = true // TBD: set to true and deprecate
 	def useDefaultConfigurations = useMavenConfigurations
-	def managedStyle: ManagedType = Maven
+	def managedStyle: ManagedType = Auto
 	protected implicit final val defaultPatterns: RepositoryHelpers.Patterns =
 	{
 		managedStyle match
 		{
 			case Maven => Resolver.mavenStylePatterns
 			case Ivy => Resolver.ivyStylePatterns
+			case Auto => Resolver.defaultPatterns
 		}
 	}
 	/** The options provided to the 'update' action.  This is by default the options in 'baseUpdateOptions'.
@@ -555,6 +556,7 @@ trait ReflectiveArtifacts extends ManagedProject
 		{
 			case Maven =>reflective ++ List(Artifact(artifactID, "pom", "pom"))
 			case Ivy => reflective
+			case Auto => Set.empty
 		}
 	}
 	def reflectiveArtifacts: Set[Artifact] = Set(Reflective.reflectiveMappings[Artifact](this).values.toList: _*)

From f4d350af2ea73ba9706ce9accbdd17aa6d6b7529 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 26 Jun 2009 02:20:57 +0000
Subject: [PATCH 003/268] Fixes to install plugin build

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@815 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 install/project/build/InstallProject.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/project/build/InstallProject.scala b/install/project/build/InstallProject.scala
index 68b99f605..0fca6c848 100644
--- a/install/project/build/InstallProject.scala
+++ b/install/project/build/InstallProject.scala
@@ -14,13 +14,13 @@ class InstallerProject(info: ProjectInfo) extends ParentProject(info)
 protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtractProject) extends PluginProject(info)
 {
 	private lazy val extractProject = extract
-	override def crossScalaVersions = Set("2.7.2", "2.7.3", "2.7.4", "2.7.5")
 	override def mainResources = super.mainResources +++ extractProject.outputJar +++ extractLocation
 	
 	def extractLocation = (outputPath ##) / "extract.location"
 	lazy val writeProperties = task { FileUtilities.write(extractLocation.asFile, extractProject.outputJar.relativePath, Charset.forName("UTF-8"), log) }
 	override def packageAction = super.packageAction dependsOn(extractProject.proguard, writeProperties)
 	
+	override def deliverProjectDependencies = Nil
 	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
 	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
 }

From ce90bece628b1819b96129d107026f1a86a6113d Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 29 Jun 2009 00:50:39 +0000
Subject: [PATCH 004/268] Fixed class loading for web applications

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@823 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/WebApp.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index 392c4ba12..37ffff6b9 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -40,7 +40,7 @@ object JettyRun extends ExitHook
 			def runJetty() =
 			{
 				val baseLoader = this.getClass.getClassLoader
-				val loader: ClassLoader = new SelectiveLoader(classpathURLs.toArray, baseLoader, "org.mortbay." :: "javax.servlet." :: Nil)
+				val loader: ClassLoader = new java.net.URLClassLoader(classpathURLs.toArray, baseLoader)
 				val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.sbtJar.toURI.toURL), loader, baseLoader)
 				val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
 				runner(configuration, log)

From 545a138c1190784e13ef5b55c417fb0a2777b311 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 1 Jul 2009 04:00:21 +0000
Subject: [PATCH 005/268] Bump versions

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@824 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties                    | 4 ++--
 project/build/src/CrossCompileProject.scala | 2 +-
 project/build/src/SbtProject.scala          | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 3938597ef..37dd8fcc6 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -2,6 +2,6 @@
 #Thu Jun 25 20:59:30 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.4.6
-project.version=0.5
+sbt.version=0.5
+project.version=0.5.1
 scala.version=2.7.2
diff --git a/project/build/src/CrossCompileProject.scala b/project/build/src/CrossCompileProject.scala
index a302aa80a..e9c9ad9c6 100644
--- a/project/build/src/CrossCompileProject.scala
+++ b/project/build/src/CrossCompileProject.scala
@@ -5,7 +5,7 @@ import scala.xml.NodeSeq
 
 /** Support for compiling sbt across multiple versions of Scala.  The scala compiler is run in a
 * separate JVM and no partial compilation is done.*/
-abstract class CrossCompileProject extends BasicScalaProject
+abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScalaPaths
 {
 	/** Used for 2.8.0-SNAPSHOT*/
 	val scalaToolsSnapshots = "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots"
diff --git a/project/build/src/SbtProject.scala b/project/build/src/SbtProject.scala
index f7b815f12..ac06702b3 100644
--- a/project/build/src/SbtProject.scala
+++ b/project/build/src/SbtProject.scala
@@ -26,11 +26,11 @@ class SbtProject(info: ProjectInfo) extends ParentProject(info)
 
 protected class MainProject(val info: ProjectInfo) extends CrossCompileProject
 {
-	override def mainScalaSources =
-		if(Project.currentScalaVersion.map(_.startsWith("2.8")).getOrElse(false)) // cannot compile against test libraries currently
-			Path.lazyPathFinder { super.mainScalaSources.get.filter(_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
+	override def mainSources =
+		if(ScalaVersion.currentString.startsWith("2.8")) // cannot compile against test libraries currently
+			Path.lazyPathFinder { super.mainSources.get.filter(!_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
 		else
-			super.mainScalaSources
+			super.mainSources
 	override def defaultJarBaseName = "sbt_" + version.toString
 	/** Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"

From aa4b084ecc4d558912ed0ea71078790acf2754be Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 1 Jul 2009 04:04:36 +0000
Subject: [PATCH 006/268]  * Fixed manual `reboot` not changing the version of
 Scala when it is manually `set`  * Split out functionality to filter sub
 tasks  * Added convenience methods for constructing a CompoundTask  * fixed
 tab completion for cross-building  * added empty scheduler

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@825 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala  |  2 +-
 src/main/scala/sbt/BuilderProject.scala     | 12 +++---
 src/main/scala/sbt/ClasspathUtilities.scala |  2 +
 src/main/scala/sbt/Main.scala               |  5 ++-
 src/main/scala/sbt/ParallelRunner.scala     | 41 +++++++++++++++++---
 src/main/scala/sbt/Project.scala            | 22 ++++++-----
 src/main/scala/sbt/Resources.scala          |  6 ++-
 src/main/scala/sbt/ScalaProject.scala       | 42 ++++++++++++---------
 src/main/scala/sbt/TaskManager.scala        |  1 +
 9 files changed, 91 insertions(+), 42 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index ccce8f088..d8340bf39 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -265,7 +265,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	}
 	def useIntegrationTestConfiguration = false
 	def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations))
-	def useMavenConfigurations = true // TBD: set to true and deprecate
+	def useMavenConfigurations = true // TODO: deprecate after going through a minor version series to verify that this works ok
 	def useDefaultConfigurations = useMavenConfigurations
 	def managedStyle: ManagedType = Auto
 	protected implicit final val defaultPatterns: RepositoryHelpers.Patterns =
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index 0cf3a82a1..b5d04bf87 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -106,7 +106,7 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 	override final def methods = Map.empty
 }
 /** The project definition used to build project definitions. */
-private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, override protected val logImpl: Logger) extends BasicBuilderProject
+private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, additional: Iterable[Path], override protected val logImpl: Logger) extends BasicBuilderProject
 {
 	private lazy val pluginProject =
 	{
@@ -115,11 +115,13 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 		else
 			None
 	}
-	override def projectClasspath = super.projectClasspath +++ pluginProject.map(_.pluginClasspath).getOrElse(Path.emptyPathFinder)
+	override def projectClasspath = super.projectClasspath +++
+		pluginProject.map(_.pluginClasspath).getOrElse(Path.emptyPathFinder) +++
+		Path.lazyPathFinder{ additional }
 	def tpe = "project definition"
 
 	override def compileTask = super.compileTask dependsOn(pluginProject.map(_.syncPlugins).toList : _*)
-		
+
 	final class PluginBuilderProject(val info: ProjectInfo) extends BasicBuilderProject
 	{
 		override protected def logImpl = BuilderProject.this.log
@@ -158,7 +160,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 				case Some(definition) =>
 					logInfo("\nUpdating plugins")
 					val pluginInfo = ProjectInfo(info.projectPath.asFile, Nil, None)
-					val pluginBuilder = Project.constructProject(pluginInfo, Project.getProjectClass[PluginDefinition](definition, projectClasspath))
+					val pluginBuilder = Project.constructProject(pluginInfo, Project.getProjectClass[PluginDefinition](definition, projectClasspath, getClass.getClassLoader))
 					pluginBuilder.projectName() = "Plugin builder"
 					pluginBuilder.projectVersion() = OpaqueVersion("1.0")
 					val result = pluginBuilder.update.run
@@ -203,7 +205,7 @@ class PluginDefinition(val info: ProjectInfo) extends InternalProject with Basic
 class PluginProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
-	override def packageAction = packageSrc
+	override def packageAction = packageSrc dependsOn(test)
 	override def packageSrcJar = jarPath
 	override def useMavenConfigurations = true
 	override def managedStyle = ManagedStyle.Maven
diff --git a/src/main/scala/sbt/ClasspathUtilities.scala b/src/main/scala/sbt/ClasspathUtilities.scala
index 48dc42ade..ed2ff8d5d 100644
--- a/src/main/scala/sbt/ClasspathUtilities.scala
+++ b/src/main/scala/sbt/ClasspathUtilities.scala
@@ -14,7 +14,9 @@ private[sbt] object ClasspathUtilities
 	def toClasspath(finder: PathFinder): Array[URL] = toClasspath(finder.get)
 	def toClasspath(paths: Iterable[Path]): Array[URL] = paths.map(_.asURL).toSeq.toArray
 	def toLoader(finder: PathFinder): ClassLoader = toLoader(finder.get)
+	def toLoader(finder: PathFinder, parent: ClassLoader): ClassLoader = toLoader(finder.get, parent)
 	def toLoader(paths: Iterable[Path]): ClassLoader = new URLClassLoader(toClasspath(paths), getClass.getClassLoader)
+	def toLoader(paths: Iterable[Path], parent: ClassLoader): ClassLoader = new URLClassLoader(toClasspath(paths), parent)
 	
 	def isArchive(path: Path): Boolean = isArchive(path.asFile)
 	def isArchive(file: File): Boolean = isArchiveName(file.getName)
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index e17c4b555..877599824 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -192,7 +192,7 @@ object Main
 	private def interactive(baseProject: Project): RunCompleteAction =
 	{
 		val projectNames = baseProject.topologicalSort.map(_.name)
-		val prefixes = ContinuousExecutePrefix :: Nil
+		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
 		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), prefixes)
 		val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log)
 		def updateTaskCompletions(project: Project)
@@ -221,7 +221,10 @@ object Main
 					else if(ReloadAction == trimmed)
 						Reload
 					else if(RebootCommand == trimmed)
+					{
+						System.setProperty(ScalaVersion.LiveKey, "")
 						new Exit(RebootExitCode)
+					}
 					else if(trimmed.startsWith(CrossBuildPrefix))
 					{
 						if(startCrossBuild(currentProject, trimmed.substring(CrossBuildPrefix.length).trim))
diff --git a/src/main/scala/sbt/ParallelRunner.scala b/src/main/scala/sbt/ParallelRunner.scala
index 74ce7a8ee..24d5507f9 100644
--- a/src/main/scala/sbt/ParallelRunner.scala
+++ b/src/main/scala/sbt/ParallelRunner.scala
@@ -48,6 +48,21 @@ object ParallelRunner
 		new DagScheduler(info, defaultStrategy(info))
 	}
 	private def defaultStrategy[D <: Dag[D]](info: DagInfo[D]) = MaxPathStrategy((d: D) => 1, info)
+	def emptyScheduler[D]: Scheduler[D] =
+		new Scheduler[D]
+		{
+			/** Starts a new run.  The returned object is a new Run, representing a single scheduler run.  All state for the run
+			* is encapsulated in this object.*/
+			def run: Run = new Run
+			{
+				def complete(d: D, result: Option[String]) {}
+				def hasPending = false
+				/**Returns true if this scheduler has no more work to be done, ever.*/
+				def isComplete = true
+				def next(max: Int) = Nil
+				def failures = Nil
+			}
+		}
 }
 /** Requests work from `scheduler` and processes it using `doWork`.  This class limits the amount of work processing at any given time
 * to `workers`.*/
@@ -161,6 +176,9 @@ private trait ScheduleStrategy[D] extends NotNull
 		/** Provides up to `max` units of work.  `max` is always positive and this method is not called
 		* if hasReady is false. The returned list cannot be empty is there is work ready to be run.*/
 		def next(max: Int): List[D]
+		/** If this strategy returns different work from `next` than is provided to `workReady`,
+		* this method must map back to the original work.*/
+		def reverseMap(dep: D): Iterable[D]
 	}
 }
 
@@ -184,12 +202,15 @@ private[sbt] final class DagScheduler[D <: Dag[D]](info: DagInfo[D], strategy: S
 		def next(max: Int) = strategyRun.next(max)
 		def complete(work: D, result: Option[String])
 		{
-			result match
+			for(originalWork <- strategyRun.reverseMap(work))
 			{
-				case None => infoRun.complete(work, strategyRun.workReady)
-				case Some(errorMessage) =>
-					infoRun.clear(work)
-					failures += WorkFailure(work, errorMessage)
+				result match
+				{
+					case None => infoRun.complete(originalWork, strategyRun.workReady)
+					case Some(errorMessage) =>
+						infoRun.clear(originalWork)
+						failures += WorkFailure(originalWork, errorMessage)
+				}
 			}
 		}
 		def isComplete = !strategyRun.hasReady && infoRun.reverseDepsRun.isEmpty
@@ -253,6 +274,7 @@ private class OrderedStrategy[D](ready: TreeSet[D]) extends ScheduleStrategy[D]
 		}
 		def workReady(dep: D) { readyRun += dep }
 		def hasReady = !readyRun.isEmpty
+		def reverseMap(dep: D) = dep :: Nil
 	}
 }
 /** A class that represents state for a DagScheduler and that MaxPathStrategy uses to initialize an OrderedStrategy. */
@@ -456,7 +478,14 @@ private object CompoundScheduler
 private final class FinalWork[D](val compound: D, val doFinally: Scheduler[D]) extends NotNull
 /** This represents nested work.  The work provided by `scheduler` is processed first.  The work provided by `doFinally` is processed
 * after `scheduler` completes regardless of the success of `scheduler`.*/
-final class SubWork[D](val scheduler: Scheduler[D], val doFinally: Scheduler[D]) extends NotNull
+final class SubWork[D] private (val scheduler: Scheduler[D], val doFinally: Scheduler[D]) extends NotNull
+object SubWork
+{
+	def apply[D](scheduler: Scheduler[D], doFinally: Scheduler[D]): SubWork[D] = new SubWork(scheduler, doFinally)
+	def apply[D](scheduler: Scheduler[D]): SubWork[D] = SubWork(scheduler, ParallelRunner.emptyScheduler)
+	def apply[D <: Dag[D]](node: D): SubWork[D] = SubWork(ParallelRunner.dagScheduler(node))
+	def apply[D <: Dag[D]](node: D, doFinally: D): SubWork[D] = SubWork(ParallelRunner.dagScheduler(node), ParallelRunner.dagScheduler(doFinally))
+}
 /** Work that implements this interface provides nested work to be done before this work is processed.*/
 trait CompoundWork[D] extends NotNull
 {
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 8eaf126ee..69fa9f5e1 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -4,6 +4,7 @@
 package sbt
 
 import java.io.File
+import java.net.URLClassLoader
 import scala.collection._
 import FileUtilities._
 import Project._
@@ -289,24 +290,26 @@ object Project
 		loadProject(path.asFile, deps, parent, log)
 	/** Loads the project in the directory given by 'projectDirectory' and with the given dependencies.*/
 	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], log: Logger): LoadResult =
+		loadProject(projectDirectory, deps, parent, getClass.getClassLoader, log)
+	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], additional: ClassLoader, log: Logger): LoadResult =
 	{
 		val info = ProjectInfo(projectDirectory, deps, parent)
 		ProjectInfo.setup(info, log) match
 		{
 			case err: SetupError => new LoadSetupError(err.message)
 			case SetupDeclined => LoadSetupDeclined
-			case AlreadySetup => loadProject(info, None, log)
-			case setup: SetupInfo => loadProject(info, Some(setup), log)
+			case AlreadySetup => loadProject(info, None, additional, log)
+			case setup: SetupInfo => loadProject(info, Some(setup), additional, log)
 		}
 	}
-	private def loadProject(info: ProjectInfo, setupInfo: Option[SetupInfo], log: Logger): LoadResult =
+	private def loadProject(info: ProjectInfo, setupInfo: Option[SetupInfo], additional: ClassLoader, log: Logger): LoadResult =
 	{
 		try
 		{
 			val oldLevel = log.getLevel
 			log.setLevel(Level.Warn)
 			val result =
-				for(builderClass <- getProjectDefinition(info, log).right) yield
+				for(builderClass <- getProjectDefinition(info, additional, log).right) yield
 					initialize(constructProject(info, builderClass), setupInfo, log)
 			log.setLevel(oldLevel)
 			result.fold(new LoadError(_), new LoadSuccess(_))
@@ -367,16 +370,17 @@ object Project
 	}
 	/** Compiles the project definition classes and returns the project definition class name
 	* and the class loader that should be used to load the definition. */
-	private def getProjectDefinition(info: ProjectInfo, buildLog: Logger): Either[String, Class[P] forSome { type P <: Project }] =
+	private def getProjectDefinition(info: ProjectInfo, additional: ClassLoader, buildLog: Logger): Either[String, Class[P] forSome { type P <: Project }] =
 	{
 		val builderProjectPath = info.builderPath / BuilderProjectDirectoryName
 		if(builderProjectPath.asFile.isDirectory)
 		{
 			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
-			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None), pluginProjectPath, buildLog)
+			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(new File(url.toURI))); case _ => Nil }
+			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None), pluginProjectPath, additionalPaths, buildLog)
 			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
 				builderProject.projectDefinition.right.map {
-					case Some(definition) => getProjectClass[Project](definition, builderProject.projectClasspath)
+					case Some(definition) => getProjectClass[Project](definition, builderProject.projectClasspath, additional)
 					case None => DefaultBuilderClass
 				}
 			}
@@ -435,9 +439,9 @@ object Project
 		}
 	}
 	import scala.reflect.Manifest
-	private[sbt] def getProjectClass[P <: Project](name: String, classpath: PathFinder)(implicit mf: Manifest[P]): Class[P] =
+	private[sbt] def getProjectClass[P <: Project](name: String, classpath: PathFinder, additional: ClassLoader)(implicit mf: Manifest[P]): Class[P] =
 	{
-		val loader =ClasspathUtilities.toLoader(classpath)
+		val loader =ClasspathUtilities.toLoader(classpath, additional)
 		val builderClass = Class.forName(name, false, loader)
 		val projectClass = mf.erasure
 		require(projectClass.isAssignableFrom(builderClass), "Builder class '" + builderClass + "' does not extend " + projectClass.getName + ".")
diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
index 388e82b3c..b92cd5e73 100644
--- a/src/main/scala/sbt/Resources.scala
+++ b/src/main/scala/sbt/Resources.scala
@@ -26,8 +26,10 @@ object Resources
 	private val LoadErrorPrefix = "Error loading initial project: "
 }
 
-class Resources(val baseDirectory: File)
+class Resources(val baseDirectory: File, additional: ClassLoader)
 {
+	def this(baseDirectory: File) = this(baseDirectory, getClass.getClassLoader)
+	
 	import Resources._
 	// The returned directory is not actually read-only, but it should be treated that way
 	def readOnlyResourceDirectory(group: String, name: String): Either[String, File] =
@@ -85,7 +87,7 @@ class Resources(val baseDirectory: File)
 				}
 				
 				buffered.startRecording()
-				resultToEither(Project.loadProject(dir, Nil, None, buffered)) match
+				resultToEither(Project.loadProject(dir, Nil, None, additional, buffered)) match
 				{
 					case Left(msg) =>
 						reload match
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index d9b38592f..47f25094f 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -54,7 +54,7 @@ trait SimpleScalaProject extends Project
 			}
 		}
 }
-trait ScalaProject extends SimpleScalaProject with FileTasks
+trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProject
 {
 	import ScalaProject._
 	
@@ -149,7 +149,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks
 			val endTasks = end.map(toTask).toSeq // tasks that perform test cleanup and are run regardless of success of tests
 			val endTask = task { None } named("test-cleanup") dependsOn(endTasks : _*)
 			val rootTask = task { None } named("test-complete") dependsOn(workTasks.toSeq : _*) // the task that depends on all test subtasks
-			new SubWork[Project#Task](ParallelRunner.dagScheduler(rootTask), ParallelRunner.dagScheduler(endTask))
+			SubWork[Project#Task](rootTask, endTask)
 		}
 		new CompoundTask(work)
 	}
@@ -263,22 +263,9 @@ trait ScalaProject extends SimpleScalaProject with FileTasks
 	private def flatten[T](i: Iterable[Iterable[T]]) = i.flatMap(x => x)
 	
 	protected def testQuickMethod(testAnalysis: CompileAnalysis, options: => Seq[TestOption])(toRun: Seq[TestOption] => Task) =
-		task { tests =>
-			val (exactFilters, testFilters) = tests.toList.map(GlobFilter.apply).partition(_.isInstanceOf[ExactFilter])
-			val includeTests = exactFilters.map(_.asInstanceOf[ExactFilter].matchName)
-			val toCheck = scala.collection.mutable.HashSet(includeTests: _*)
-			toCheck --= testAnalysis.allTests.map(_.testClassName)
-			if(!toCheck.isEmpty && log.atLevel(Level.Warn))
-			{
-				log.warn("Test(s) not found:")
-				toCheck.foreach(test => log.warn("\t" + test))
-			}
-			val includeTestsSet = scala.collection.mutable.HashSet(includeTests: _*)
-			val newOptions =
-				if(includeTests.isEmpty && testFilters.isEmpty) options
-				else TestFilter(test => includeTestsSet.contains(test) || testFilters.exists(_.accept(test))) :: options.toList
-			toRun(newOptions)
-		} completeWith testAnalysis.allTests.map(_.testClassName).toList
+		multiTask(testAnalysis.allTests.map(_.testClassName).toList) { includeFunction =>
+			toRun(TestFilter(includeFunction) :: options.toList)
+		}
 		
 	protected final def maximumErrors[T <: ActionOption](options: Seq[T]) =
 		(for( MaxCompileErrors(maxErrors) <- options) yield maxErrors).firstOption.getOrElse(DefaultMaximumCompileErrors)
@@ -343,3 +330,22 @@ object ScalaProject
 	def optionsAsString(options: Seq[ScalaProject#CompileOption]) = options.map(_.asString).filter(!_.isEmpty)
 	def javaOptionsAsString(options: Seq[ScalaProject#JavaCompileOption]) = options.map(_.asString)
 }
+trait MultiTaskProject extends Project
+{
+	def multiTask(allTests: => List[String])(run: (String => Boolean) => Task) =
+		task { tests =>
+			val (exactFilters, testFilters) = tests.toList.map(GlobFilter.apply).partition(_.isInstanceOf[ExactFilter])
+			val includeTests = exactFilters.map(_.asInstanceOf[ExactFilter].matchName)
+			val toCheck = scala.collection.mutable.HashSet(includeTests: _*)
+			toCheck --= allTests
+			if(!toCheck.isEmpty && log.atLevel(Level.Warn))
+			{
+				log.warn("Test(s) not found:")
+				toCheck.foreach(test => log.warn("\t" + test))
+			}
+			val includeTestsSet = Set(includeTests: _*)
+			val includeFunction = (test: String) => includeTestsSet.contains(test) || testFilters.exists(_.accept(test))
+			run(includeFunction)
+		} completeWith allTests
+	
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/TaskManager.scala b/src/main/scala/sbt/TaskManager.scala
index 23678c6d2..4d42f4f4b 100644
--- a/src/main/scala/sbt/TaskManager.scala
+++ b/src/main/scala/sbt/TaskManager.scala
@@ -77,6 +77,7 @@ trait TaskManager{
 			interactive: Boolean, action : => Option[String]) = new CompoundTask(explicitName, description, dependencies, interactive, action, createWork)
 		def work = createWork
 	}
+	def compoundTask(createTask: => Project#Task) = new CompoundTask(SubWork[Project#Task](createTask))
 	
 	private def checkTaskDependencies(dependencyList: List[ManagedTask])
 	{

From 4886d95efa0c63cd4c6ac4725e713eb907eed094 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 1 Jul 2009 04:57:20 +0000
Subject: [PATCH 007/268] new `jetty` action that waits for a key press before
 terminating (intended to be used from batch-style)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@828 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/ProjectProperties.scala |  4 ++--
 src/main/scala/sbt/DefaultProject.scala     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/boot/src/main/scala/ProjectProperties.scala b/boot/src/main/scala/ProjectProperties.scala
index d63da6c4b..4f0a0df08 100644
--- a/boot/src/main/scala/ProjectProperties.scala
+++ b/boot/src/main/scala/ProjectProperties.scala
@@ -9,7 +9,7 @@ Name:
 Organization []:
 Version [1.0]: 
 Scala version [2.7.5]: 
-sbt version [0.5]: 
+sbt version [0.5.1]: 
 */
 import java.io.File
 /** Constants related to reading/writing the build.properties file in a project.
@@ -48,7 +48,7 @@ private object ProjectProperties
 	/** The default version of the new user project when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultVersion = "1.0"
 	/** The default version of sbt when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultSbtVersion = "0.5"
+	val DefaultSbtVersion = "0.5.1"
 	/** The default version of Scala when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultScalaVersion = "2.7.5"
 
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 554f98472..ba65239b6 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -315,8 +315,22 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	def jettyRunClasspath = testClasspath
 	def jettyWebappPath = temporaryWarPath
 	lazy val jettyRun = jettyRunAction
+	lazy val jetty = task { idle() } dependsOn(jettyRun) describedAs(JettyDescription)
 	protected def jettyRunAction =
 		jettyRunTask(jettyWebappPath, jettyContextPath, jettyPort, jettyRunClasspath, "test", scanDirectories.map(_.asFile), scanInterval) dependsOn(prepareWebapp) describedAs(JettyRunDescription)
+	private def idle() =
+	{
+		log.info("Waiting... (press any key to interrupt)")
+		def doWait()
+		{
+			try { Thread.sleep(1000) } catch { case _: InterruptedException => () }
+			if(System.in.available() <= 0)
+				doWait()
+		}
+		doWait()
+		while (System.in.available() > 0) System.in.read()
+		None
+	}
 		
 	/** The directories that should be watched to determine if the web application needs to be reloaded..*/
 	def scanDirectories: Seq[Path] = jettyWebappPath :: Nil
@@ -408,6 +422,8 @@ object BasicWebScalaProject
 		"Stops the Jetty server that was started with the jetty-run action."
 	val JettyRunDescription =
 		"Starts the Jetty server and serves this project as a web application."
+	val JettyDescription =
+		"Starts the Jetty server and serves this project as a web application.  Waits until interrupted, so it is suitable to call this batch-style."
 }
 /** Analyzes the dependencies of a project after compilation.  All methods except `snapshot` return a
 * `PathFinder`.  The underlying calculations are repeated for each call to PathFinder.get. */

From 8147101b3a8c7965d31020e352dcb2aeeee9e4ee Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 1 Jul 2009 13:42:01 +0000
Subject: [PATCH 008/268] Bump version for trunk

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@837 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 37dd8fcc6..bdfab649a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -3,5 +3,5 @@
 project.organization=sbt
 project.name=Simple Build Tool Parent
 sbt.version=0.5
-project.version=0.5.1
+project.version=0.5.2-SNAPSHOT
 scala.version=2.7.2

From f3c776dab37f31f52cc62d9823ac429861799158 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 4 Jul 2009 17:32:14 +0000
Subject: [PATCH 009/268]  * Added execTask that runs a ProcessBuilder  * Added
 implicit from scala.xml.Elem to ProcessBuilder that uses the element's text
 as the command.  For example:     <x> {command.absolutePath} -x
 {a.absolutePath} </x>  * Added methods to PathFinder to get the results as
 Strings or Files

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@839 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Path.scala         | 2 ++
 src/main/scala/sbt/Process.scala      | 1 +
 src/main/scala/sbt/ScalaProject.scala | 9 +++++++++
 3 files changed, 12 insertions(+)

diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
index 7f746f4f4..23236371d 100644
--- a/src/main/scala/sbt/Path.scala
+++ b/src/main/scala/sbt/Path.scala
@@ -264,6 +264,8 @@ sealed abstract class PathFinder extends NotNull
 		addTo(pathSet)
 		wrap.Wrappers.readOnly(pathSet)
 	}
+	final def getFiles: scala.collection.Set[File] = Set( get.map(_.asFile).toSeq : _*)
+	final def getPaths: scala.collection.Set[String] = Set( get.map(_.absolutePath).toSeq : _*)
 	private[sbt] def addTo(pathSet: Set[Path])
 }
 private class BasePathFinder(base: PathFinder) extends PathFinder
diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index 702cba554..41bfc0b62 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -17,6 +17,7 @@ object Process
 	implicit def apply(builder: JProcessBuilder): ProcessBuilder = new SimpleProcessBuilder(builder)
 	implicit def apply(file: File): FilePartialBuilder = new FileBuilder(file)
 	implicit def apply(url: URL): URLPartialBuilder = new URLBuilder(url)
+	implicit def apply(command: scala.xml.Elem): ProcessBuilder = apply(command.text)
 }
 
 trait URLPartialBuilder extends NotNull
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 47f25094f..6a50be53f 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -53,6 +53,15 @@ trait SimpleScalaProject extends Project
 				pathClean orElse restored
 			}
 		}
+	def execTask(command: => ProcessBuilder): Task =
+		task
+		{
+			val exitValue = command ! log
+			if(exitValue == 0)
+				None
+			else
+				Some("Nonzero exit value: " + exitValue)
+		}
 }
 trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProject
 {

From 947271dc4709dbce94e7830d0523b48f37d2070c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 5 Jul 2009 18:57:25 +0000
Subject: [PATCH 010/268]  * Added constant processes 'true' and 'false'  *
 Added simple processes that do no I/O and return an exit value  * Fixed
 support for defining a process in scala.xml.Elem

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@840 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Process.scala          |  4 +++-
 src/main/scala/sbt/ScalaProject.scala     |  4 +++-
 src/main/scala/sbt/impl/ProcessImpl.scala | 14 +++++++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index 41bfc0b62..092eda35c 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -17,7 +17,9 @@ object Process
 	implicit def apply(builder: JProcessBuilder): ProcessBuilder = new SimpleProcessBuilder(builder)
 	implicit def apply(file: File): FilePartialBuilder = new FileBuilder(file)
 	implicit def apply(url: URL): URLPartialBuilder = new URLBuilder(url)
-	implicit def apply(command: scala.xml.Elem): ProcessBuilder = apply(command.text)
+	implicit def apply(command: scala.xml.Elem): ProcessBuilder = apply(command.text.trim)
+	def apply(value: Boolean): ProcessBuilder = apply(value.toString, if(value) 0 else 1)
+	def apply(name: String, exitValue: => Int): ProcessBuilder = new DummyProcessBuilder(name, exitValue)
 }
 
 trait URLPartialBuilder extends NotNull
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 6a50be53f..4e1110fcb 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -53,9 +53,11 @@ trait SimpleScalaProject extends Project
 				pathClean orElse restored
 			}
 		}
-	def execTask(command: => ProcessBuilder): Task =
+	def execTask(buildCommand: => ProcessBuilder): Task =
 		task
 		{
+			val command = buildCommand
+			log.debug("Executing command " + command)
 			val exitValue = command ! log
 			if(exitValue == 0)
 				None
diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
index 0d5373bfa..eb1707671 100644
--- a/src/main/scala/sbt/impl/ProcessImpl.scala
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -292,7 +292,19 @@ private class PipeSink(pipe: PipedInputStream, currentSink: SyncVar[Option[Outpu
 	}
 }
 
-
+private[sbt] class DummyProcessBuilder(override val toString: String, exitValue : => Int) extends AbstractProcessBuilder
+{
+	override def run(io: ProcessIO): Process = new DummyProcess(exitValue)
+	override def canPipeTo = true
+}
+/** A thin wrapper around a java.lang.Process.  `ioThreads` are the Threads created to do I/O.
+* The implementation of `exitValue` waits until these threads die before returning. */
+private class DummyProcess(action: => Int) extends Process
+{
+	private[this] val exitCode = scala.concurrent.ops.future(action)
+	override def exitValue() = exitCode()
+	override def destroy() {}
+}
 /** Represents a simple command without any redirection or combination. */
 private[sbt] class SimpleProcessBuilder(p: JProcessBuilder) extends AbstractProcessBuilder
 {

From ad0cbc177b9bbf053bf2a9512fb362f756d48df9 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 5 Jul 2009 23:29:28 +0000
Subject: [PATCH 011/268] Fixed problem where dependencies of `sbt` plugins
 were not on the plugin compile classpath

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@841 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BuilderProject.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index b5d04bf87..ebdf8372b 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -181,7 +181,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 			managedSourcePath / name.substring(0, name.length - ".jar".length)
 		}
 		def plugins = descendents(managedDependencyPath, jarFilter)
-		def pluginClasspath = plugins +++ pluginCompileConfiguration.outputDirectory
+		def pluginClasspath: PathFinder = plugins +++ pluginCompileConfiguration.outputDirectory
 		
 		lazy val pluginCompileConditional = new BuilderCompileConditional(pluginCompileConfiguration, "plugin")
 		lazy val pluginCompileConfiguration =
@@ -190,7 +190,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 				def label = "plugin builder"
 				def sources = descendents(managedSourcePath, sourceFilter)
 				def outputDirectory = outputPath / "plugin-classes"
-				def classpath = sbtJarPath
+				def classpath: PathFinder = pluginClasspath +++ sbtJarPath
 				def analysisPath = outputPath / "plugin-analysis"
 			}
 	}

From 6f816b8fe5b8075ae6a976d773006fa0277b7364 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 6 Jul 2009 22:42:01 +0000
Subject: [PATCH 012/268] Fix the provided fix by only including managed
 dependencies on the provided and optional fullClasspaths

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@845 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/DefaultProject.scala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index ba65239b6..fefe966e1 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -132,7 +132,9 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	/** This returns the unmanaged classpath for only this project for the given configuration.  It by
 	* default includes the main compiled classes for this project and the libraries in this project's
 	* unmanaged library directory (lib) and the managed directory for the specified configuration.  It
-	* also adds the resource directories appropriate to the configuration.*/
+	* also adds the resource directories appropriate to the configuration.
+	* The Provided and Optional configurations are treated specially; they are empty
+	* by default.*/
 	def fullUnmanagedClasspath(config: Configuration) =
 	{
 		config match
@@ -140,6 +142,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 			case CompilerPlugin => unmanagedClasspath
 			case Runtime => runUnmanagedClasspath
 			case Test => testUnmanagedClasspath
+			case Provided | Optional => Path.emptyPathFinder
 			case _ => mainUnmanagedClasspath
 		}
 	}

From 7c6f420b21b522a53596e70067d2de07153bf851 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 7 Jul 2009 01:09:56 +0000
Subject: [PATCH 013/268] Split out scripted test framework into its own
 project as an sbt plugin.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@846 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 scripted/project/build.properties             |   8 +
 scripted/project/build/SbtTest.scala          |   7 +
 scripted/src/main/scala/Scripted.scala        | 109 +++++++
 scripted/src/main/scala/ScriptedLoader.scala  |  29 ++
 scripted/src/main/scala/ScriptedTests.scala   |  25 ++
 .../src/main/scala/TestScriptParser.scala     | 268 ++++++++++++++++++
 6 files changed, 446 insertions(+)
 create mode 100644 scripted/project/build.properties
 create mode 100644 scripted/project/build/SbtTest.scala
 create mode 100644 scripted/src/main/scala/Scripted.scala
 create mode 100644 scripted/src/main/scala/ScriptedLoader.scala
 create mode 100644 scripted/src/main/scala/ScriptedTests.scala
 create mode 100644 scripted/src/main/scala/TestScriptParser.scala

diff --git a/scripted/project/build.properties b/scripted/project/build.properties
new file mode 100644
index 000000000..c096cde6d
--- /dev/null
+++ b/scripted/project/build.properties
@@ -0,0 +1,8 @@
+#Project properties
+#Wed Jul 01 23:57:40 EDT 2009
+project.organization=org.scala-tools.sbt
+project.name=test
+sbt.version=0.5.1
+project.version=0.5.1
+scala.version=2.7.5
+project.initialize=false
diff --git a/scripted/project/build/SbtTest.scala b/scripted/project/build/SbtTest.scala
new file mode 100644
index 000000000..89fd5a110
--- /dev/null
+++ b/scripted/project/build/SbtTest.scala
@@ -0,0 +1,7 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+
+import sbt._
+
+class SbtTest(info: ProjectInfo) extends PluginProject(info)
\ No newline at end of file
diff --git a/scripted/src/main/scala/Scripted.scala b/scripted/src/main/scala/Scripted.scala
new file mode 100644
index 000000000..76190ce17
--- /dev/null
+++ b/scripted/src/main/scala/Scripted.scala
@@ -0,0 +1,109 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+package sbt.test
+
+import Scripted._
+import java.io.File
+
+trait ScalaScripted extends BasicScalaProject with Scripted with MavenStyleScalaPaths
+{
+	def sbtTests = sourcePath / SbtTestDirectoryName
+	def scriptedDependencies = compile :: Nil
+	lazy val scripted = scriptedTask(scriptedDependencies : _*)
+	lazy val testNoScripted = super.testAction
+	override def testAction = testNoScripted dependsOn(scripted)
+	
+	lazy val scriptedOnly = scriptedMethodTask(scriptedDependencies : _*)
+	
+	override def scriptedClasspath = runClasspath +++ Path.lazyPathFinder { Path.fromFile(FileUtilities.sbtJar) :: Nil }
+}
+trait SbtScripted extends ScalaScripted
+{
+	override def scriptedDependencies = testCompile :: `package` :: Nil
+	override def scriptedClasspath = 
+		Path.lazyPathFinder {
+			val ivy = runClasspath.get.filter(_.asFile.getName.startsWith("ivy-")).toList
+			val builtSbtJar = (outputPath / defaultJarName)
+			builtSbtJar :: ivy
+		}
+}
+final case class ScriptedTest(group: String, name: String) extends NotNull
+{
+	override def toString = group + "/" + name
+}
+trait Scripted extends Project with MultiTaskProject
+{
+	def sbtTests: Path
+	def scriptedTask(dependencies: ManagedTask*) = compoundTask(scriptedTests(listTests, dependencies : _*))
+	def scriptedMethodTask(dependencies: ManagedTask*) = multiTask(listTests.map(_.toString).toList) { includeFunction =>
+		scriptedTests(listTests.filter(test => includeFunction(test.toString)), dependencies : _*)
+	}
+	def listTests = (new ListTests(sbtTests.asFile, include _, log)).listTests
+	def scriptedTests(tests: Seq[ScriptedTest], dependencies: ManagedTask*) =
+	{
+		// load ScriptedTests using a ClassLoader that loads from the project classpath so that the version
+		// of sbt being built is tested, not the one doing the building.
+		val loader = ScriptedLoader(_scriptedClasspath.toArray)
+		val scriptedClass = Class.forName(ScriptedClassName, true, loader)
+		val scriptedConstructor = scriptedClass.getConstructor(classOf[File], classOf[ClassLoader])
+		val rawRunner = scriptedConstructor.newInstance(sbtTests.asFile, loader)
+		val runner = rawRunner.asInstanceOf[{def scriptedTest(group: String, name: String, log: Logger): Option[String]}]
+		
+		val startTask = task { None } named("scripted-test-start") dependsOn(dependencies  : _*)
+		def scriptedTest(test: ScriptedTest) = task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask)
+		val testTasks = tests.map(scriptedTest)
+		task { None } named("scripted-test-complete") dependsOn(testTasks : _*)
+	}
+	/** The classpath to use for scripted tests.   This ensures that the version of sbt being built is the one used for testing.*/
+	private def _scriptedClasspath =
+	{
+		val buildClasspath = FileUtilities.classLocation[Scripted]
+		val scalacJar = FileUtilities.scalaCompilerJar.toURI.toURL
+		buildClasspath :: scalacJar :: scriptedClasspath.get.map(_.asURL).toList
+	}
+	def scriptedClasspath: PathFinder = Path.emptyPathFinder
+	
+	def include(test: ScriptedTest) = true
+}
+import scala.collection.mutable
+private[test] object Scripted
+{
+	val ScriptedClassName = "sbt.test.ScriptedTests"
+	val SbtTestDirectoryName = "sbt-test"
+	def list(directory: File, filter: java.io.FileFilter) = FileUtilities.wrapNull(directory.listFiles(filter))
+}
+private[test] final class ListTests(baseDirectory: File, accept: ScriptedTest => Boolean, log: Logger) extends NotNull
+{
+	def filter = DirectoryFilter -- HiddenFileFilter
+	def listTests: Seq[ScriptedTest] =
+	{
+		System.setProperty("sbt.scala.version", "")
+		list(baseDirectory, filter) flatMap { group =>
+			val groupName = group.getName
+			listTests(group).map(ScriptedTest(groupName, _))
+		}
+	}
+	private[this] def listTests(group: File): Set[String] =
+	{
+		val groupName = group.getName
+		val allTests = list(group, filter)
+		if(allTests.isEmpty)
+		{
+			log.warn("No tests in test group " + groupName)
+			Set.empty
+		}
+		else
+		{
+			val (included, skipped) = allTests.toList.partition(test => accept(ScriptedTest(groupName, test.getName)))
+			if(included.isEmpty)
+				log.warn("Test group " + groupName + " skipped.")
+			else if(!skipped.isEmpty)
+			{
+				log.warn("Tests skipped in group " + group.getName + ":")
+				skipped.foreach(testName => log.warn(" " + testName.getName))
+			}
+			Set( included.map(_.getName) : _*)
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripted/src/main/scala/ScriptedLoader.scala b/scripted/src/main/scala/ScriptedLoader.scala
new file mode 100644
index 000000000..4ef45e3b7
--- /dev/null
+++ b/scripted/src/main/scala/ScriptedLoader.scala
@@ -0,0 +1,29 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009  Mark Harrah
+ */
+package sbt.test
+
+import java.net.URL
+
+object ScriptedLoader
+{
+	def apply(paths: Array[URL]): ClassLoader = new ScriptedLoader(paths)
+}
+private class ScriptedLoader(paths: Array[URL]) extends LoaderBase(paths, classOf[ScriptedLoader].getClassLoader)
+{
+	private val delegateFor = List("sbt.Logger", "sbt.LogEvent", "sbt.SetLevel", "sbt.Success", "sbt.Log", "sbt.SetTrace", "sbt.Trace", "sbt.ControlEvent")
+	def doLoadClass(className: String): Class[_] =
+	{
+		// Logger needs to be loaded from the version of sbt building the project because we need to pass
+		// a Logger from that loader into ScriptedTests.
+		// All other sbt classes should be loaded from the project classpath so that we test those classes with 'scripted'
+		if(!shouldDelegate(className) && (className.startsWith("sbt.") || className.startsWith("scala.tools.")))
+			findClass(className)
+		else
+			selfLoadClass(className)
+	}
+
+	private def shouldDelegate(className: String) = delegateFor.exists(check => isNestedOrSelf(className, check))
+	private def isNestedOrSelf(className: String, checkAgainst: String) =
+		className == checkAgainst || className.startsWith(checkAgainst + "$")
+}
\ No newline at end of file
diff --git a/scripted/src/main/scala/ScriptedTests.scala b/scripted/src/main/scala/ScriptedTests.scala
new file mode 100644
index 000000000..4c3982bfa
--- /dev/null
+++ b/scripted/src/main/scala/ScriptedTests.scala
@@ -0,0 +1,25 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+
+package sbt.test
+
+import java.io.File
+
+final class ScriptedTests(testResources: Resources) extends NotNull
+{
+	def this(resourceBaseDirectory: File, additional: ClassLoader) = this(new Resources(resourceBaseDirectory, additional))
+	def this(resourceBaseDirectory: File) = this(new Resources(resourceBaseDirectory))
+	
+	val ScriptFilename = "test"
+	import testResources._
+	
+	def scriptedTest(group: String, name: String, log: Logger): Option[String] =
+		readOnlyResourceDirectory(group, name).fold(err => Some(err), testDirectory => scriptedTest(testDirectory, log))
+	def scriptedTest(testDirectory: File, log: Logger): Option[String] =
+	{
+		(for(script <- (new TestScriptParser(testDirectory, log)).parse(new File(testDirectory, ScriptFilename)).right;
+			u <- withProject(testDirectory, log)(script).right )
+		yield u).left.toOption
+	}
+}
diff --git a/scripted/src/main/scala/TestScriptParser.scala b/scripted/src/main/scala/TestScriptParser.scala
new file mode 100644
index 000000000..a87e34de6
--- /dev/null
+++ b/scripted/src/main/scala/TestScriptParser.scala
@@ -0,0 +1,268 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+
+package sbt.test
+
+import java.io.{BufferedReader, File, InputStreamReader}
+
+/*
+statement*
+statement ::= ('$' | '>') word+ '[' word ']'
+word ::= [^ \[\]]+
+comment ::= '#' [^ \n\r]* ('\n' | '\r' | eof)
+*/
+import scala.util.parsing.combinator._
+import scala.util.parsing.input.Positional
+
+import TestScriptParser._
+private class TestScriptParser(baseDirectory: File, log: Logger) extends RegexParsers with NotNull
+{
+	type Statement = Project => Either[String, ReloadProject]
+	type PStatement = Statement with Positional
+	
+	private def evaluateList(list: List[PStatement])(p: Project): WithProjectResult[Unit] =
+		list match
+		{
+			case Nil => ValueResult(())
+			case head :: tail =>
+				head(p) match
+				{
+					case Left(msg) => new ErrorResult(msg)
+					case Right(reload) => ContinueResult(p =>evaluateList(tail)(p), reload)
+				}
+		}
+
+	def script: Parser[Project => WithProjectResult[Unit]] = rep1(space ~> statement  <~ space) ^^ evaluateList
+	def statement: Parser[PStatement] =
+		positioned
+		{
+			(StartRegex ~! rep1(word) ~! "[" ~! word ~! "]") ^^
+			{
+				case start ~ command ~ open ~ result ~ close =>
+					val successExpected = result.toLowerCase == SuccessLiteral.toLowerCase
+					new Statement with Positional
+					{ selfPositional =>
+						def apply(p: Project) =
+						{
+							val result =
+								try
+								{
+									start match
+									{
+										case CommandStart => evaluateCommand(command, successExpected, selfPositional)(p)
+										case ActionStart => evaluateAction(command, successExpected)(p).toLeft(NoReload)
+									}
+								}
+								catch
+								{
+									case e: Exception =>
+										log.trace(e)
+										Left(e.toString)
+								}
+							result.left.map(message => linePrefix(this) + message)
+						}
+					}
+			}
+		}
+	private def linePrefix(p: Positional) = "{line " + p.pos.line + "} "
+	def space = """(\s+|(\#[^\n\r]*))*""".r
+	def word: Parser[String] =  ("\'" ~> "[^'\n\r]*".r <~ "\'")  |  ("\"" ~> "[^\"\n\r]*".r <~ "\"")  |  WordRegex
+	def parse(scriptFile: File): Either[String, Project => WithProjectResult[Unit]] =
+	{
+		def parseReader(reader: java.io.Reader) =
+			parseAll(script, reader) match
+			{
+				case Success(result, next) => Right(result)
+				case err: NoSuccess =>
+				{
+					val pos = err.next.pos
+					Left("Could not parse test script '" + scriptFile.getCanonicalPath + 
+					"' (" + pos.line + "," + pos.column + "): " + err.msg)
+				}
+			}
+		FileUtilities.readValue(scriptFile, log)(parseReader)
+	}
+	
+	private def scriptError(message: String): Some[String] = Some("Test script error: " + message)
+	private def wrongArguments(commandName: String, args: List[String]): Some[String] =
+		scriptError("Command '" + commandName + "' does not accept arguments (found '" + spacedString(args) + "').")
+	private def wrongArguments(commandName: String, requiredArgs: String, args: List[String]): Some[String] = 
+		scriptError("Wrong number of arguments to " + commandName + " command.  " + requiredArgs + " required, found: '" + spacedString(args) + "'.")
+	private def evaluateCommand(command: List[String], successExpected: Boolean, position: Positional)(project: Project): Either[String, ReloadProject] =
+	{
+		command match
+		{
+			case "reload" :: Nil => Right(if(successExpected) new ReloadSuccessExpected(linePrefix(position)) else ReloadErrorExpected)
+			case x => evaluateCommandNoReload(x, successExpected)(project).toLeft(NoReload)
+		}
+	}
+	private def evaluateCommandNoReload(command: List[String], successExpected: Boolean)(project: Project): Option[String] =
+	{
+		evaluate(successExpected, "Command '" + command.firstOption.getOrElse("") + "'", project)
+		{
+			command match
+			{
+				case Nil => scriptError("No command specified.")
+				case "touch" :: paths => touch(paths, project)
+				case "delete" :: paths => delete(paths, project)
+				case "mkdir" :: paths => makeDirectories(paths, project)
+				case "copy-file" :: from :: to :: Nil => copyFile(from, to, project)
+				case "copy-file" :: args => wrongArguments("copy-file", "Two paths", args)
+				case "sync" :: from :: to :: Nil => sync(from, to, project)
+				case "sync" :: args => wrongArguments("sync", "Two directory paths", args)
+				case "copy" :: paths => copy(paths, project)
+				case "exists" :: paths => exists(paths, project)
+				case "absent" :: paths => absent(paths, project)
+				case "pause" :: Nil => readLine("Press enter to continue. "); println(); None
+				case "pause" :: args => wrongArguments("pause", args)
+				case "newer" :: a :: b :: Nil => newer(a, b, project)
+				case "newer" :: args => wrongArguments("newer", "Two paths", args)
+				case "sleep" :: time :: Nil => trap("Error while sleeping:") { Thread.sleep(time.toLong) }
+				case "sleep" :: args => wrongArguments("sleep", "Time in milliseconds", args)
+				case "exec" :: command :: args => execute(command, args, project)
+				case "exec" :: other => wrongArguments("exec", "Command and arguments", other)
+				case "reload" :: args => wrongArguments("reload", args)
+				case unknown :: arguments => scriptError("Unknown command " + unknown)
+			}
+		}
+	}
+	private def foreachBufferedLogger(project: Project)(f: BufferedLogger => Unit)
+	{
+		project.topologicalSort.foreach(p => p.log match { case buffered: BufferedLogger => f(buffered); case _ => () })
+	}
+	private def evaluate(successExpected: Boolean, label: String, project: Project)(body: => Option[String]): Option[String] =
+	{
+		def startRecordingLog() { foreachBufferedLogger(project)(_.startRecording()) }
+		def playLog() { foreachBufferedLogger(project)(_.playAll()) }
+		def stopLog() { foreachBufferedLogger(project)(_.stop()) }
+		
+		startRecordingLog()
+		val result =
+			body match
+			{
+				case None =>
+					if(successExpected) None
+					else
+					{
+						playLog()
+						Some(label + " succeeded (expected failure).")
+					}
+				case Some(failure) =>
+					if(successExpected)
+					{
+						playLog()
+						Some(label + " failed (expected success): " + failure)
+					}
+					else None
+			}
+		stopLog()
+		result
+	}
+	private def evaluateAction(action: List[String], successExpected: Boolean)(project: Project): Option[String] =
+	{
+		def actionToString = action.mkString(" ")
+		action match
+		{
+			case Nil => scriptError("No action specified.")
+			case head :: Nil if project.taskNames.toSeq.contains(head)=>
+					evaluate(successExpected, "Action '" + actionToString + "'", project)(project.act(head))
+			case head :: tail =>
+				evaluate(successExpected, "Method '" + actionToString + "'", project)(project.call(head, tail.toArray))
+		}
+	}
+	private def spacedString[T](l: Seq[T]) = l.mkString(" ")
+	private def wrap(result: Option[String]) = result.flatMap(scriptError)
+	private def trap(errorPrefix: String)(action: => Unit) = wrap( Control.trapUnit(errorPrefix, log) { action; None } )
+	
+	private def fromStrings(paths: List[String], project: Project) = paths.map(path => fromString(path, project))
+	private def fromString(path: String, project: Project) = Path.fromString(project.info.projectPath, path)
+	private def touch(paths: List[String], project: Project) =
+		if(paths.isEmpty)
+			scriptError("No paths specified for touch command.")
+		else
+			wrap(lazyFold(paths) { path => FileUtilities.touch(fromString(path, project), log) })
+		
+	private def delete(paths: List[String], project: Project) =
+		if(paths.isEmpty)
+			scriptError("No paths specified for delete command.")
+		else
+			wrap(FileUtilities.clean(fromStrings(paths, project), true, log))
+	private def sync(from: String, to: String, project: Project) =
+		wrap(FileUtilities.sync(fromString(from, project), fromString(to, project), log))
+	private def copyFile(from: String, to: String, project: Project) =
+		wrap(FileUtilities.copyFile(fromString(from, project), fromString(to, project), log))
+	private def copy(paths: List[String], project: Project) =
+		paths match
+		{
+			case Nil => scriptError("No paths specified for copy command.")
+			case path :: Nil => scriptError("No destination specified for copy command.")
+			case _ =>
+				val mapped = fromStrings(paths, project).toArray
+				val last = mapped.length - 1
+				wrap(FileUtilities.copy(mapped.take(last), mapped(last), log).left.toOption)
+		}
+	private def makeDirectories(paths: List[String], project: Project) =
+		fromStrings(paths, project) match
+		{
+			case Nil => scriptError("No paths specified for mkdir command.")
+			case p => FileUtilities.createDirectories(p, project.log)
+		}
+	private def newer(a: String, b: String, project: Project) =
+		trap("Error testing if '" + a + "' is newer than '" + b + "'")
+		{
+			val pathA = fromString(a, project)
+			val pathB = fromString(b, project)
+			pathA.exists && (!pathB.exists || pathA.lastModified > pathB.lastModified)
+		}
+	private def exists(paths: List[String], project: Project) =
+		fromStrings(paths, project).filter(!_.exists) match
+		{
+			case Nil => None
+			case x => Some("File(s) did not exist: " + x.mkString("[ ", " , ", " ]"))
+		}
+	private def absent(paths: List[String], project: Project) =
+		fromStrings(paths, project).filter(_.exists) match
+		{
+			case Nil => None
+			case x => Some("File(s) existed: " + x.mkString("[ ", " , ", " ]"))
+		}
+	private def execute(command: String, args: List[String], project: Project) =
+	{
+		if(command.trim.isEmpty)
+			Some("Command was empty.")
+		else
+		{
+			Control.trapUnit("Error running command: ", project.log)
+			{
+				val builder = new java.lang.ProcessBuilder((command :: args).toArray :  _*).directory(project.info.projectDirectory)
+				val exitValue = Process(builder) ! log
+				if(exitValue == 0)
+					None
+				else
+					Some("Nonzero exit value (" + exitValue + ")")
+			}
+		}
+	}
+}
+private object TestScriptParser
+{
+	val SuccessLiteral = "success"
+	val Failure = "error"
+	val CommandStart = "$"
+	val ActionStart = ">"
+	val WordRegex = """[^ \[\]\s'\"][^ \[\]\s]*""".r
+	val StartRegex = ("[" + CommandStart + ActionStart + "]").r
+	
+	final def lazyFold[T](list: List[T])(f: T => Option[String]): Option[String] =
+		list match
+		{
+			case Nil => None
+			case head :: tail =>
+				f(head) match
+				{
+					case None => lazyFold(tail)(f)
+					case x => x
+				}
+		}
+}

From 0fee43295ea0c1b4831f0aa4bb285da484c3ab93 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 7 Jul 2009 01:11:46 +0000
Subject: [PATCH 014/268] Make multiTask run all subtasks when none are
 specified.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@847 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ScalaProject.scala | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 4e1110fcb..7572c628c 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -345,17 +345,25 @@ trait MultiTaskProject extends Project
 {
 	def multiTask(allTests: => List[String])(run: (String => Boolean) => Task) =
 		task { tests =>
-			val (exactFilters, testFilters) = tests.toList.map(GlobFilter.apply).partition(_.isInstanceOf[ExactFilter])
-			val includeTests = exactFilters.map(_.asInstanceOf[ExactFilter].matchName)
-			val toCheck = scala.collection.mutable.HashSet(includeTests: _*)
-			toCheck --= allTests
-			if(!toCheck.isEmpty && log.atLevel(Level.Warn))
+			def filterInclude =
 			{
-				log.warn("Test(s) not found:")
-				toCheck.foreach(test => log.warn("\t" + test))
+				val (exactFilters, testFilters) = tests.toList.map(GlobFilter.apply).partition(_.isInstanceOf[ExactFilter])
+				val includeTests = exactFilters.map(_.asInstanceOf[ExactFilter].matchName)
+				val toCheck = scala.collection.mutable.HashSet(includeTests: _*)
+				toCheck --= allTests
+				if(!toCheck.isEmpty && log.atLevel(Level.Warn))
+				{
+					log.warn("Test(s) not found:")
+					toCheck.foreach(test => log.warn("\t" + test))
+				}
+				val includeTestsSet = Set(includeTests: _*)
+				(test: String) => includeTestsSet.contains(test) || testFilters.exists(_.accept(test))
 			}
-			val includeTestsSet = Set(includeTests: _*)
-			val includeFunction = (test: String) => includeTestsSet.contains(test) || testFilters.exists(_.accept(test))
+			val includeFunction =
+				if(tests.isEmpty)
+					(test: String) => true
+				else
+					filterInclude
 			run(includeFunction)
 		} completeWith allTests
 	

From d189dbf386bf03e59487b852a5bcbf4afcfab76c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 7 Jul 2009 01:12:20 +0000
Subject: [PATCH 015/268] Move scripted tests

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@848 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../actions/interactive/changes/TestProject2.scala                | 0
 .../actions/interactive/changes/TestProject3.scala                | 0
 .../actions/interactive/changes/TestProject4.scala                | 0
 .../actions/interactive/changes/TestProject5.scala                | 0
 .../actions/interactive/changes/TestProject6.scala                | 0
 .../actions/interactive/changes/TestProject7.scala                | 0
 .../actions/interactive/project/build.properties                  | 0
 .../actions/interactive/project/build/src/Marker.scala            | 0
 .../actions/interactive/project/build/src/TestProject.scala       | 0
 .../sbt-test-resources => sbt-test}/actions/interactive/test      | 0
 .../compiler-project/run-test/project/build.properties            | 0
 .../compiler-project/run-test/project/build/src/TestProject.scala | 0
 .../compiler-project/run-test/src/main/scala/Foo.scala            | 0
 .../compiler-project/run-test/src/test/scala/FooTest.scala        | 0
 .../compiler-project/run-test/test                                | 0
 .../exclude-transitive/project/build.properties                   | 0
 .../exclude-transitive/project/build/src/TestProject.scala        | 0
 .../dependency-management/exclude-transitive/test                 | 0
 .../inherit-repo/changes/CorrectProject.scala                     | 0
 .../inherit-repo/changes/CorrectProject2.scala                    | 0
 .../inherit-repo/changes/CorrectProject3.scala                    | 0
 .../dependency-management/inherit-repo/project/build.properties   | 0
 .../inherit-repo/project/build/src/TestProject.scala              | 0
 .../dependency-management/inherit-repo/test                       | 0
 .../dependency-management/inline-default/project/build.properties | 0
 .../inline-default/project/build/src/TestProject.scala            | 0
 .../dependency-management/inline-default/test                     | 0
 .../inline-dependencies-a/project/build.properties                | 0
 .../project/build/src/UpdateTestProject.scala                     | 0
 .../dependency-management/inline-dependencies-a/test              | 0
 .../ivy-settings-a/changes/scala-tools-ivysettings.xml            | 0
 .../ivy-settings-a/changes/scalacheck-ivy.xml                     | 0
 .../dependency-management/ivy-settings-a/ivy.xml                  | 0
 .../dependency-management/ivy-settings-a/ivysettings.xml          | 0
 .../dependency-management/ivy-settings-a/project/build.properties | 0
 .../dependency-management/ivy-settings-a/test                     | 0
 .../ivy-settings-b/changes/scala-tools-ivysettings.xml            | 0
 .../dependency-management/ivy-settings-b/ivysettings.xml          | 0
 .../dependency-management/ivy-settings-b/project/build.properties | 0
 .../ivy-settings-b/project/build/src/UpdateTestProject.scala      | 0
 .../dependency-management/ivy-settings-b/test                     | 0
 .../dependency-management/java.net/project/build.properties       | 0
 .../java.net/project/build/src/TestProject.scala                  | 0
 .../dependency-management/java.net/test                           | 0
 .../dependency-management/provided/project/build.properties       | 0
 .../provided/project/build/src/TestProject.scala                  | 0
 .../dependency-management/provided/test                           | 0
 .../dependency-management/url/project/build.properties            | 0
 .../dependency-management/url/project/build/src/TestProject.scala | 0
 .../dependency-management/url/test                                | 0
 .../java/analysis/project/build.properties                        | 0
 .../java/analysis/src/main/java/test/R.java                       | 0
 .../resources/sbt-test-resources => sbt-test}/java/analysis/test  | 0
 .../java/basic/project/build.properties                           | 0
 .../java/basic/src/main/java/test/R.java                          | 0
 .../java/basic/src/main/scala/S.scala                             | 0
 .../resources/sbt-test-resources => sbt-test}/java/basic/test     | 0
 .../java/options/project/build.properties                         | 0
 .../java/options/project/build/src/JavaProject.scala              | 0
 .../java/options/src/main/java/test/R.java                        | 0
 .../java/options/src/main/scala/S.scala                           | 0
 .../resources/sbt-test-resources => sbt-test}/java/options/test   | 0
 .../package/lazy-name/project/build.properties                    | 0
 .../sbt-test-resources => sbt-test}/package/lazy-name/test        | 0
 .../package/manifest/project/build.properties                     | 0
 .../package/manifest/project/build/src/ManifestTestProject.scala  | 0
 .../package/manifest/src/main/scala/jartest/Main.scala            | 0
 .../sbt-test-resources => sbt-test}/package/manifest/test         | 0
 .../package/resources/project/build.properties                    | 0
 .../package/resources/project/build/src/ManifestTestProject.scala | 0
 .../package/resources/src/main/resources/main_resource_test       | 0
 .../package/resources/src/main/scala/jartest/Main.scala           | 0
 .../sbt-test-resources => sbt-test}/package/resources/test        | 0
 .../project/Class.forName/changes/LibTestProject.scala            | 0
 .../project/Class.forName/project/build.properties                | 0
 .../project/Class.forName/src/main/scala/Test.scala               | 0
 .../sbt-test-resources => sbt-test}/project/Class.forName/test    | 0
 .../project/flatten/project/build.properties                      | 0
 .../project/flatten/project/build/src/FlatProject.scala           | 0
 .../project/flatten/src/JavaA.java                                | 0
 .../project/flatten/src/ScalaA.scala                              | 0
 .../project/flatten/src/a/JavaB.java                              | 0
 .../project/flatten/src/a/ScalaB.scala                            | 0
 .../project/flatten/src/a/test-resource-a                         | 0
 .../project/flatten/src/test-resource                             | 0
 .../sbt-test-resources => sbt-test}/project/flatten/test          | 0
 .../project/flatten/test-src/SimpleTest.scala                     | 0
 .../project/flatten/test-src/c/ResourcesTest.scala                | 0
 .../project/flatten/test-src/c/test-resource-c                    | 0
 .../project/flatten/test-src/test-resource                        | 0
 .../project/lib/changes/LibTestProject.scala                      | 0
 .../project/lib/project/build.properties                          | 0
 .../project/lib/src/main/scala/Test.scala                         | 0
 .../resources/sbt-test-resources => sbt-test}/project/lib/test    | 0
 .../project/multi/changes/MultiProject.scala                      | 0
 .../project/multi/changes/SingleAndTraitProject.scala             | 0
 .../project/multi/changes/SingleProject.scala                     | 0
 .../project/multi/changes/SinglePublicProject.scala               | 0
 .../project/multi/project/build.properties                        | 0
 .../resources/sbt-test-resources => sbt-test}/project/multi/test  | 0
 .../properties/multi-project-a/project/build.properties           | 0
 .../multi-project-a/project/build/src/TestProject.scala           | 0
 .../properties/multi-project-a/test                               | 0
 .../properties/multi-project-b/project/build.properties           | 0
 .../multi-project-b/project/build/src/TestProject.scala           | 0
 .../properties/multi-project-b/test                               | 0
 .../run/daemon-exit/project/build.properties                      | 0
 .../run/daemon-exit/src/main/scala/Daemon.scala                   | 0
 .../sbt-test-resources => sbt-test}/run/daemon-exit/test          | 0
 .../run/daemon/project/build.properties                           | 0
 .../run/daemon/src/main/scala/Daemon.scala                        | 0
 .../resources/sbt-test-resources => sbt-test}/run/daemon/test     | 0
 .../run/spawn-exit/project/build.properties                       | 0
 .../run/spawn-exit/src/main/scala/Spawn.scala                     | 0
 .../resources/sbt-test-resources => sbt-test}/run/spawn-exit/test | 0
 .../run/spawn/project/build.properties                            | 0
 .../run/spawn/src/main/scala/Spawn.scala                          | 0
 .../resources/sbt-test-resources => sbt-test}/run/spawn/test      | 0
 .../source-dependencies/empty-a/changes/A.scala                   | 0
 .../source-dependencies/empty-a/changes/A2.scala                  | 0
 .../source-dependencies/empty-a/changes/B.scala                   | 0
 .../source-dependencies/empty-a/project/build.properties          | 0
 .../source-dependencies/empty-a/test                              | 0
 .../source-dependencies/new-cyclic/changes/A2.scala               | 0
 .../source-dependencies/new-cyclic/project/build.properties       | 0
 .../source-dependencies/new-cyclic/src/main/scala/A.scala         | 0
 .../source-dependencies/new-cyclic/src/main/scala/B.scala         | 0
 .../source-dependencies/new-cyclic/test                           | 0
 .../source-dependencies/remove-test-a/changes/1.scala             | 0
 .../source-dependencies/remove-test-a/project/build.properties    | 0
 .../source-dependencies/remove-test-a/test                        | 0
 .../source-dependencies/remove-test-b/changes/A2.scala            | 0
 .../source-dependencies/remove-test-b/changes/B3.scala            | 0
 .../source-dependencies/remove-test-b/changes/B4.scala            | 0
 .../source-dependencies/remove-test-b/changes/B5.scala            | 0
 .../source-dependencies/remove-test-b/project/build.properties    | 0
 .../source-dependencies/remove-test-b/src/main/scala/A.scala      | 0
 .../source-dependencies/remove-test-b/src/main/scala/B.scala      | 0
 .../source-dependencies/remove-test-b/test                        | 0
 .../source-dependencies/replace-test-a/changes/first.scala        | 0
 .../source-dependencies/replace-test-a/changes/second.scala       | 0
 .../source-dependencies/replace-test-a/project/build.properties   | 0
 .../replace-test-a/project/build/src/TestProject.scala            | 0
 .../source-dependencies/replace-test-a/test                       | 0
 .../source-dependencies/transitive-a/changes/A2.scala             | 0
 .../source-dependencies/transitive-a/project/build.properties     | 0
 .../source-dependencies/transitive-a/src/main/scala/A.scala       | 0
 .../source-dependencies/transitive-a/src/main/scala/B.scala       | 0
 .../source-dependencies/transitive-a/src/main/scala/C.scala       | 0
 .../source-dependencies/transitive-a/test                         | 0
 .../source-dependencies/transitive-b/changes/A2.scala             | 0
 .../source-dependencies/transitive-b/project/build.properties     | 0
 .../source-dependencies/transitive-b/src/main/scala/A.scala       | 0
 .../source-dependencies/transitive-b/src/main/scala/B.scala       | 0
 .../source-dependencies/transitive-b/src/main/scala/C.scala       | 0
 .../source-dependencies/transitive-b/test                         | 0
 .../sbt-test-resources => sbt-test}/tests/Class.forName/ivy.xml   | 0
 .../tests/Class.forName/project/build.properties                  | 0
 .../tests/Class.forName/src/main/scala/Test.scala                 | 0
 .../tests/Class.forName/src/test/scala/Test.scala                 | 0
 .../sbt-test-resources => sbt-test}/tests/Class.forName/test      | 0
 .../tests/extend/changes/ScalaCheck.scala                         | 0
 .../tests/extend/changes/TestFailure.scala                        | 0
 .../tests/extend/changes/TestProject2.scala                       | 0
 .../tests/extend/changes/TestProject3.scala                       | 0
 .../tests/extend/changes/TestSuccess.scala                        | 0
 .../tests/extend/project/build.properties                         | 0
 .../tests/extend/project/build/src/TestProject.scala              | 0
 .../resources/sbt-test-resources => sbt-test}/tests/extend/test   | 0
 .../sbt-test-resources => sbt-test}/tests/resources/ivy.xml       | 0
 .../tests/resources/project/build.properties                      | 0
 .../tests/resources/src/main/resources/MainResource.txt           | 0
 .../tests/resources/src/test/resources/TestResource.txt           | 0
 .../tests/resources/src/test/scala/BasicTest.scala                | 0
 .../sbt-test-resources => sbt-test}/tests/resources/test          | 0
 .../tests/scalacheck-a/changes/BasicTest.scala                    | 0
 .../tests/scalacheck-a/changes/FailedTest.scala                   | 0
 .../tests/scalacheck-a/project/build.properties                   | 0
 .../tests/scalacheck-a/project/build/src/TestProject.scala        | 0
 .../tests/scalacheck-a/src/test/scala/DummyTest.scala             | 0
 .../sbt-test-resources => sbt-test}/tests/scalacheck-a/test       | 0
 .../tests/scalatest-ignore/project/build.properties               | 0
 .../tests/scalatest-ignore/project/build/Test.scala               | 0
 .../tests/scalatest-ignore/src/test/scala/IgnoreTest.scala        | 0
 .../sbt-test-resources => sbt-test}/tests/scalatest-ignore/test   | 0
 .../tests/specs-a/changes/BasicTest.scala                         | 0
 .../tests/specs-a/changes/FailTest.scala                          | 0
 .../tests/specs-a/project/build.properties                        | 0
 .../tests/specs-a/project/build/src/TestProject.scala             | 0
 .../tests/specs-a/src/test/scala/DummyTest.scala                  | 0
 .../resources/sbt-test-resources => sbt-test}/tests/specs-a/test  | 0
 .../tests/specs-nested/project/build.properties                   | 0
 .../tests/specs-nested/project/build/src/TestProject.scala        | 0
 .../tests/specs-nested/src/test/scala/TestSpecification.scala     | 0
 .../sbt-test-resources => sbt-test}/tests/specs-nested/test       | 0
 195 files changed, 0 insertions(+), 0 deletions(-)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/changes/TestProject2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/changes/TestProject3.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/changes/TestProject4.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/changes/TestProject5.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/changes/TestProject6.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/changes/TestProject7.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/project/build/src/Marker.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/actions/interactive/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/compiler-project/run-test/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/compiler-project/run-test/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/compiler-project/run-test/src/main/scala/Foo.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/compiler-project/run-test/src/test/scala/FooTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/compiler-project/run-test/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/exclude-transitive/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/exclude-transitive/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/exclude-transitive/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inherit-repo/changes/CorrectProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inherit-repo/changes/CorrectProject2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inherit-repo/changes/CorrectProject3.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inherit-repo/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inherit-repo/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inherit-repo/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inline-default/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inline-default/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inline-default/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inline-dependencies-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/inline-dependencies-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-a/ivy.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-a/ivysettings.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-b/ivysettings.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-b/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/ivy-settings-b/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/java.net/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/java.net/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/java.net/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/provided/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/provided/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/provided/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/url/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/url/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/dependency-management/url/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/analysis/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/analysis/src/main/java/test/R.java (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/analysis/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/basic/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/basic/src/main/java/test/R.java (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/basic/src/main/scala/S.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/basic/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/options/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/options/project/build/src/JavaProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/options/src/main/java/test/R.java (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/options/src/main/scala/S.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/java/options/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/lazy-name/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/lazy-name/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/manifest/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/manifest/project/build/src/ManifestTestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/manifest/src/main/scala/jartest/Main.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/manifest/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/resources/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/resources/project/build/src/ManifestTestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/resources/src/main/resources/main_resource_test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/resources/src/main/scala/jartest/Main.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/package/resources/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/Class.forName/changes/LibTestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/Class.forName/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/Class.forName/src/main/scala/Test.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/Class.forName/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/project/build/src/FlatProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/src/JavaA.java (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/src/ScalaA.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/src/a/JavaB.java (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/src/a/ScalaB.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/src/a/test-resource-a (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/src/test-resource (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/test-src/SimpleTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/test-src/c/ResourcesTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/test-src/c/test-resource-c (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/flatten/test-src/test-resource (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/lib/changes/LibTestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/lib/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/lib/src/main/scala/Test.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/lib/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/multi/changes/MultiProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/multi/changes/SingleAndTraitProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/multi/changes/SingleProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/multi/changes/SinglePublicProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/multi/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/project/multi/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/properties/multi-project-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/properties/multi-project-a/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/properties/multi-project-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/properties/multi-project-b/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/properties/multi-project-b/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/properties/multi-project-b/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/daemon-exit/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/daemon-exit/src/main/scala/Daemon.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/daemon-exit/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/daemon/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/daemon/src/main/scala/Daemon.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/daemon/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/spawn-exit/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/spawn-exit/src/main/scala/Spawn.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/spawn-exit/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/spawn/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/spawn/src/main/scala/Spawn.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/run/spawn/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/empty-a/changes/A.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/empty-a/changes/A2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/empty-a/changes/B.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/empty-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/empty-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/new-cyclic/changes/A2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/new-cyclic/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/new-cyclic/src/main/scala/A.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/new-cyclic/src/main/scala/B.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/new-cyclic/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-a/changes/1.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/changes/A2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/changes/B3.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/changes/B4.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/changes/B5.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/src/main/scala/A.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/src/main/scala/B.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/remove-test-b/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/replace-test-a/changes/first.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/replace-test-a/changes/second.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/replace-test-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/replace-test-a/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/replace-test-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-a/changes/A2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-a/src/main/scala/A.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-a/src/main/scala/B.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-a/src/main/scala/C.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-b/changes/A2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-b/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-b/src/main/scala/A.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-b/src/main/scala/B.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-b/src/main/scala/C.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/source-dependencies/transitive-b/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/Class.forName/ivy.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/Class.forName/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/Class.forName/src/main/scala/Test.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/Class.forName/src/test/scala/Test.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/Class.forName/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/changes/ScalaCheck.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/changes/TestFailure.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/changes/TestProject2.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/changes/TestProject3.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/changes/TestSuccess.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/extend/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/resources/ivy.xml (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/resources/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/resources/src/main/resources/MainResource.txt (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/resources/src/test/resources/TestResource.txt (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/resources/src/test/scala/BasicTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/resources/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalacheck-a/changes/BasicTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalacheck-a/changes/FailedTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalacheck-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalacheck-a/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalacheck-a/src/test/scala/DummyTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalacheck-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalatest-ignore/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalatest-ignore/project/build/Test.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/scalatest-ignore/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-a/changes/BasicTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-a/changes/FailTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-a/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-a/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-a/src/test/scala/DummyTest.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-a/test (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-nested/project/build.properties (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-nested/project/build/src/TestProject.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-nested/src/test/scala/TestSpecification.scala (100%)
 rename src/{test/resources/sbt-test-resources => sbt-test}/tests/specs-nested/test (100%)

diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject2.scala b/src/sbt-test/actions/interactive/changes/TestProject2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject2.scala
rename to src/sbt-test/actions/interactive/changes/TestProject2.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject3.scala b/src/sbt-test/actions/interactive/changes/TestProject3.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject3.scala
rename to src/sbt-test/actions/interactive/changes/TestProject3.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject4.scala b/src/sbt-test/actions/interactive/changes/TestProject4.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject4.scala
rename to src/sbt-test/actions/interactive/changes/TestProject4.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject5.scala b/src/sbt-test/actions/interactive/changes/TestProject5.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject5.scala
rename to src/sbt-test/actions/interactive/changes/TestProject5.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject6.scala b/src/sbt-test/actions/interactive/changes/TestProject6.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject6.scala
rename to src/sbt-test/actions/interactive/changes/TestProject6.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject7.scala b/src/sbt-test/actions/interactive/changes/TestProject7.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/changes/TestProject7.scala
rename to src/sbt-test/actions/interactive/changes/TestProject7.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/project/build.properties b/src/sbt-test/actions/interactive/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/project/build.properties
rename to src/sbt-test/actions/interactive/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/Marker.scala b/src/sbt-test/actions/interactive/project/build/src/Marker.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/project/build/src/Marker.scala
rename to src/sbt-test/actions/interactive/project/build/src/Marker.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/project/build/src/TestProject.scala b/src/sbt-test/actions/interactive/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/project/build/src/TestProject.scala
rename to src/sbt-test/actions/interactive/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/actions/interactive/test b/src/sbt-test/actions/interactive/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/actions/interactive/test
rename to src/sbt-test/actions/interactive/test
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build.properties b/src/sbt-test/compiler-project/run-test/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/compiler-project/run-test/project/build.properties
rename to src/sbt-test/compiler-project/run-test/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/project/build/src/TestProject.scala b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/compiler-project/run-test/project/build/src/TestProject.scala
rename to src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/src/main/scala/Foo.scala b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/compiler-project/run-test/src/main/scala/Foo.scala
rename to src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/src/test/scala/FooTest.scala b/src/sbt-test/compiler-project/run-test/src/test/scala/FooTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/compiler-project/run-test/src/test/scala/FooTest.scala
rename to src/sbt-test/compiler-project/run-test/src/test/scala/FooTest.scala
diff --git a/src/test/resources/sbt-test-resources/compiler-project/run-test/test b/src/sbt-test/compiler-project/run-test/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/compiler-project/run-test/test
rename to src/sbt-test/compiler-project/run-test/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build.properties b/src/sbt-test/dependency-management/exclude-transitive/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build.properties
rename to src/sbt-test/dependency-management/exclude-transitive/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/exclude-transitive/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/project/build/src/TestProject.scala
rename to src/sbt-test/dependency-management/exclude-transitive/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/test b/src/sbt-test/dependency-management/exclude-transitive/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/exclude-transitive/test
rename to src/sbt-test/dependency-management/exclude-transitive/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject.scala b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject.scala
rename to src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject2.scala b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject2.scala
rename to src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject3.scala b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inherit-repo/changes/CorrectProject3.scala
rename to src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build.properties b/src/sbt-test/dependency-management/inherit-repo/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build.properties
rename to src/sbt-test/dependency-management/inherit-repo/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inherit-repo/project/build/src/TestProject.scala
rename to src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inherit-repo/test b/src/sbt-test/dependency-management/inherit-repo/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inherit-repo/test
rename to src/sbt-test/dependency-management/inherit-repo/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build.properties b/src/sbt-test/dependency-management/inline-default/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build.properties
rename to src/sbt-test/dependency-management/inline-default/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inline-default/project/build/src/TestProject.scala
rename to src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-default/test b/src/sbt-test/dependency-management/inline-default/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inline-default/test
rename to src/sbt-test/dependency-management/inline-default/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build.properties b/src/sbt-test/dependency-management/inline-dependencies-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build.properties
rename to src/sbt-test/dependency-management/inline-dependencies-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala b/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
rename to src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/test b/src/sbt-test/dependency-management/inline-dependencies-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/inline-dependencies-a/test
rename to src/sbt-test/dependency-management/inline-dependencies-a/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml b/src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
rename to src/sbt-test/dependency-management/ivy-settings-a/changes/scala-tools-ivysettings.xml
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml b/src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
rename to src/sbt-test/dependency-management/ivy-settings-a/changes/scalacheck-ivy.xml
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivy.xml b/src/sbt-test/dependency-management/ivy-settings-a/ivy.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivy.xml
rename to src/sbt-test/dependency-management/ivy-settings-a/ivy.xml
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivysettings.xml b/src/sbt-test/dependency-management/ivy-settings-a/ivysettings.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/ivysettings.xml
rename to src/sbt-test/dependency-management/ivy-settings-a/ivysettings.xml
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/project/build.properties b/src/sbt-test/dependency-management/ivy-settings-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/project/build.properties
rename to src/sbt-test/dependency-management/ivy-settings-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/test b/src/sbt-test/dependency-management/ivy-settings-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-a/test
rename to src/sbt-test/dependency-management/ivy-settings-a/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml b/src/sbt-test/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
rename to src/sbt-test/dependency-management/ivy-settings-b/changes/scala-tools-ivysettings.xml
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/ivysettings.xml b/src/sbt-test/dependency-management/ivy-settings-b/ivysettings.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/ivysettings.xml
rename to src/sbt-test/dependency-management/ivy-settings-b/ivysettings.xml
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build.properties b/src/sbt-test/dependency-management/ivy-settings-b/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build.properties
rename to src/sbt-test/dependency-management/ivy-settings-b/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala b/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
rename to src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/test b/src/sbt-test/dependency-management/ivy-settings-b/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/ivy-settings-b/test
rename to src/sbt-test/dependency-management/ivy-settings-b/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build.properties b/src/sbt-test/dependency-management/java.net/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/java.net/project/build.properties
rename to src/sbt-test/dependency-management/java.net/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/java.net/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/java.net/project/build/src/TestProject.scala
rename to src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/java.net/test b/src/sbt-test/dependency-management/java.net/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/java.net/test
rename to src/sbt-test/dependency-management/java.net/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/provided/project/build.properties b/src/sbt-test/dependency-management/provided/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/provided/project/build.properties
rename to src/sbt-test/dependency-management/provided/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/provided/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/provided/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/provided/project/build/src/TestProject.scala
rename to src/sbt-test/dependency-management/provided/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/provided/test b/src/sbt-test/dependency-management/provided/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/provided/test
rename to src/sbt-test/dependency-management/provided/test
diff --git a/src/test/resources/sbt-test-resources/dependency-management/url/project/build.properties b/src/sbt-test/dependency-management/url/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/url/project/build.properties
rename to src/sbt-test/dependency-management/url/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/dependency-management/url/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/url/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/url/project/build/src/TestProject.scala
rename to src/sbt-test/dependency-management/url/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/dependency-management/url/test b/src/sbt-test/dependency-management/url/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/dependency-management/url/test
rename to src/sbt-test/dependency-management/url/test
diff --git a/src/test/resources/sbt-test-resources/java/analysis/project/build.properties b/src/sbt-test/java/analysis/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/analysis/project/build.properties
rename to src/sbt-test/java/analysis/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/java/analysis/src/main/java/test/R.java b/src/sbt-test/java/analysis/src/main/java/test/R.java
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/analysis/src/main/java/test/R.java
rename to src/sbt-test/java/analysis/src/main/java/test/R.java
diff --git a/src/test/resources/sbt-test-resources/java/analysis/test b/src/sbt-test/java/analysis/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/analysis/test
rename to src/sbt-test/java/analysis/test
diff --git a/src/test/resources/sbt-test-resources/java/basic/project/build.properties b/src/sbt-test/java/basic/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/basic/project/build.properties
rename to src/sbt-test/java/basic/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/java/basic/src/main/java/test/R.java b/src/sbt-test/java/basic/src/main/java/test/R.java
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/basic/src/main/java/test/R.java
rename to src/sbt-test/java/basic/src/main/java/test/R.java
diff --git a/src/test/resources/sbt-test-resources/java/basic/src/main/scala/S.scala b/src/sbt-test/java/basic/src/main/scala/S.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/basic/src/main/scala/S.scala
rename to src/sbt-test/java/basic/src/main/scala/S.scala
diff --git a/src/test/resources/sbt-test-resources/java/basic/test b/src/sbt-test/java/basic/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/basic/test
rename to src/sbt-test/java/basic/test
diff --git a/src/test/resources/sbt-test-resources/java/options/project/build.properties b/src/sbt-test/java/options/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/options/project/build.properties
rename to src/sbt-test/java/options/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/java/options/project/build/src/JavaProject.scala b/src/sbt-test/java/options/project/build/src/JavaProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/options/project/build/src/JavaProject.scala
rename to src/sbt-test/java/options/project/build/src/JavaProject.scala
diff --git a/src/test/resources/sbt-test-resources/java/options/src/main/java/test/R.java b/src/sbt-test/java/options/src/main/java/test/R.java
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/options/src/main/java/test/R.java
rename to src/sbt-test/java/options/src/main/java/test/R.java
diff --git a/src/test/resources/sbt-test-resources/java/options/src/main/scala/S.scala b/src/sbt-test/java/options/src/main/scala/S.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/options/src/main/scala/S.scala
rename to src/sbt-test/java/options/src/main/scala/S.scala
diff --git a/src/test/resources/sbt-test-resources/java/options/test b/src/sbt-test/java/options/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/java/options/test
rename to src/sbt-test/java/options/test
diff --git a/src/test/resources/sbt-test-resources/package/lazy-name/project/build.properties b/src/sbt-test/package/lazy-name/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/lazy-name/project/build.properties
rename to src/sbt-test/package/lazy-name/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/package/lazy-name/test b/src/sbt-test/package/lazy-name/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/lazy-name/test
rename to src/sbt-test/package/lazy-name/test
diff --git a/src/test/resources/sbt-test-resources/package/manifest/project/build.properties b/src/sbt-test/package/manifest/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/manifest/project/build.properties
rename to src/sbt-test/package/manifest/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/package/manifest/project/build/src/ManifestTestProject.scala b/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/manifest/project/build/src/ManifestTestProject.scala
rename to src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
diff --git a/src/test/resources/sbt-test-resources/package/manifest/src/main/scala/jartest/Main.scala b/src/sbt-test/package/manifest/src/main/scala/jartest/Main.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/manifest/src/main/scala/jartest/Main.scala
rename to src/sbt-test/package/manifest/src/main/scala/jartest/Main.scala
diff --git a/src/test/resources/sbt-test-resources/package/manifest/test b/src/sbt-test/package/manifest/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/manifest/test
rename to src/sbt-test/package/manifest/test
diff --git a/src/test/resources/sbt-test-resources/package/resources/project/build.properties b/src/sbt-test/package/resources/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/resources/project/build.properties
rename to src/sbt-test/package/resources/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/package/resources/project/build/src/ManifestTestProject.scala b/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/resources/project/build/src/ManifestTestProject.scala
rename to src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
diff --git a/src/test/resources/sbt-test-resources/package/resources/src/main/resources/main_resource_test b/src/sbt-test/package/resources/src/main/resources/main_resource_test
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/resources/src/main/resources/main_resource_test
rename to src/sbt-test/package/resources/src/main/resources/main_resource_test
diff --git a/src/test/resources/sbt-test-resources/package/resources/src/main/scala/jartest/Main.scala b/src/sbt-test/package/resources/src/main/scala/jartest/Main.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/resources/src/main/scala/jartest/Main.scala
rename to src/sbt-test/package/resources/src/main/scala/jartest/Main.scala
diff --git a/src/test/resources/sbt-test-resources/package/resources/test b/src/sbt-test/package/resources/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/package/resources/test
rename to src/sbt-test/package/resources/test
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/changes/LibTestProject.scala b/src/sbt-test/project/Class.forName/changes/LibTestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/Class.forName/changes/LibTestProject.scala
rename to src/sbt-test/project/Class.forName/changes/LibTestProject.scala
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/project/build.properties b/src/sbt-test/project/Class.forName/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/Class.forName/project/build.properties
rename to src/sbt-test/project/Class.forName/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/src/main/scala/Test.scala b/src/sbt-test/project/Class.forName/src/main/scala/Test.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/Class.forName/src/main/scala/Test.scala
rename to src/sbt-test/project/Class.forName/src/main/scala/Test.scala
diff --git a/src/test/resources/sbt-test-resources/project/Class.forName/test b/src/sbt-test/project/Class.forName/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/Class.forName/test
rename to src/sbt-test/project/Class.forName/test
diff --git a/src/test/resources/sbt-test-resources/project/flatten/project/build.properties b/src/sbt-test/project/flatten/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/project/build.properties
rename to src/sbt-test/project/flatten/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/project/flatten/project/build/src/FlatProject.scala b/src/sbt-test/project/flatten/project/build/src/FlatProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/project/build/src/FlatProject.scala
rename to src/sbt-test/project/flatten/project/build/src/FlatProject.scala
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/JavaA.java b/src/sbt-test/project/flatten/src/JavaA.java
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/src/JavaA.java
rename to src/sbt-test/project/flatten/src/JavaA.java
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/ScalaA.scala b/src/sbt-test/project/flatten/src/ScalaA.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/src/ScalaA.scala
rename to src/sbt-test/project/flatten/src/ScalaA.scala
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/a/JavaB.java b/src/sbt-test/project/flatten/src/a/JavaB.java
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/src/a/JavaB.java
rename to src/sbt-test/project/flatten/src/a/JavaB.java
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/a/ScalaB.scala b/src/sbt-test/project/flatten/src/a/ScalaB.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/src/a/ScalaB.scala
rename to src/sbt-test/project/flatten/src/a/ScalaB.scala
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/a/test-resource-a b/src/sbt-test/project/flatten/src/a/test-resource-a
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/src/a/test-resource-a
rename to src/sbt-test/project/flatten/src/a/test-resource-a
diff --git a/src/test/resources/sbt-test-resources/project/flatten/src/test-resource b/src/sbt-test/project/flatten/src/test-resource
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/src/test-resource
rename to src/sbt-test/project/flatten/src/test-resource
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test b/src/sbt-test/project/flatten/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/test
rename to src/sbt-test/project/flatten/test
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/SimpleTest.scala b/src/sbt-test/project/flatten/test-src/SimpleTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/test-src/SimpleTest.scala
rename to src/sbt-test/project/flatten/test-src/SimpleTest.scala
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/c/ResourcesTest.scala b/src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/test-src/c/ResourcesTest.scala
rename to src/sbt-test/project/flatten/test-src/c/ResourcesTest.scala
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/c/test-resource-c b/src/sbt-test/project/flatten/test-src/c/test-resource-c
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/test-src/c/test-resource-c
rename to src/sbt-test/project/flatten/test-src/c/test-resource-c
diff --git a/src/test/resources/sbt-test-resources/project/flatten/test-src/test-resource b/src/sbt-test/project/flatten/test-src/test-resource
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/flatten/test-src/test-resource
rename to src/sbt-test/project/flatten/test-src/test-resource
diff --git a/src/test/resources/sbt-test-resources/project/lib/changes/LibTestProject.scala b/src/sbt-test/project/lib/changes/LibTestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/lib/changes/LibTestProject.scala
rename to src/sbt-test/project/lib/changes/LibTestProject.scala
diff --git a/src/test/resources/sbt-test-resources/project/lib/project/build.properties b/src/sbt-test/project/lib/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/lib/project/build.properties
rename to src/sbt-test/project/lib/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/project/lib/src/main/scala/Test.scala b/src/sbt-test/project/lib/src/main/scala/Test.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/lib/src/main/scala/Test.scala
rename to src/sbt-test/project/lib/src/main/scala/Test.scala
diff --git a/src/test/resources/sbt-test-resources/project/lib/test b/src/sbt-test/project/lib/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/lib/test
rename to src/sbt-test/project/lib/test
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/MultiProject.scala b/src/sbt-test/project/multi/changes/MultiProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/multi/changes/MultiProject.scala
rename to src/sbt-test/project/multi/changes/MultiProject.scala
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/SingleAndTraitProject.scala b/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/multi/changes/SingleAndTraitProject.scala
rename to src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/SingleProject.scala b/src/sbt-test/project/multi/changes/SingleProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/multi/changes/SingleProject.scala
rename to src/sbt-test/project/multi/changes/SingleProject.scala
diff --git a/src/test/resources/sbt-test-resources/project/multi/changes/SinglePublicProject.scala b/src/sbt-test/project/multi/changes/SinglePublicProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/multi/changes/SinglePublicProject.scala
rename to src/sbt-test/project/multi/changes/SinglePublicProject.scala
diff --git a/src/test/resources/sbt-test-resources/project/multi/project/build.properties b/src/sbt-test/project/multi/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/multi/project/build.properties
rename to src/sbt-test/project/multi/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/project/multi/test b/src/sbt-test/project/multi/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/project/multi/test
rename to src/sbt-test/project/multi/test
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build.properties b/src/sbt-test/properties/multi-project-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/properties/multi-project-a/project/build.properties
rename to src/sbt-test/properties/multi-project-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-a/project/build/src/TestProject.scala b/src/sbt-test/properties/multi-project-a/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/properties/multi-project-a/project/build/src/TestProject.scala
rename to src/sbt-test/properties/multi-project-a/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-a/test b/src/sbt-test/properties/multi-project-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/properties/multi-project-a/test
rename to src/sbt-test/properties/multi-project-a/test
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build.properties b/src/sbt-test/properties/multi-project-b/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/properties/multi-project-b/project/build.properties
rename to src/sbt-test/properties/multi-project-b/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-b/project/build/src/TestProject.scala b/src/sbt-test/properties/multi-project-b/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/properties/multi-project-b/project/build/src/TestProject.scala
rename to src/sbt-test/properties/multi-project-b/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/properties/multi-project-b/test b/src/sbt-test/properties/multi-project-b/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/properties/multi-project-b/test
rename to src/sbt-test/properties/multi-project-b/test
diff --git a/src/test/resources/sbt-test-resources/run/daemon-exit/project/build.properties b/src/sbt-test/run/daemon-exit/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/daemon-exit/project/build.properties
rename to src/sbt-test/run/daemon-exit/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/run/daemon-exit/src/main/scala/Daemon.scala b/src/sbt-test/run/daemon-exit/src/main/scala/Daemon.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/daemon-exit/src/main/scala/Daemon.scala
rename to src/sbt-test/run/daemon-exit/src/main/scala/Daemon.scala
diff --git a/src/test/resources/sbt-test-resources/run/daemon-exit/test b/src/sbt-test/run/daemon-exit/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/daemon-exit/test
rename to src/sbt-test/run/daemon-exit/test
diff --git a/src/test/resources/sbt-test-resources/run/daemon/project/build.properties b/src/sbt-test/run/daemon/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/daemon/project/build.properties
rename to src/sbt-test/run/daemon/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/run/daemon/src/main/scala/Daemon.scala b/src/sbt-test/run/daemon/src/main/scala/Daemon.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/daemon/src/main/scala/Daemon.scala
rename to src/sbt-test/run/daemon/src/main/scala/Daemon.scala
diff --git a/src/test/resources/sbt-test-resources/run/daemon/test b/src/sbt-test/run/daemon/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/daemon/test
rename to src/sbt-test/run/daemon/test
diff --git a/src/test/resources/sbt-test-resources/run/spawn-exit/project/build.properties b/src/sbt-test/run/spawn-exit/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/spawn-exit/project/build.properties
rename to src/sbt-test/run/spawn-exit/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/run/spawn-exit/src/main/scala/Spawn.scala b/src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/spawn-exit/src/main/scala/Spawn.scala
rename to src/sbt-test/run/spawn-exit/src/main/scala/Spawn.scala
diff --git a/src/test/resources/sbt-test-resources/run/spawn-exit/test b/src/sbt-test/run/spawn-exit/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/spawn-exit/test
rename to src/sbt-test/run/spawn-exit/test
diff --git a/src/test/resources/sbt-test-resources/run/spawn/project/build.properties b/src/sbt-test/run/spawn/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/spawn/project/build.properties
rename to src/sbt-test/run/spawn/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/run/spawn/src/main/scala/Spawn.scala b/src/sbt-test/run/spawn/src/main/scala/Spawn.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/spawn/src/main/scala/Spawn.scala
rename to src/sbt-test/run/spawn/src/main/scala/Spawn.scala
diff --git a/src/test/resources/sbt-test-resources/run/spawn/test b/src/sbt-test/run/spawn/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/run/spawn/test
rename to src/sbt-test/run/spawn/test
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A.scala b/src/sbt-test/source-dependencies/empty-a/changes/A.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A.scala
rename to src/sbt-test/source-dependencies/empty-a/changes/A.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A2.scala b/src/sbt-test/source-dependencies/empty-a/changes/A2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/A2.scala
rename to src/sbt-test/source-dependencies/empty-a/changes/A2.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/B.scala b/src/sbt-test/source-dependencies/empty-a/changes/B.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/empty-a/changes/B.scala
rename to src/sbt-test/source-dependencies/empty-a/changes/B.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/project/build.properties b/src/sbt-test/source-dependencies/empty-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/empty-a/project/build.properties
rename to src/sbt-test/source-dependencies/empty-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/empty-a/test b/src/sbt-test/source-dependencies/empty-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/empty-a/test
rename to src/sbt-test/source-dependencies/empty-a/test
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/changes/A2.scala b/src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/changes/A2.scala
rename to src/sbt-test/source-dependencies/new-cyclic/changes/A2.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/project/build.properties b/src/sbt-test/source-dependencies/new-cyclic/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/project/build.properties
rename to src/sbt-test/source-dependencies/new-cyclic/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/A.scala b/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/A.scala
rename to src/sbt-test/source-dependencies/new-cyclic/src/main/scala/A.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/B.scala b/src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/src/main/scala/B.scala
rename to src/sbt-test/source-dependencies/new-cyclic/src/main/scala/B.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/test b/src/sbt-test/source-dependencies/new-cyclic/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/new-cyclic/test
rename to src/sbt-test/source-dependencies/new-cyclic/test
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/changes/1.scala b/src/sbt-test/source-dependencies/remove-test-a/changes/1.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/changes/1.scala
rename to src/sbt-test/source-dependencies/remove-test-a/changes/1.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/project/build.properties b/src/sbt-test/source-dependencies/remove-test-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/project/build.properties
rename to src/sbt-test/source-dependencies/remove-test-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/test b/src/sbt-test/source-dependencies/remove-test-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-a/test
rename to src/sbt-test/source-dependencies/remove-test-a/test
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/A2.scala b/src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/A2.scala
rename to src/sbt-test/source-dependencies/remove-test-b/changes/A2.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B3.scala b/src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B3.scala
rename to src/sbt-test/source-dependencies/remove-test-b/changes/B3.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B4.scala b/src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B4.scala
rename to src/sbt-test/source-dependencies/remove-test-b/changes/B4.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B5.scala b/src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/changes/B5.scala
rename to src/sbt-test/source-dependencies/remove-test-b/changes/B5.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/project/build.properties b/src/sbt-test/source-dependencies/remove-test-b/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/project/build.properties
rename to src/sbt-test/source-dependencies/remove-test-b/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/A.scala b/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/A.scala
rename to src/sbt-test/source-dependencies/remove-test-b/src/main/scala/A.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/B.scala b/src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/src/main/scala/B.scala
rename to src/sbt-test/source-dependencies/remove-test-b/src/main/scala/B.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/test b/src/sbt-test/source-dependencies/remove-test-b/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/remove-test-b/test
rename to src/sbt-test/source-dependencies/remove-test-b/test
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/first.scala b/src/sbt-test/source-dependencies/replace-test-a/changes/first.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/first.scala
rename to src/sbt-test/source-dependencies/replace-test-a/changes/first.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/second.scala b/src/sbt-test/source-dependencies/replace-test-a/changes/second.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/changes/second.scala
rename to src/sbt-test/source-dependencies/replace-test-a/changes/second.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build.properties b/src/sbt-test/source-dependencies/replace-test-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build.properties
rename to src/sbt-test/source-dependencies/replace-test-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build/src/TestProject.scala b/src/sbt-test/source-dependencies/replace-test-a/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/project/build/src/TestProject.scala
rename to src/sbt-test/source-dependencies/replace-test-a/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/test b/src/sbt-test/source-dependencies/replace-test-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/replace-test-a/test
rename to src/sbt-test/source-dependencies/replace-test-a/test
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/changes/A2.scala b/src/sbt-test/source-dependencies/transitive-a/changes/A2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-a/changes/A2.scala
rename to src/sbt-test/source-dependencies/transitive-a/changes/A2.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/project/build.properties b/src/sbt-test/source-dependencies/transitive-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-a/project/build.properties
rename to src/sbt-test/source-dependencies/transitive-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/A.scala b/src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/A.scala
rename to src/sbt-test/source-dependencies/transitive-a/src/main/scala/A.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/B.scala b/src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/B.scala
rename to src/sbt-test/source-dependencies/transitive-a/src/main/scala/B.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/C.scala b/src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-a/src/main/scala/C.scala
rename to src/sbt-test/source-dependencies/transitive-a/src/main/scala/C.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-a/test b/src/sbt-test/source-dependencies/transitive-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-a/test
rename to src/sbt-test/source-dependencies/transitive-a/test
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/changes/A2.scala b/src/sbt-test/source-dependencies/transitive-b/changes/A2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-b/changes/A2.scala
rename to src/sbt-test/source-dependencies/transitive-b/changes/A2.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/project/build.properties b/src/sbt-test/source-dependencies/transitive-b/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-b/project/build.properties
rename to src/sbt-test/source-dependencies/transitive-b/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/A.scala b/src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/A.scala
rename to src/sbt-test/source-dependencies/transitive-b/src/main/scala/A.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/B.scala b/src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/B.scala
rename to src/sbt-test/source-dependencies/transitive-b/src/main/scala/B.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/C.scala b/src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-b/src/main/scala/C.scala
rename to src/sbt-test/source-dependencies/transitive-b/src/main/scala/C.scala
diff --git a/src/test/resources/sbt-test-resources/source-dependencies/transitive-b/test b/src/sbt-test/source-dependencies/transitive-b/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/source-dependencies/transitive-b/test
rename to src/sbt-test/source-dependencies/transitive-b/test
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/ivy.xml b/src/sbt-test/tests/Class.forName/ivy.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/Class.forName/ivy.xml
rename to src/sbt-test/tests/Class.forName/ivy.xml
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/project/build.properties b/src/sbt-test/tests/Class.forName/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/Class.forName/project/build.properties
rename to src/sbt-test/tests/Class.forName/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/src/main/scala/Test.scala b/src/sbt-test/tests/Class.forName/src/main/scala/Test.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/Class.forName/src/main/scala/Test.scala
rename to src/sbt-test/tests/Class.forName/src/main/scala/Test.scala
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/src/test/scala/Test.scala b/src/sbt-test/tests/Class.forName/src/test/scala/Test.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/Class.forName/src/test/scala/Test.scala
rename to src/sbt-test/tests/Class.forName/src/test/scala/Test.scala
diff --git a/src/test/resources/sbt-test-resources/tests/Class.forName/test b/src/sbt-test/tests/Class.forName/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/Class.forName/test
rename to src/sbt-test/tests/Class.forName/test
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/ScalaCheck.scala b/src/sbt-test/tests/extend/changes/ScalaCheck.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/changes/ScalaCheck.scala
rename to src/sbt-test/tests/extend/changes/ScalaCheck.scala
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestFailure.scala b/src/sbt-test/tests/extend/changes/TestFailure.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/changes/TestFailure.scala
rename to src/sbt-test/tests/extend/changes/TestFailure.scala
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject2.scala b/src/sbt-test/tests/extend/changes/TestProject2.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/changes/TestProject2.scala
rename to src/sbt-test/tests/extend/changes/TestProject2.scala
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestProject3.scala b/src/sbt-test/tests/extend/changes/TestProject3.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/changes/TestProject3.scala
rename to src/sbt-test/tests/extend/changes/TestProject3.scala
diff --git a/src/test/resources/sbt-test-resources/tests/extend/changes/TestSuccess.scala b/src/sbt-test/tests/extend/changes/TestSuccess.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/changes/TestSuccess.scala
rename to src/sbt-test/tests/extend/changes/TestSuccess.scala
diff --git a/src/test/resources/sbt-test-resources/tests/extend/project/build.properties b/src/sbt-test/tests/extend/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/project/build.properties
rename to src/sbt-test/tests/extend/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/tests/extend/project/build/src/TestProject.scala b/src/sbt-test/tests/extend/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/project/build/src/TestProject.scala
rename to src/sbt-test/tests/extend/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/tests/extend/test b/src/sbt-test/tests/extend/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/extend/test
rename to src/sbt-test/tests/extend/test
diff --git a/src/test/resources/sbt-test-resources/tests/resources/ivy.xml b/src/sbt-test/tests/resources/ivy.xml
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/resources/ivy.xml
rename to src/sbt-test/tests/resources/ivy.xml
diff --git a/src/test/resources/sbt-test-resources/tests/resources/project/build.properties b/src/sbt-test/tests/resources/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/resources/project/build.properties
rename to src/sbt-test/tests/resources/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/tests/resources/src/main/resources/MainResource.txt b/src/sbt-test/tests/resources/src/main/resources/MainResource.txt
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/resources/src/main/resources/MainResource.txt
rename to src/sbt-test/tests/resources/src/main/resources/MainResource.txt
diff --git a/src/test/resources/sbt-test-resources/tests/resources/src/test/resources/TestResource.txt b/src/sbt-test/tests/resources/src/test/resources/TestResource.txt
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/resources/src/test/resources/TestResource.txt
rename to src/sbt-test/tests/resources/src/test/resources/TestResource.txt
diff --git a/src/test/resources/sbt-test-resources/tests/resources/src/test/scala/BasicTest.scala b/src/sbt-test/tests/resources/src/test/scala/BasicTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/resources/src/test/scala/BasicTest.scala
rename to src/sbt-test/tests/resources/src/test/scala/BasicTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/resources/test b/src/sbt-test/tests/resources/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/resources/test
rename to src/sbt-test/tests/resources/test
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/BasicTest.scala b/src/sbt-test/tests/scalacheck-a/changes/BasicTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/BasicTest.scala
rename to src/sbt-test/tests/scalacheck-a/changes/BasicTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/FailedTest.scala b/src/sbt-test/tests/scalacheck-a/changes/FailedTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalacheck-a/changes/FailedTest.scala
rename to src/sbt-test/tests/scalacheck-a/changes/FailedTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build.properties b/src/sbt-test/tests/scalacheck-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build.properties
rename to src/sbt-test/tests/scalacheck-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build/src/TestProject.scala b/src/sbt-test/tests/scalacheck-a/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalacheck-a/project/build/src/TestProject.scala
rename to src/sbt-test/tests/scalacheck-a/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/src/test/scala/DummyTest.scala b/src/sbt-test/tests/scalacheck-a/src/test/scala/DummyTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalacheck-a/src/test/scala/DummyTest.scala
rename to src/sbt-test/tests/scalacheck-a/src/test/scala/DummyTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/scalacheck-a/test b/src/sbt-test/tests/scalacheck-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalacheck-a/test
rename to src/sbt-test/tests/scalacheck-a/test
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build.properties b/src/sbt-test/tests/scalatest-ignore/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build.properties
rename to src/sbt-test/tests/scalatest-ignore/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build/Test.scala b/src/sbt-test/tests/scalatest-ignore/project/build/Test.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalatest-ignore/project/build/Test.scala
rename to src/sbt-test/tests/scalatest-ignore/project/build/Test.scala
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala b/src/sbt-test/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
rename to src/sbt-test/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/scalatest-ignore/test b/src/sbt-test/tests/scalatest-ignore/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/scalatest-ignore/test
rename to src/sbt-test/tests/scalatest-ignore/test
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/changes/BasicTest.scala b/src/sbt-test/tests/specs-a/changes/BasicTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-a/changes/BasicTest.scala
rename to src/sbt-test/tests/specs-a/changes/BasicTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/changes/FailTest.scala b/src/sbt-test/tests/specs-a/changes/FailTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-a/changes/FailTest.scala
rename to src/sbt-test/tests/specs-a/changes/FailTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/project/build.properties b/src/sbt-test/tests/specs-a/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-a/project/build.properties
rename to src/sbt-test/tests/specs-a/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/project/build/src/TestProject.scala b/src/sbt-test/tests/specs-a/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-a/project/build/src/TestProject.scala
rename to src/sbt-test/tests/specs-a/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/src/test/scala/DummyTest.scala b/src/sbt-test/tests/specs-a/src/test/scala/DummyTest.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-a/src/test/scala/DummyTest.scala
rename to src/sbt-test/tests/specs-a/src/test/scala/DummyTest.scala
diff --git a/src/test/resources/sbt-test-resources/tests/specs-a/test b/src/sbt-test/tests/specs-a/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-a/test
rename to src/sbt-test/tests/specs-a/test
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/project/build.properties b/src/sbt-test/tests/specs-nested/project/build.properties
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-nested/project/build.properties
rename to src/sbt-test/tests/specs-nested/project/build.properties
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/project/build/src/TestProject.scala b/src/sbt-test/tests/specs-nested/project/build/src/TestProject.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-nested/project/build/src/TestProject.scala
rename to src/sbt-test/tests/specs-nested/project/build/src/TestProject.scala
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/src/test/scala/TestSpecification.scala b/src/sbt-test/tests/specs-nested/src/test/scala/TestSpecification.scala
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-nested/src/test/scala/TestSpecification.scala
rename to src/sbt-test/tests/specs-nested/src/test/scala/TestSpecification.scala
diff --git a/src/test/resources/sbt-test-resources/tests/specs-nested/test b/src/sbt-test/tests/specs-nested/test
similarity index 100%
rename from src/test/resources/sbt-test-resources/tests/specs-nested/test
rename to src/sbt-test/tests/specs-nested/test

From 7008061c6458b12d559e029c4daac56681777dab Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 7 Jul 2009 01:14:08 +0000
Subject: [PATCH 016/268] Updated installer build for 0.5.1

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@849 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 install/project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/project/build.properties b/install/project/build.properties
index 7dbce4c87..63434d2ee 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -2,6 +2,6 @@
 #Thu Jun 25 14:31:30 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=extract
-sbt.version=0.5
+sbt.version=0.5.1
 project.version=0.1
 scala.version=2.7.5

From 40bf046677952a4ee450f86d2d64f8b7737517c5 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 7 Jul 2009 01:16:18 +0000
Subject: [PATCH 017/268]  * Disable parallel execution until scripted tests
 support it  * Remove scripted tests, since it was moved into a plugin  *
 ignore test currently fails (scripted test plugin problem)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@850 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties                      |   6 +-
 .../build/{src => }/CrossCompileProject.scala |   0
 project/build/{src => }/LoaderProject.scala   |   0
 project/build/{src => }/SbtProject.scala      |  39 +--
 project/build/src/ScriptedLoader.scala        |  31 --
 project/build/src/ScriptedTests.scala         |  70 -----
 project/build/src/TestScriptParser.scala      | 269 ------------------
 project/plugins/Plugins.scala                 |   6 +
 8 files changed, 12 insertions(+), 409 deletions(-)
 rename project/build/{src => }/CrossCompileProject.scala (100%)
 rename project/build/{src => }/LoaderProject.scala (100%)
 rename project/build/{src => }/SbtProject.scala (50%)
 delete mode 100644 project/build/src/ScriptedLoader.scala
 delete mode 100644 project/build/src/ScriptedTests.scala
 delete mode 100644 project/build/src/TestScriptParser.scala
 create mode 100644 project/plugins/Plugins.scala

diff --git a/project/build.properties b/project/build.properties
index bdfab649a..88b6596f0 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Thu Jun 25 20:59:30 EDT 2009
+#Sat Jul 04 12:43:34 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.5
-project.version=0.5.2-SNAPSHOT
+sbt.version=0.5.1
+project.version=0.5.2-p1
 scala.version=2.7.2
diff --git a/project/build/src/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
similarity index 100%
rename from project/build/src/CrossCompileProject.scala
rename to project/build/CrossCompileProject.scala
diff --git a/project/build/src/LoaderProject.scala b/project/build/LoaderProject.scala
similarity index 100%
rename from project/build/src/LoaderProject.scala
rename to project/build/LoaderProject.scala
diff --git a/project/build/src/SbtProject.scala b/project/build/SbtProject.scala
similarity index 50%
rename from project/build/src/SbtProject.scala
rename to project/build/SbtProject.scala
index ac06702b3..3c2df1980 100644
--- a/project/build/src/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -18,13 +18,13 @@ class SbtProject(info: ProjectInfo) extends ParentProject(info)
 	override def shouldCheckOutputDirectories = false
 	override def baseUpdateOptions = QuietUpdate :: Nil
 	
-	override def parallelExecution = true
+	//override def parallelExecution = true
 	override def deliverLocalAction = noAction
 	private def noAction = task { None }
 	override def publishLocalAction = noAction
 }
 
-protected class MainProject(val info: ProjectInfo) extends CrossCompileProject
+protected class MainProject(val info: ProjectInfo) extends CrossCompileProject with test.ScalaScripted
 {
 	override def mainSources =
 		if(ScalaVersion.currentString.startsWith("2.8")) // cannot compile against test libraries currently
@@ -37,38 +37,5 @@ protected class MainProject(val info: ProjectInfo) extends CrossCompileProject
 	override def mainResources = super.mainResources +++ extraResources
 	override def mainClass = Some("sbt.Main")
 	override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: "sbt.ProcessSpecification" :: Nil) :: super.testOptions.toList
-	
-	// ======== Scripted testing ==========
-	
-	def sbtTestResources = testResourcesPath / "sbt-test-resources"
-	
-	lazy val testNoScripted = super.testAction
-	override def testAction = testNoScripted dependsOn(scripted)
-	lazy val scripted = scriptedTask dependsOn(testCompile, `package`)
-	def scriptedTask =
-		task
-		{
-			log.info("Running scripted tests...")
-			log.info("")
-			// load ScriptedTests using a ClassLoader that loads from the project classpath so that the version
-			// of sbt being built is tested, not the one doing the building.
-			val loader = ScriptedLoader(scriptedClasspath.toArray)
-			val scriptedClass = Class.forName(ScriptedClassName, true, loader)
-			val scriptedConstructor = scriptedClass.getConstructor(classOf[File], classOf[Function2[String, String, Boolean]])
-			val runner = scriptedConstructor.newInstance(sbtTestResources.asFile, filter)
-			runner.asInstanceOf[{def scriptedTests(log: Logger): Option[String]}].scriptedTests(log)
-		}
-	/** The classpath to use for scripted tests.   This ensures that the version of sbt being built it the one used for testing.*/
-	private def scriptedClasspath =
-	{
-		val buildClasspath = classOf[SbtProject]. getProtectionDomain.getCodeSource.getLocation.toURI.toURL
-		val scalacJar = FileUtilities.scalaCompilerJar.toURI.toURL
-		val ivy = runClasspath.get.filter(_.asFile.getName.startsWith("ivy-")).map(_.asURL).toList
-		val builtSbtJar = (outputPath / defaultJarName).asURL
-		builtSbtJar :: buildClasspath :: scalacJar :: ivy
-	}
-		
-	val ScriptedClassName = "scripted.ScriptedTests"
-	
-	val filter = (group: String, name: String) => true
+	override def scriptedDependencies = testCompile :: `package` :: Nil
 }
\ No newline at end of file
diff --git a/project/build/src/ScriptedLoader.scala b/project/build/src/ScriptedLoader.scala
deleted file mode 100644
index cf73edb6c..000000000
--- a/project/build/src/ScriptedLoader.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009  Mark Harrah
- */
-import sbt._
-
-import java.net.URL
-
-package sbt { // need access to LoaderBase, which is private in package sbt
-	object ScriptedLoader
-	{
-		def apply(paths: Array[URL]): ClassLoader = new ScriptedLoader(paths)
-	}
-	private class ScriptedLoader(paths: Array[URL]) extends LoaderBase(paths, classOf[ScriptedLoader].getClassLoader)
-	{
-		private val delegateFor = List("sbt.Logger", "sbt.LogEvent", "sbt.SetLevel", "sbt.Success", "sbt.Log", "sbt.SetTrace", "sbt.Trace", "sbt.ControlEvent")
-		def doLoadClass(className: String): Class[_] =
-		{
-			// Logger needs to be loaded from the version of sbt building the project because we need to pass
-			// a Logger from that loader into ScriptedTests.
-			// All other sbt classes should be loaded from the project classpath so that we test those classes with 'scripted'
-			if(!shouldDelegate(className) && (className.startsWith("sbt.") || className.startsWith("scripted.") || className.startsWith("scala.tools.")))
-				findClass(className)
-			else
-				selfLoadClass(className)
-		}
-	
-		private def shouldDelegate(className: String) = delegateFor.exists(check => isNestedOrSelf(className, check))
-		private def isNestedOrSelf(className: String, checkAgainst: String) =
-			className == checkAgainst || className.startsWith(checkAgainst + "$")
-		}
-}
\ No newline at end of file
diff --git a/project/build/src/ScriptedTests.scala b/project/build/src/ScriptedTests.scala
deleted file mode 100644
index 3d4650990..000000000
--- a/project/build/src/ScriptedTests.scala
+++ /dev/null
@@ -1,70 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
- */
-
-package scripted
-
-import sbt._
-import java.io.File
-
-trait ScriptedTestFilter extends NotNull
-{
-	def accept(group: String, name: String): Boolean
-}
-class BasicFilter(f: (String, String) => Boolean) extends ScriptedTestFilter
-{
-	def accept(group: String, name: String) = f(group, name)
-}
-
-object AcceptAllFilter extends ScriptedTestFilter
-{
-	def accept(group: String, name: String): Boolean = true
-}
-class ScriptedTests(testResources: Resources, filter: ScriptedTestFilter) extends NotNull
-{
-	def this(resourceBaseDirectory: File, filter: (String, String) => Boolean) = this(new Resources(resourceBaseDirectory), new BasicFilter(filter))
-	def this(resourceBaseDirectory: File, filter: ScriptedTestFilter) = this(new Resources(resourceBaseDirectory), filter)
-	def this(testResources: Resources) = this(testResources, AcceptAllFilter)
-	def this(resourceBaseDirectory: File) = this(new Resources(resourceBaseDirectory))
-	
-	val ScriptFilename = "test"
-	import testResources._
-	
-	private def includeDirectory(file: File) = file.getName != ".svn"
-	def scriptedTests(log: Logger): Option[String] =
-	{
-		System.setProperty("sbt.scala.version", "")
-		var success = true
-		for(group <- baseDirectory.listFiles(DirectoryFilter) if includeDirectory(group))
-		{
-			log.info("Test group " + group.getName)
-			for(test <- group.listFiles(DirectoryFilter) if includeDirectory(test))
-			{
-				val testName = test.getName
-				if(!filter.accept(group.getName, testName))
-					log.warn(" Test " + testName + " skipped.")
-				else
-					scriptedTest(test, log) match
-					{
-						case Some(err) =>
-							log.error(" Test " + testName + " failed: " + err)
-							success = false
-						case None => log.info(" Test " + testName + " succeeded.")
-					}
-			}
-		}
-		if(success)
-			None
-		else
-			Some("One or more tests failed.")
-	}
-	
-	def scriptedTest(group: String, name: String, log: Logger): Option[String] =
-		readOnlyResourceDirectory(group, name).fold(err => Some(err), testDirectory => scriptedTest(testDirectory, log))
-	def scriptedTest(testDirectory: File, log: Logger): Option[String] =
-	{
-		(for(script <- (new TestScriptParser(testDirectory, log)).parse(new File(testDirectory, ScriptFilename)).right;
-			u <- withProject(testDirectory, log)(script).right )
-		yield u).left.toOption
-	}
-}
diff --git a/project/build/src/TestScriptParser.scala b/project/build/src/TestScriptParser.scala
deleted file mode 100644
index bab2fc1fc..000000000
--- a/project/build/src/TestScriptParser.scala
+++ /dev/null
@@ -1,269 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
- */
-
-package scripted
-
-import sbt._
-import java.io.{BufferedReader, File, InputStreamReader}
-
-/*
-statement*
-statement ::= ('$' | '>') word+ '[' word ']'
-word ::= [^ \[\]]+
-comment ::= '#' [^ \n\r]* ('\n' | '\r' | eof)
-*/
-import scala.util.parsing.combinator._
-import scala.util.parsing.input.Positional
-
-import TestScriptParser._
-private class TestScriptParser(baseDirectory: File, log: Logger) extends RegexParsers with NotNull
-{
-	type Statement = Project => Either[String, ReloadProject]
-	type PStatement = Statement with Positional
-	
-	private def evaluateList(list: List[PStatement])(p: Project): WithProjectResult[Unit] =
-		list match
-		{
-			case Nil => ValueResult(())
-			case head :: tail =>
-				head(p) match
-				{
-					case Left(msg) => new ErrorResult(msg)
-					case Right(reload) => ContinueResult(p =>evaluateList(tail)(p), reload)
-				}
-		}
-
-	def script: Parser[Project => WithProjectResult[Unit]] = rep1(space ~> statement  <~ space) ^^ evaluateList
-	def statement: Parser[PStatement] =
-		positioned
-		{
-			(StartRegex ~! rep1(word) ~! "[" ~! word ~! "]") ^^
-			{
-				case start ~ command ~ open ~ result ~ close =>
-					val successExpected = result.toLowerCase == SuccessLiteral.toLowerCase
-					new Statement with Positional
-					{ selfPositional =>
-						def apply(p: Project) =
-						{
-							val result =
-								try
-								{
-									start match
-									{
-										case CommandStart => evaluateCommand(command, successExpected, selfPositional)(p)
-										case ActionStart => evaluateAction(command, successExpected)(p).toLeft(NoReload)
-									}
-								}
-								catch
-								{
-									case e: Exception =>
-										log.trace(e)
-										Left(e.toString)
-								}
-							result.left.map(message => linePrefix(this) + message)
-						}
-					}
-			}
-		}
-	private def linePrefix(p: Positional) = "{line " + p.pos.line + "} "
-	def space = """(\s+|(\#[^\n\r]*))*""".r
-	def word: Parser[String] =  ("\'" ~> "[^'\n\r]*".r <~ "\'")  |  ("\"" ~> "[^\"\n\r]*".r <~ "\"")  |  WordRegex
-	def parse(scriptFile: File): Either[String, Project => WithProjectResult[Unit]] =
-	{
-		def parseReader(reader: java.io.Reader) =
-			parseAll(script, reader) match
-			{
-				case Success(result, next) => Right(result)
-				case err: NoSuccess =>
-				{
-					val pos = err.next.pos
-					Left("Could not parse test script '" + scriptFile.getCanonicalPath + 
-					"' (" + pos.line + "," + pos.column + "): " + err.msg)
-				}
-			}
-		FileUtilities.readValue(scriptFile, log)(parseReader)
-	}
-	
-	private def scriptError(message: String): Some[String] = Some("Test script error: " + message)
-	private def wrongArguments(commandName: String, args: List[String]): Some[String] =
-		scriptError("Command '" + commandName + "' does not accept arguments (found '" + spacedString(args) + "').")
-	private def wrongArguments(commandName: String, requiredArgs: String, args: List[String]): Some[String] = 
-		scriptError("Wrong number of arguments to " + commandName + " command.  " + requiredArgs + " required, found: '" + spacedString(args) + "'.")
-	private def evaluateCommand(command: List[String], successExpected: Boolean, position: Positional)(project: Project): Either[String, ReloadProject] =
-	{
-		command match
-		{
-			case "reload" :: Nil => Right(if(successExpected) new ReloadSuccessExpected(linePrefix(position)) else ReloadErrorExpected)
-			case x => evaluateCommandNoReload(x, successExpected)(project).toLeft(NoReload)
-		}
-	}
-	private def evaluateCommandNoReload(command: List[String], successExpected: Boolean)(project: Project): Option[String] =
-	{
-		evaluate(successExpected, "Command '" + command.firstOption.getOrElse("") + "'", project)
-		{
-			command match
-			{
-				case Nil => scriptError("No command specified.")
-				case "touch" :: paths => touch(paths, project)
-				case "delete" :: paths => delete(paths, project)
-				case "mkdir" :: paths => makeDirectories(paths, project)
-				case "copy-file" :: from :: to :: Nil => copyFile(from, to, project)
-				case "copy-file" :: args => wrongArguments("copy-file", "Two paths", args)
-				case "sync" :: from :: to :: Nil => sync(from, to, project)
-				case "sync" :: args => wrongArguments("sync", "Two directory paths", args)
-				case "copy" :: paths => copy(paths, project)
-				case "exists" :: paths => exists(paths, project)
-				case "absent" :: paths => absent(paths, project)
-				case "pause" :: Nil => readLine("Press enter to continue. "); println(); None
-				case "pause" :: args => wrongArguments("pause", args)
-				case "newer" :: a :: b :: Nil => newer(a, b, project)
-				case "newer" :: args => wrongArguments("newer", "Two paths", args)
-				case "sleep" :: time :: Nil => trap("Error while sleeping:") { Thread.sleep(time.toLong) }
-				case "sleep" :: args => wrongArguments("sleep", "Time in milliseconds", args)
-				case "exec" :: command :: args => execute(command, args, project)
-				case "exec" :: other => wrongArguments("exec", "Command and arguments", other)
-				case "reload" :: args => wrongArguments("reload", args)
-				case unknown :: arguments => scriptError("Unknown command " + unknown)
-			}
-		}
-	}
-	private def foreachBufferedLogger(project: Project)(f: BufferedLogger => Unit)
-	{
-		project.topologicalSort.foreach(p => p.log match { case buffered: BufferedLogger => f(buffered); case _ => () })
-	}
-	private def evaluate(successExpected: Boolean, label: String, project: Project)(body: => Option[String]): Option[String] =
-	{
-		def startRecordingLog() { foreachBufferedLogger(project)(_.startRecording()) }
-		def playLog() { foreachBufferedLogger(project)(_.playAll()) }
-		def stopLog() { foreachBufferedLogger(project)(_.stop()) }
-		
-		startRecordingLog()
-		val result =
-			body match
-			{
-				case None =>
-					if(successExpected) None
-					else
-					{
-						playLog()
-						Some(label + " succeeded (expected failure).")
-					}
-				case Some(failure) =>
-					if(successExpected)
-					{
-						playLog()
-						Some(label + " failed (expected success): " + failure)
-					}
-					else None
-			}
-		stopLog()
-		result
-	}
-	private def evaluateAction(action: List[String], successExpected: Boolean)(project: Project): Option[String] =
-	{
-		def actionToString = action.mkString(" ")
-		action match
-		{
-			case Nil => scriptError("No action specified.")
-			case head :: Nil if project.taskNames.toSeq.contains(head)=>
-					evaluate(successExpected, "Action '" + actionToString + "'", project)(project.act(head))
-			case head :: tail =>
-				evaluate(successExpected, "Method '" + actionToString + "'", project)(project.call(head, tail.toArray))
-		}
-	}
-	private def spacedString[T](l: Seq[T]) = l.mkString(" ")
-	private def wrap(result: Option[String]) = result.flatMap(scriptError)
-	private def trap(errorPrefix: String)(action: => Unit) = wrap( Control.trapUnit(errorPrefix, log) { action; None } )
-	
-	private def fromStrings(paths: List[String], project: Project) = paths.map(path => fromString(path, project))
-	private def fromString(path: String, project: Project) = Path.fromString(project.info.projectPath, path)
-	private def touch(paths: List[String], project: Project) =
-		if(paths.isEmpty)
-			scriptError("No paths specified for touch command.")
-		else
-			wrap(lazyFold(paths) { path => FileUtilities.touch(fromString(path, project), log) })
-		
-	private def delete(paths: List[String], project: Project) =
-		if(paths.isEmpty)
-			scriptError("No paths specified for delete command.")
-		else
-			wrap(FileUtilities.clean(fromStrings(paths, project), true, log))
-	private def sync(from: String, to: String, project: Project) =
-		wrap(FileUtilities.sync(fromString(from, project), fromString(to, project), log))
-	private def copyFile(from: String, to: String, project: Project) =
-		wrap(FileUtilities.copyFile(fromString(from, project), fromString(to, project), log))
-	private def copy(paths: List[String], project: Project) =
-		paths match
-		{
-			case Nil => scriptError("No paths specified for copy command.")
-			case path :: Nil => scriptError("No destination specified for copy command.")
-			case _ =>
-				val mapped = fromStrings(paths, project).toArray
-				val last = mapped.length - 1
-				wrap(FileUtilities.copy(mapped.take(last), mapped(last), log).left.toOption)
-		}
-	private def makeDirectories(paths: List[String], project: Project) =
-		fromStrings(paths, project) match
-		{
-			case Nil => scriptError("No paths specified for mkdir command.")
-			case p => FileUtilities.createDirectories(p, project.log)
-		}
-	private def newer(a: String, b: String, project: Project) =
-		trap("Error testing if '" + a + "' is newer than '" + b + "'")
-		{
-			val pathA = fromString(a, project)
-			val pathB = fromString(b, project)
-			pathA.exists && (!pathB.exists || pathA.lastModified > pathB.lastModified)
-		}
-	private def exists(paths: List[String], project: Project) =
-		fromStrings(paths, project).filter(!_.exists) match
-		{
-			case Nil => None
-			case x => Some("File(s) did not exist: " + x.mkString("[ ", " , ", " ]"))
-		}
-	private def absent(paths: List[String], project: Project) =
-		fromStrings(paths, project).filter(_.exists) match
-		{
-			case Nil => None
-			case x => Some("File(s) existed: " + x.mkString("[ ", " , ", " ]"))
-		}
-	private def execute(command: String, args: List[String], project: Project) =
-	{
-		if(command.trim.isEmpty)
-			Some("Command was empty.")
-		else
-		{
-			Control.trapUnit("Error running command: ", project.log)
-			{
-				val builder = new java.lang.ProcessBuilder((command :: args).toArray :  _*).directory(project.info.projectDirectory)
-				val exitValue = Process(builder) ! log
-				if(exitValue == 0)
-					None
-				else
-					Some("Nonzero exit value (" + exitValue + ")")
-			}
-		}
-	}
-}
-private object TestScriptParser
-{
-	val SuccessLiteral = "success"
-	val Failure = "error"
-	val CommandStart = "$"
-	val ActionStart = ">"
-	val WordRegex = """[^ \[\]\s'\"][^ \[\]\s]*""".r
-	val StartRegex = ("[" + CommandStart + ActionStart + "]").r
-	
-	final def lazyFold[T](list: List[T])(f: T => Option[String]): Option[String] =
-		list match
-		{
-			case Nil => None
-			case head :: tail =>
-				f(head) match
-				{
-					case None => lazyFold(tail)(f)
-					case x => x
-				}
-		}
-}
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
new file mode 100644
index 000000000..655940b99
--- /dev/null
+++ b/project/plugins/Plugins.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class Plugins(info: ProjectInfo) extends PluginDefinition(info)
+{
+	val scripted = "org.scala-tools.sbt" % "test" % "0.5.1"
+}
\ No newline at end of file

From 8090c635196034f72ba63b4589e644cadcc344be Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 7 Jul 2009 03:18:14 +0000
Subject: [PATCH 018/268] Added publishTo scala-tools

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@852 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 scripted/project/build/SbtTest.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripted/project/build/SbtTest.scala b/scripted/project/build/SbtTest.scala
index 89fd5a110..bfc295cb5 100644
--- a/scripted/project/build/SbtTest.scala
+++ b/scripted/project/build/SbtTest.scala
@@ -4,4 +4,8 @@
 
 import sbt._
 
-class SbtTest(info: ProjectInfo) extends PluginProject(info)
\ No newline at end of file
+class SbtTest(info: ProjectInfo) extends PluginProject(info)
+{
+	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
+	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
+}
\ No newline at end of file

From c350ab6b3cb5ede6ae69398d0c2feb2ec2b4681c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 7 Jul 2009 23:54:12 +0000
Subject: [PATCH 019/268]  * Worked around Java issue converting URL to File  *
 Processes can now redirect standard input (see run with Boolean argument or
 !< operator on ProcessBuilder), off by default  * Terminal echo reenabled
 when JLine is not reading in a line  * Properly detect unsupported terminals
 using JLine's Terminal.isANSISupported method

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@853 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ClasspathUtilities.scala   |  2 +-
 src/main/scala/sbt/DefaultProject.scala       | 10 ++--
 src/main/scala/sbt/FileUtilities.scala        |  8 ++-
 src/main/scala/sbt/LineReader.scala           | 32 +++++++++---
 src/main/scala/sbt/Logger.scala               |  9 ++--
 src/main/scala/sbt/ManageDependencies.scala   | 17 ++++---
 src/main/scala/sbt/Process.scala              | 13 +++++
 src/main/scala/sbt/Project.scala              |  2 +-
 src/main/scala/sbt/Resources.scala            |  2 +-
 src/main/scala/sbt/Run.scala                  | 12 +++--
 src/main/scala/sbt/ScalaProject.scala         |  2 +-
 src/main/scala/sbt/impl/ProcessImpl.scala     | 50 +++++++++++++------
 .../run-test/src/main/scala/Foo.scala         |  4 +-
 src/test/scala/sbt/ProcessSpecification.scala |  2 +-
 14 files changed, 114 insertions(+), 51 deletions(-)

diff --git a/src/main/scala/sbt/ClasspathUtilities.scala b/src/main/scala/sbt/ClasspathUtilities.scala
index ed2ff8d5d..878798002 100644
--- a/src/main/scala/sbt/ClasspathUtilities.scala
+++ b/src/main/scala/sbt/ClasspathUtilities.scala
@@ -52,7 +52,7 @@ private[sbt] object ClasspathUtilities
 		{
 			url.getProtocol match
 			{
-				case "file" => new File(url.toURI) :: Nil
+				case "file" => FileUtilities.toFile(url) :: Nil
 				case "jar" =>
 					val path = url.getPath
 					val end = path.indexOf('!')
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index fefe966e1..7552a1fa1 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -300,8 +300,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	override def deliverScalaDependencies: Iterable[ModuleID] =
 	{
 		val snapshot = mainDependencies.snapshot
-		mapScalaModule(snapshot.scalaLibrary, ManageDependencies.ScalaLibraryID) ++
-		mapScalaModule(snapshot.scalaCompiler, ManageDependencies.ScalaCompilerID)
+		mapScalaModule(snapshot.scalaLibrary, ScalaArtifacts.LibraryID) ++
+		mapScalaModule(snapshot.scalaCompiler, ScalaArtifacts.CompilerID)
 	}
 	override def watchPaths = mainSources +++ testSources +++ mainResources +++ testResources
 }
@@ -413,7 +413,7 @@ object BasicScalaProject
 	private def mapScalaModule(in: Iterable[_], id: String) =
 	{
 		ScalaVersion.current.toList.flatMap { scalaVersion => 
-			in.map(jar => ModuleID(ManageDependencies.ScalaOrganization, id, scalaVersion))
+			in.map(jar => ModuleID(ScalaArtifacts.Organization, id, scalaVersion))
 		}
 	}
 }
@@ -467,8 +467,8 @@ final class LibraryDependencies(project: Project, conditional: CompileConditiona
 }
 private object LibraryDependencies
 {
-	private def ScalaLibraryPrefix = ManageDependencies.ScalaLibraryID
-	private def ScalaCompilerPrefix = ManageDependencies.ScalaCompilerID
+	private def ScalaLibraryPrefix = ScalaArtifacts.LibraryID
+	private def ScalaCompilerPrefix = ScalaArtifacts.CompilerID
 	private def ScalaJarPrefixes = List(ScalaCompilerPrefix, ScalaLibraryPrefix)
 	private def isScalaJar(file: File) = ClasspathUtilities.isArchive(file) &&  ScalaJarPrefixes.exists(isNamed(file))
 	private def isScalaLibraryJar(file: File) = isNamed(file)(ScalaLibraryPrefix)
diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index a13cefad5..69c70bb99 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -7,7 +7,7 @@ import java.io.{Closeable, File, FileInputStream, FileOutputStream, InputStream,
 import java.io.{ByteArrayOutputStream, InputStreamReader, OutputStreamWriter}
 import java.io.{BufferedReader, BufferedWriter, FileReader, FileWriter, Reader, Writer}
 import java.util.zip.{GZIPInputStream, GZIPOutputStream}
-import java.net.URL
+import java.net.{URL, URISyntaxException}
 import java.nio.charset.{Charset, CharsetDecoder, CharsetEncoder}
 import java.nio.channels.FileChannel
 import java.util.jar.{Attributes, JarEntry, JarFile, JarInputStream, JarOutputStream, Manifest}
@@ -787,11 +787,15 @@ object FileUtilities
 		writer.write(line)
 		writer.write(Newline)
 	}
+
+	def toFile(url: URL) =
+		try { new File(url.toURI) }
+		catch { case _: URISyntaxException => new File(url.getPath) }
 	
 	/** The directory in which temporary files are placed.*/
 	val temporaryDirectory = new File(System.getProperty("java.io.tmpdir"))
 	def classLocation(cl: Class[_]): URL = cl.getProtectionDomain.getCodeSource.getLocation
-	def classLocationFile(cl: Class[_]): File = new File(classLocation(cl).toURI)
+	def classLocationFile(cl: Class[_]): File = toFile(classLocation(cl))
 	def classLocation[T](implicit mf: scala.reflect.Manifest[T]): URL = classLocation(mf.erasure)
 	def classLocationFile[T](implicit mf: scala.reflect.Manifest[T]): File = classLocationFile(mf.erasure)
 	
diff --git a/src/main/scala/sbt/LineReader.scala b/src/main/scala/sbt/LineReader.scala
index 1332f6aac..614fd117e 100644
--- a/src/main/scala/sbt/LineReader.scala
+++ b/src/main/scala/sbt/LineReader.scala
@@ -14,21 +14,39 @@ import jline.ConsoleReader
 abstract class JLine extends LineReader
 {
 	protected[this] val reader: ConsoleReader
-	def readLine(prompt: String) =
+	def readLine(prompt: String) = JLine.withJLine { unsynchronizedReadLine(prompt) }
+	private[this] def unsynchronizedReadLine(prompt: String) =
 		reader.readLine(prompt) match
 		{
 			case null => None
 			case x => Some(x.trim)
 		}
 }
+private object JLine
+{
+	def terminal = jline.Terminal.getTerminal
+	def createReader() =
+		terminal.synchronized
+		{
+			val cr = new ConsoleReader
+			terminal.enableEcho()
+			cr.setBellEnabled(false)
+			cr
+		}
+	def withJLine[T](action: => T): T =
+	{
+		val t = terminal
+		t.synchronized
+		{
+			t.disableEcho()
+			try { action }
+			finally { t.enableEcho() }
+		}
+	}
+}
 object SimpleReader extends JLine
 {
-	protected[this] val reader =
-	{
-		val cr = new ConsoleReader
-		cr.setBellEnabled(false)
-		cr
-	}
+	protected[this] val reader = JLine.createReader()
 }
 class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger) extends JLine
 {
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index b637a4499..e319a04e9 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -248,13 +248,12 @@ final class BufferedLogger(delegate: Logger) extends Logger
 
 object ConsoleLogger
 {
-	private def os = System.getProperty("os.name")
-	private def isWindows = os.toLowerCase.indexOf("windows") >= 0
-	private def formatExplicitlyDisabled = java.lang.Boolean.getBoolean("sbt.log.noformat")
-	private val formatEnabled = !(formatExplicitlyDisabled || isWindows)
+	private[this] def formatExplicitlyDisabled = java.lang.Boolean.getBoolean("sbt.log.noformat")
+	private[this] def ansiSupported = jline.Terminal.getTerminal.isANSISupported
+	private val formatEnabled = ansiSupported && !formatExplicitlyDisabled
 }
 
-/** A logger that logs to the console.  On non-windows systems, the level labels are
+/** A logger that logs to the console.  On supported systems, the level labels are
 * colored. 
 *
 * This logger is not thread-safe.*/
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index ba761be89..c6f0f2461 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -37,14 +37,17 @@ final class IvyPaths(val projectDirectory: Path, val managedLibDirectory: Path,
 final class IvyFlags(val validate: Boolean, val addScalaTools: Boolean, val errorIfNoConfiguration: Boolean) extends NotNull
 final class IvyConfiguration(val paths: IvyPaths, val manager: Manager, val flags: IvyFlags, val ivyScala: Option[IvyScala], val log: Logger) extends NotNull
 final class UpdateConfiguration(val outputPattern: String, val synchronize: Boolean, val quiet: Boolean) extends NotNull
+object ScalaArtifacts
+{
+	val Organization = "org.scala-lang"
+	val LibraryID = "scala-library"
+	val CompilerID = "scala-compiler"
+}
 object ManageDependencies
 {
 	val DefaultIvyConfigFilename = "ivysettings.xml"
 	val DefaultIvyFilename = "ivy.xml"
 	val DefaultMavenFilename = "pom.xml"
-	val ScalaOrganization = "org.scala-lang"
-	val ScalaLibraryID = "scala-library"
-	val ScalaCompilerID = "scala-compiler"
 	
 	private def defaultIvyFile(project: Path) = project / DefaultIvyFilename
 	private def defaultIvyConfiguration(project: Path) = project / DefaultIvyConfigFilename
@@ -280,7 +283,7 @@ object ManageDependencies
 		Control.lazyFold(module.getDependencies.toList)
 		{ dep =>
 			val id = dep.getDependencyRevisionId
-			if(id.getOrganisation == ScalaOrganization && id.getRevision != scalaVersion && dep.getModuleConfigurations.exists(configSet.contains))
+			if(id.getOrganisation == ScalaArtifacts.Organization && id.getRevision != scalaVersion && dep.getModuleConfigurations.exists(configSet.contains))
 				Some("Different Scala version specified in dependency ("+ id.getRevision + ") than in project (" + scalaVersion + ").")
 			else
 				None
@@ -307,9 +310,9 @@ object ManageDependencies
 			}
 		}
 		def excludeScalaJar(name: String)
-			{ module.addExcludeRule(excludeRule(ScalaOrganization, name, configurationNames)) }
-		excludeScalaJar(ScalaLibraryID)
-		excludeScalaJar(ScalaCompilerID)
+			{ module.addExcludeRule(excludeRule(ScalaArtifacts.Organization, name, configurationNames)) }
+		excludeScalaJar(ScalaArtifacts.LibraryID)
+		excludeScalaJar(ScalaArtifacts.CompilerID)
 	}
 	private def configureCache(settings: IvySettings)
 	{
diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index 092eda35c..ac6e106b4 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -57,12 +57,25 @@ trait ProcessBuilder extends NotNull
 	/** Starts the process represented by this builder, blocks until it exits, and returns the exit code.  Standard output and error are
 	* sent to the given Logger.*/
 	def !(log: Logger): Int
+	/** Starts the process represented by this builder, blocks until it exits, and returns the exit code.  Standard output and error are
+	* sent to the console.  The newly started process reads from standard input of the current process if `connectInput` is true.*/
+	def !< : Int
+	/** Starts the process represented by this builder, blocks until it exits, and returns the exit code.  Standard output and error are
+	* sent to the given Logger.  The newly started process reads from standard input of the current process if `connectInput` is true.*/
+	def !<(log: Logger) : Int
 	/** Starts the process represented by this builder.  Standard output and error are sent to the console.*/
 	def run(): Process
 	/** Starts the process represented by this builder.  Standard output and error are sent to the given Logger.*/
 	def run(log: Logger): Process
 	/** Starts the process represented by this builder.  I/O is handled by the given ProcessIO instance.*/
 	def run(io: ProcessIO): Process
+	/** Starts the process represented by this builder.  Standard output and error are sent to the console.
+	* The newly started process reads from standard input of the current process if `connectInput` is true.*/
+	def run(connectInput: Boolean): Process
+	/** Starts the process represented by this builder, blocks until it exits, and returns the exit code.  Standard output and error are
+	* sent to the given Logger.
+	* The newly started process reads from standard input of the current process if `connectInput` is true.*/
+	def run(log: Logger, connectInput: Boolean): Process
 
 	/** Constructs a command that runs this command first and then `other` if this command succeeds.*/
 	def #&& (other: ProcessBuilder): ProcessBuilder
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 69fa9f5e1..ac4527d45 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -376,7 +376,7 @@ object Project
 		if(builderProjectPath.asFile.isDirectory)
 		{
 			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
-			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(new File(url.toURI))); case _ => Nil }
+			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(FileUtilities.toFile(url))); case _ => Nil }
 			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None), pluginProjectPath, additionalPaths, buildLog)
 			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
 				builderProject.projectDefinition.right.map {
diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
index b92cd5e73..01b319a89 100644
--- a/src/main/scala/sbt/Resources.scala
+++ b/src/main/scala/sbt/Resources.scala
@@ -16,7 +16,7 @@ object Resources
 			throw new Exception("Resource base directory '" + basePath + "' not on classpath.")
 		else
 		{
-			val file = new File(resource.toURI)
+			val file = toFile(resource)
 			if(file.exists)
 				new Resources(file)
 			else
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index f4dbb412e..5662e5d87 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -55,8 +55,10 @@ object Run extends ScalaRun
 				log.info("")
 				Control.trapUnit("Error during session: ", log)
 				{
-					val loop = new InterpreterLoop
-					executeTrapExit(loop.main(settings), log)
+					JLine.withJLine {
+						val loop = new InterpreterLoop
+						executeTrapExit(loop.main(settings), log)
+					}
 				}
 			}
 		}
@@ -128,8 +130,10 @@ object Run extends ScalaRun
 			log.info("")
 			Control.trapUnit("Error during session: ", log)
 			{
-				val loop = new ProjectInterpreterLoop(compilerSettings, project)
-				executeTrapExit(loop.main(interpreterSettings), log)
+				JLine.withJLine {
+					val loop = new ProjectInterpreterLoop(compilerSettings, project)
+					executeTrapExit(loop.main(interpreterSettings), log)
+				}
 			}
 		}}
 	}
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 7572c628c..c104b3c37 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -58,7 +58,7 @@ trait SimpleScalaProject extends Project
 		{
 			val command = buildCommand
 			log.debug("Executing command " + command)
-			val exitValue = command ! log
+			val exitValue = command.run(log).exitValue() // don't buffer output
 			if(exitValue == 0)
 				None
 			else
diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
index eb1707671..fc97a25d7 100644
--- a/src/main/scala/sbt/impl/ProcessImpl.scala
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -4,7 +4,7 @@
 package sbt
 
 import java.lang.{Process => JProcess, ProcessBuilder => JProcessBuilder}
-import java.io.{BufferedReader, Closeable, InputStream, InputStreamReader, IOException, OutputStream}
+import java.io.{BufferedReader, Closeable, InputStream, InputStreamReader, IOException, OutputStream, PrintStream}
 import java.io.{PipedInputStream, PipedOutputStream}
 import java.io.{File, FileInputStream, FileOutputStream}
 import java.net.URL
@@ -25,7 +25,7 @@ private object Spawn
 
 private object BasicIO
 {
-	def apply(log: Logger) = new ProcessIO(ignoreOut, processFully(log, Level.Info), processFully(log, Level.Error))
+	def apply(log: Logger, withIn: Boolean) = new ProcessIO(input(withIn), processFully(log, Level.Info), processFully(log, Level.Error))
 
 	def ignoreOut = (i: OutputStream) => ()
 	val BufferSize = 8192
@@ -34,9 +34,13 @@ private object BasicIO
 	def processFully(processLine: String => Unit)(i: InputStream)
 	{
 		val reader = new BufferedReader(new InputStreamReader(i))
+		processLinesFully(processLine)(reader.readLine)
+	}
+	def processLinesFully(processLine: String => Unit)(readLine: () => String)
+	{
 		def readFully()
 		{
-			val line = reader.readLine()
+			val line = readLine()
 			if(line != null)
 			{
 				processLine(line)
@@ -45,7 +49,16 @@ private object BasicIO
 		}
 		readFully()
 	}
-	def standard: ProcessIO = new ProcessIO(ignoreOut, processFully(System.out.println), processFully(System.err.println))
+	def connectToIn(o: OutputStream)
+	{
+		val printer = new PrintStream(o)
+		try { processFully {x => printer.println(x); printer.flush() }(System.in) }
+		catch { case  _: InterruptedException => () }
+		finally { printer.close() }
+	}
+	def input(connect: Boolean): OutputStream => Unit = if(connect) connectToIn else ignoreOut
+	def standard(connectInput: Boolean): ProcessIO = standard(input(connectInput))
+	def standard(in: OutputStream => Unit): ProcessIO = new ProcessIO(in, processFully(System.out.println), processFully(System.err.println))
 
 	def transferFully(in: InputStream, out: OutputStream)
 	{
@@ -81,15 +94,20 @@ private abstract class AbstractProcessBuilder extends ProcessBuilder
 	def #> (f: File): ProcessBuilder = new PipedProcessBuilder(this, new FileOutput(f, false), false)
 	def #>> (f: File): ProcessBuilder = new PipedProcessBuilder(this, new FileOutput(f, true), true)
 	
-	def run(): Process = run(BasicIO.standard)
-	def run(log: Logger): Process = run(BasicIO(log))
+	def run(): Process = run(false)
+	def run(connectInput: Boolean): Process = run(BasicIO.standard(connectInput))
+	def run(log: Logger): Process = run(log, false)
+	def run(log: Logger, connectInput: Boolean): Process = run(BasicIO(log, connectInput))
 	
-	def ! = run().exitValue()
-	def !(log: Logger) =
+	def ! = run(false).exitValue()
+	def !< = run(true).exitValue()
+	def !(log: Logger) = runBuffered(log, false)
+	def !<(log: Logger) = runBuffered(log, true)
+	private[this] def runBuffered(log: Logger, connectInput: Boolean) =
 	{
 		val log2 = new BufferedLogger(log)
 		log2.startRecording()
-		try { run(log2).exitValue() }
+		try { run(log2, connectInput).exitValue() }
 		finally { log2.playAll(); log2.clearAll() }
 	}
 	def !(io: ProcessIO) = run(io).exitValue()
@@ -320,19 +338,23 @@ private[sbt] class SimpleProcessBuilder(p: JProcessBuilder) extends AbstractProc
 				Spawn(processError(process.getErrorStream)) :: Nil
 			else
 				Nil
-		new SimpleProcess(process, inThread :: outThread :: errorThread)
+		new SimpleProcess(process, inThread, outThread :: errorThread)
 	}
 	override def toString = p.command.toString
 	override def canPipeTo = true
 }
-/** A thin wrapper around a java.lang.Process.  `ioThreads` are the Threads created to do I/O.
-* The implementation of `exitValue` waits until these threads die before returning. */
-private class SimpleProcess(p: JProcess, ioThreads: Iterable[Thread]) extends Process
+/** A thin wrapper around a java.lang.Process.  `outputThreads` are the Threads created to read from the
+* output and error streams of the process.  `inputThread` is the Thread created to write to the input stream of
+* the process.
+* The implementation of `exitValue` interrupts `inputThread` and then waits until all I/O threads die before
+* returning. */
+private class SimpleProcess(p: JProcess, inputThread: Thread, outputThreads: List[Thread]) extends Process
 {
 	override def exitValue() =
 	{
 		p.waitFor() // wait for the process to terminate
-		ioThreads.foreach(_.join()) // this ensures that all output is complete before returning (waitFor does not ensure this)
+		inputThread.interrupt() // we interrupt the input thread to notify it that it can terminate
+		(inputThread :: outputThreads).foreach(_.join()) // this ensures that all output is complete before returning (waitFor does not ensure this)
 		p.exitValue()
 	}
 	override def destroy() = p.destroy()
diff --git a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
index 871a9d9b7..4f0c03709 100644
--- a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
+++ b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
@@ -6,7 +6,7 @@ import scala.tools.nsc.{Interpreter, Settings}
 
 class Foo {
 	val settings = new Settings()
-	settings.classpath.value = new java.io.File(classOf[Holder].getProtectionDomain.getCodeSource.getLocation.toURI).getAbsolutePath
+	settings.classpath.value = FileUtilities.toFile(classOf[Holder].getProtectionDomain.getCodeSource.getLocation).getAbsolutePath
 	val inter = new Interpreter(settings)
 
 	def eval(code: String): Any = {
@@ -24,4 +24,4 @@ object Test
 		val foo = new Foo
 		foo.eval("3")
 	}
-}
\ No newline at end of file
+}
diff --git a/src/test/scala/sbt/ProcessSpecification.scala b/src/test/scala/sbt/ProcessSpecification.scala
index 61d530555..5dcbcf67a 100644
--- a/src/test/scala/sbt/ProcessSpecification.scala
+++ b/src/test/scala/sbt/ProcessSpecification.scala
@@ -86,6 +86,6 @@ object ProcessSpecification extends Properties("Process I/O")
 		"java -cp " + thisClasspath + " " + command
 	}
 	private def getSource[T](implicit mf: scala.reflect.Manifest[T]): String =
-		(new File(mf.erasure.getProtectionDomain.getCodeSource.getLocation.toURI)).getAbsolutePath
+		(FileUtilities.toFile(mf.erasure.getProtectionDomain.getCodeSource.getLocation)).getAbsolutePath
 }
 private trait SourceTag
\ No newline at end of file

From 5eb4bf2a22065c341575fd7e1c2a9d3d862abe45 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 8 Jul 2009 00:06:43 +0000
Subject: [PATCH 020/268] Update installer to connect standard input to forked
 sbt

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@854 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 install/extract/src/main/scala/Main.scala | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/install/extract/src/main/scala/Main.scala b/install/extract/src/main/scala/Main.scala
index e8c701767..dc3cd27cc 100644
--- a/install/extract/src/main/scala/Main.scala
+++ b/install/extract/src/main/scala/Main.scala
@@ -86,10 +86,7 @@ object Main
 	{
 		val command = "java" :: "-cp" :: loader.getAbsolutePath :: filterEmpty(install.options) ::: "sbt.boot.Boot" :: filterEmpty(install.actions)
 		val builder = new java.lang.ProcessBuilder(command.toArray : _*)
-		builder.directory(project)
-		//import BasicIO.{processFully, transferFully}
-		//val standardIO = new ProcessIO(transferFully(System.in, _, 0), processFully(System.out.println), processFully(System.err.println))
-		val exitCode = ( Process(builder) ! )//( Process(builder) run standardIO).exitValue()
+		val exitCode = (Process(builder) !<)
 		if(exitCode == 0)
 			None
 		else

From 339628826d63f206144f412eee35d32620589591 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 8 Jul 2009 00:47:45 +0000
Subject: [PATCH 021/268] Restoring change of working directory in installer
 plugin

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@855 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 install/extract/src/main/scala/Main.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/extract/src/main/scala/Main.scala b/install/extract/src/main/scala/Main.scala
index dc3cd27cc..02770c749 100644
--- a/install/extract/src/main/scala/Main.scala
+++ b/install/extract/src/main/scala/Main.scala
@@ -86,6 +86,7 @@ object Main
 	{
 		val command = "java" :: "-cp" :: loader.getAbsolutePath :: filterEmpty(install.options) ::: "sbt.boot.Boot" :: filterEmpty(install.actions)
 		val builder = new java.lang.ProcessBuilder(command.toArray : _*)
+		builder.directory(project)
 		val exitCode = (Process(builder) !<)
 		if(exitCode == 0)
 			None

From 4dfdf5d3565c0e5d9e146fae0565b91ee8752549 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 8 Jul 2009 02:52:20 +0000
Subject: [PATCH 022/268] Fix connecting process input to System.in

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@856 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/impl/ProcessImpl.scala | 35 +++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
index fc97a25d7..42e538a08 100644
--- a/src/main/scala/sbt/impl/ProcessImpl.scala
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -15,9 +15,11 @@ import scala.concurrent.SyncVar
 /** Runs provided code in a new Thread and returns the Thread instance. */
 private object Spawn
 {
-	def apply(f: => Unit): Thread =
+	def apply(f: => Unit): Thread = apply(f, false)
+	def apply(f: => Unit, daemon: Boolean): Thread =
 	{
 		val thread = new Thread() { override def run() = { f } }
+		thread.setDaemon(daemon)
 		thread.start()
 		thread
 	}
@@ -49,18 +51,16 @@ private object BasicIO
 		}
 		readFully()
 	}
-	def connectToIn(o: OutputStream)
-	{
-		val printer = new PrintStream(o)
-		try { processFully {x => printer.println(x); printer.flush() }(System.in) }
-		catch { case  _: InterruptedException => () }
-		finally { printer.close() }
-	}
+	def connectToIn(o: OutputStream) { transferFully(System.in, o) }
 	def input(connect: Boolean): OutputStream => Unit = if(connect) connectToIn else ignoreOut
 	def standard(connectInput: Boolean): ProcessIO = standard(input(connectInput))
-	def standard(in: OutputStream => Unit): ProcessIO = new ProcessIO(in, processFully(System.out.println), processFully(System.err.println))
+	def standard(in: OutputStream => Unit): ProcessIO = new ProcessIO(in, transferFully(_, System.out), transferFully(_, System.err))
 
-	def transferFully(in: InputStream, out: OutputStream)
+	def transferFully(in: InputStream, out: OutputStream): Unit =
+		try { transferFullyImpl(in, out) }
+		catch { case  _: InterruptedException => () }
+	
+	private[this] def transferFullyImpl(in: InputStream, out: OutputStream)
 	{
 		val continueCount = 1//if(in.isInstanceOf[PipedInputStream]) 1 else 0
 		val buffer = new Array[Byte](BufferSize)
@@ -70,6 +70,7 @@ private object BasicIO
 			if(byteCount >= continueCount)
 			{
 				out.write(buffer, 0, byteCount)
+				out.flush()
 				read
 			}
 		}
@@ -331,7 +332,7 @@ private[sbt] class SimpleProcessBuilder(p: JProcessBuilder) extends AbstractProc
 		val process = p.start() // start the external process
 		import io.{writeInput, processOutput, processError}
 		// spawn threads that process the input, output, and error streams using the functions defined in `io`
-		val inThread = Spawn(writeInput(process.getOutputStream))
+		val inThread = Spawn(writeInput(process.getOutputStream), true)
 		val outThread = Spawn(processOutput(process.getInputStream))
 		val errorThread =
 			if(!p.redirectErrorStream)
@@ -352,12 +353,16 @@ private class SimpleProcess(p: JProcess, inputThread: Thread, outputThreads: Lis
 {
 	override def exitValue() =
 	{
-		p.waitFor() // wait for the process to terminate
-		inputThread.interrupt() // we interrupt the input thread to notify it that it can terminate
-		(inputThread :: outputThreads).foreach(_.join()) // this ensures that all output is complete before returning (waitFor does not ensure this)
+		try { p.waitFor() }// wait for the process to terminate
+		finally { inputThread.interrupt() } // we interrupt the input thread to notify it that it can terminate
+		outputThreads.foreach(_.join()) // this ensures that all output is complete before returning (waitFor does not ensure this)
 		p.exitValue()
 	}
-	override def destroy() = p.destroy()
+	override def destroy() =
+	{
+		try { p.destroy() }
+		finally { inputThread.interrupt() }
+	}
 }
 
 private class FileOutput(file: File, append: Boolean) extends OutputStreamBuilder(new FileOutputStream(file, append), file.getAbsolutePath)

From 39573225d1520f1deb7839811d83bbd75702e6cd Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 8 Jul 2009 22:23:00 +0000
Subject: [PATCH 023/268] Fix Logger to work when jline is not available

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@858 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/FileUtilities.scala |  2 +-
 src/main/scala/sbt/Logger.scala        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index 69c70bb99..c63106b0a 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -640,7 +640,7 @@ object FileUtilities
 		if(charset.newEncoder.canEncode(content))
 			write(file, charset, append, log) { w =>  w.write(content); None }
 		else
-			Some("String cannot be encoded by default charset.")
+			Some("String cannot be encoded by charset " + charset.name)
 	}
 	
 	/** Opens a <code>Writer</code> on the given file using the default encoding,
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index e319a04e9..3ee042897 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -248,9 +248,15 @@ final class BufferedLogger(delegate: Logger) extends Logger
 
 object ConsoleLogger
 {
-	private[this] def formatExplicitlyDisabled = java.lang.Boolean.getBoolean("sbt.log.noformat")
-	private[this] def ansiSupported = jline.Terminal.getTerminal.isANSISupported
 	private val formatEnabled = ansiSupported && !formatExplicitlyDisabled
+	
+	private[this] def formatExplicitlyDisabled = java.lang.Boolean.getBoolean("sbt.log.noformat")
+	private[this] def ansiSupported =
+		try { jline.Terminal.getTerminal.isANSISupported }
+		catch { case e: Exception => !isWindows }
+	
+	private[this] def os = System.getProperty("os.name")
+	private[this] def isWindows = os.toLowerCase.indexOf("windows") >= 0
 }
 
 /** A logger that logs to the console.  On supported systems, the level labels are

From 6b2c36d0eff5b428b5b5659ffb84f8d7b874c2c6 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 11 Jul 2009 18:48:35 +0000
Subject: [PATCH 024/268]  * Fixed problem where a dependency on only static
 members of a Java class was not recorded  * Fixed problem where new
 dependencies on sources not included in the compilation were not added

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@859 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Analysis.scala         |  5 +++
 src/main/scala/sbt/AnalysisCallback.scala | 42 +++++++++++------------
 src/main/scala/sbt/Analyzer.scala         | 18 ++++++++--
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/main/scala/sbt/Analysis.scala b/src/main/scala/sbt/Analysis.scala
index 4498fd800..898249b26 100644
--- a/src/main/scala/sbt/Analysis.scala
+++ b/src/main/scala/sbt/Analysis.scala
@@ -95,6 +95,11 @@ sealed class BasicAnalysis(analysisPath: Path, projectPath: Path, log: Logger) e
 	
 	def addSourceDependency(on: Path, from: Path) = add(on, from, sourceDependencyMap)
 	def addExternalDependency(on: File, from: Path) = add(on.getAbsoluteFile, from, externalDependencyMap)
+	def addProductDependency(on: Path, from: Path) =
+	{
+		for( (source, _) <- productMap.find(_._2.contains(on)) )
+			addSourceDependency(source, from)
+	}
 	def addProduct(source: Path, file: Path) = add(source, file, productMap)
 	def addSource(source: Path) =
 	{
diff --git a/src/main/scala/sbt/AnalysisCallback.scala b/src/main/scala/sbt/AnalysisCallback.scala
index e20d9190b..3578c8942 100644
--- a/src/main/scala/sbt/AnalysisCallback.scala
+++ b/src/main/scala/sbt/AnalysisCallback.scala
@@ -45,6 +45,12 @@ trait AnalysisCallback extends NotNull
 	/** Called to indicate that the source file <code>sourcePath</code> depends on the class file
 	* <code>classFile</code>.*/
 	def classDependency(classFile: File, sourcePath: Path): Unit
+	/** Called to indicate that the source file <code>sourcePath</code> depends on the class file
+	* <code>classFile</code> that is a product of some source.  This differs from classDependency
+	* because it is really a sourceDependency.  The source corresponding to <code>classFile</code>
+	* was not incuded in the compilation so the plugin doesn't know what the source is though.  It
+	* only knows that the class file came from the output directory.*/
+	def productDependency(classFile: Path, sourcePath: Path): Unit
 	/** Called to indicate that the source file <code>sourcePath</code> produces a class file at
 	* <code>modulePath</code>.*/
 	def generatedClass(sourcePath: Path, modulePath: Path): Unit
@@ -58,36 +64,30 @@ abstract class BasicAnalysisCallback[A <: BasicCompileAnalysis](val basePath: Pa
 {
 	def superclassNotFound(superclassName: String) {}
 	
-	def beginSource(sourcePath: Path)
-	{
+	def beginSource(sourcePath: Path): Unit =
 		analysis.addSource(sourcePath)
-	}
-	def sourceDependency(dependsOnPath: Path, sourcePath: Path)
-	{
+
+	def sourceDependency(dependsOnPath: Path, sourcePath: Path): Unit =
 		analysis.addSourceDependency(dependsOnPath, sourcePath)
-	}
-	def jarDependency(jarFile: File, sourcePath: Path)
-	{
+
+	def jarDependency(jarFile: File, sourcePath: Path): Unit =
 		analysis.addExternalDependency(jarFile, sourcePath)
-	}
-	def classDependency(classFile: File, sourcePath: Path)
-	{
+	
+	def classDependency(classFile: File, sourcePath: Path): Unit =
 		analysis.addExternalDependency(classFile, sourcePath)
-	}
-	def generatedClass(sourcePath: Path, modulePath: Path)
-	{
+		
+	def productDependency(classFile: Path, sourcePath: Path): Unit =
+		analysis.addProductDependency(classFile, sourcePath)
+	
+	def generatedClass(sourcePath: Path, modulePath: Path): Unit =
 		analysis.addProduct(sourcePath, modulePath)
-	}
-	def endSource(sourcePath: Path)
-	{
+	
+	def endSource(sourcePath: Path): Unit =
 		analysis.removeSelfDependency(sourcePath)
-	}
 }
 abstract class BasicCompileAnalysisCallback(basePath: Path, superclassNames: Iterable[String], analysis: CompileAnalysis)
 	extends BasicAnalysisCallback(basePath, superclassNames, analysis)
 {
-	def foundApplication(sourcePath: Path, className: String)
-	{
+	def foundApplication(sourcePath: Path, className: String): Unit =
 		analysis.addApplication(sourcePath, className)
-	}
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/Analyzer.scala b/src/main/scala/sbt/Analyzer.scala
index 3e45d804a..b1e8a0462 100644
--- a/src/main/scala/sbt/Analyzer.scala
+++ b/src/main/scala/sbt/Analyzer.scala
@@ -119,9 +119,13 @@ class Analyzer(val global: Global) extends Plugin
 									case ze: ZipArchive#Entry => callback.jarDependency(new File(ze.getArchive.getName), sourcePath)
 									case pf: PlainFile =>
 									{
-										 // ignore dependencies in the output directory: these are handled by source dependencies
-										if(Path.relativize(outputPath, pf.file).isEmpty)
-											callback.classDependency(pf.file, sourcePath)
+										Path.relativize(outputPath, pf.file) match
+										{
+											case None =>  // dependency is a class file outside of the output directory
+												callback.classDependency(pf.file, sourcePath)
+											case Some(relativeToOutput) => // dependency is a product of a source not included in this compilation
+												callback.productDependency(relativeToOutput, sourcePath)
+										}
 									}
 									case _ => ()
 								}
@@ -182,6 +186,14 @@ class Analyzer(val global: Global) extends Plugin
 		val entry = classPath.root.find(name, false)
 		if (entry ne null)
 			Some(entry.classFile)
+		else if(isTopLevelModule(sym))
+		{
+			val linked = sym.linkedClassOfModule
+			if(linked == NoSymbol)
+				None
+			else
+				classFile(linked)
+		}
 		else
 			None
 	}

From d746a1323231b008cc72ad37c4bd125f2f073682 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 11 Jul 2009 18:49:26 +0000
Subject: [PATCH 025/268] Added tests for latest partial recompilation fixes.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@860 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../added/changes/A1.scala                    |  4 ++
 .../added/changes/A2.scala                    |  4 ++
 .../added/changes/A3.scala                    |  4 ++
 .../added/changes/B1.scala                    |  4 ++
 .../added/changes/B2.scala                    |  4 ++
 .../added/project/build.properties            |  2 +
 src/sbt-test/source-dependencies/added/test   | 41 +++++++++++++++++++
 .../java-static/changes/J1.java               |  4 ++
 .../java-static/changes/J2.java               |  4 ++
 .../java-static/changes/S.scala               |  4 ++
 .../java-static/project/build.properties      |  2 +
 .../source-dependencies/java-static/test      | 32 +++++++++++++++
 12 files changed, 109 insertions(+)
 create mode 100644 src/sbt-test/source-dependencies/added/changes/A1.scala
 create mode 100644 src/sbt-test/source-dependencies/added/changes/A2.scala
 create mode 100644 src/sbt-test/source-dependencies/added/changes/A3.scala
 create mode 100644 src/sbt-test/source-dependencies/added/changes/B1.scala
 create mode 100644 src/sbt-test/source-dependencies/added/changes/B2.scala
 create mode 100644 src/sbt-test/source-dependencies/added/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/added/test
 create mode 100644 src/sbt-test/source-dependencies/java-static/changes/J1.java
 create mode 100644 src/sbt-test/source-dependencies/java-static/changes/J2.java
 create mode 100644 src/sbt-test/source-dependencies/java-static/changes/S.scala
 create mode 100644 src/sbt-test/source-dependencies/java-static/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/java-static/test

diff --git a/src/sbt-test/source-dependencies/added/changes/A1.scala b/src/sbt-test/source-dependencies/added/changes/A1.scala
new file mode 100644
index 000000000..28a0e3398
--- /dev/null
+++ b/src/sbt-test/source-dependencies/added/changes/A1.scala
@@ -0,0 +1,4 @@
+object A
+{
+	val x: Int = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/added/changes/A2.scala b/src/sbt-test/source-dependencies/added/changes/A2.scala
new file mode 100644
index 000000000..b77a07bf9
--- /dev/null
+++ b/src/sbt-test/source-dependencies/added/changes/A2.scala
@@ -0,0 +1,4 @@
+object A
+{
+	val x: Int = B.y
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/added/changes/A3.scala b/src/sbt-test/source-dependencies/added/changes/A3.scala
new file mode 100644
index 000000000..9c5d648fc
--- /dev/null
+++ b/src/sbt-test/source-dependencies/added/changes/A3.scala
@@ -0,0 +1,4 @@
+object A
+{
+	val x: String = B.y
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/added/changes/B1.scala b/src/sbt-test/source-dependencies/added/changes/B1.scala
new file mode 100644
index 000000000..a4b781aaa
--- /dev/null
+++ b/src/sbt-test/source-dependencies/added/changes/B1.scala
@@ -0,0 +1,4 @@
+object B
+{
+	val y: String = "4"
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/added/changes/B2.scala b/src/sbt-test/source-dependencies/added/changes/B2.scala
new file mode 100644
index 000000000..484f5581f
--- /dev/null
+++ b/src/sbt-test/source-dependencies/added/changes/B2.scala
@@ -0,0 +1,4 @@
+object B
+{
+	val y: Int = 5
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/added/project/build.properties b/src/sbt-test/source-dependencies/added/project/build.properties
new file mode 100644
index 000000000..3f2496999
--- /dev/null
+++ b/src/sbt-test/source-dependencies/added/project/build.properties
@@ -0,0 +1,2 @@
+project.name=test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/added/test b/src/sbt-test/source-dependencies/added/test
new file mode 100644
index 000000000..8938af326
--- /dev/null
+++ b/src/sbt-test/source-dependencies/added/test
@@ -0,0 +1,41 @@
+# This test checks that when a source file included in a partial recompilation adds a dependency on
+# a file not included in the partial recompilation,  the dependency is properly recorded.
+
+# B and A are independent, so both should compile successfully
+$ copy-file changes/A1.scala src/main/scala/A.scala
+[success]
+$ copy-file changes/B1.scala src/main/scala/B.scala
+[success]
+> compile
+[success]
+
+
+# A now depends on B and to check that it was recompiled, we mismatch the types, which should fail
+$ copy-file changes/A2.scala src/main/scala/A.scala
+[success]
+> compile
+[failure]
+
+
+# We now correct the type so that it compiles successfully and this should introduce a dependency from A to B
+$ copy-file changes/A3.scala src/main/scala/A.scala
+[success]
+> compile
+[success]
+
+
+# If the dependency from A to B was properly introduced, changing the type of B.y to Int should make
+# the following statement in A a compiler error:
+#   val x: String = B.y
+$ copy-file changes/B2.scala src/main/scala/B.scala
+[success]
+$ pause
+[success]
+> compile
+[failure]
+
+# verify this was the correct result by doing a clean+compile
+>clean
+[success]
+> compile
+[failure]
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-static/changes/J1.java b/src/sbt-test/source-dependencies/java-static/changes/J1.java
new file mode 100644
index 000000000..a3a75fefd
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-static/changes/J1.java
@@ -0,0 +1,4 @@
+public class J
+{
+	public static final int x = 3;
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-static/changes/J2.java b/src/sbt-test/source-dependencies/java-static/changes/J2.java
new file mode 100644
index 000000000..8ff2e24c6
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-static/changes/J2.java
@@ -0,0 +1,4 @@
+public class J
+{
+	public static final String x = "3";
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-static/changes/S.scala b/src/sbt-test/source-dependencies/java-static/changes/S.scala
new file mode 100644
index 000000000..45436972b
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-static/changes/S.scala
@@ -0,0 +1,4 @@
+object S
+{
+	val y: Int = J.x
+}
diff --git a/src/sbt-test/source-dependencies/java-static/project/build.properties b/src/sbt-test/source-dependencies/java-static/project/build.properties
new file mode 100644
index 000000000..3253ff5ca
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-static/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Java static test
+project.version=9.5.3
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-static/test b/src/sbt-test/source-dependencies/java-static/test
new file mode 100644
index 000000000..7a13a1186
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-static/test
@@ -0,0 +1,32 @@
+# When a Java class is loaded from a class file and not parsed from a source file, scalac reports
+#    the statics as an object without a file and so the Analyzer must know to look for the
+#    object's linked class.
+# This test verifies this happens.
+# The test compiles a Java class with a static field. 
+# It then adds a Scala object that references the static field.  Because the object only depends on a
+#   static member and because the Java source is not included in the compilation (since it didn't change),
+#   this triggers the special case above.
+
+# add and compile the Java source
+$ copy-file changes/J1.java src/main/java/J.java
+[success]
+> compile
+[success]
+
+# add and compile the Scala source
+$ copy-file changes/S.scala src/main/scala/S.scala
+[success]
+> compile
+[success]
+
+# change the Java source so that a compile error should occur if S.scala is also recompiled (which will happen if the dependency was properly recorded)
+$ copy-file changes/J2.java src/main/java/J.java
+[success]
+> compile
+[failure]
+
+# verify it should have failed by doing a full recompilation
+> clean
+[success]
+> compile
+[failure]
\ No newline at end of file

From b6a693be44c8a5b1c5994b37f9749fa86d7e0f38 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 16 Jul 2009 13:00:55 +0000
Subject: [PATCH 026/268]  * Fixed 'run' swallowing exceptions.  * sbt test
 framework extensions can now be defined in a project (to bundle with a test
 framework, for example)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@865 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala  |  2 ++
 src/main/scala/sbt/Run.scala                |  5 ++++-
 src/main/scala/sbt/TestFramework.scala      | 18 ++++++++++++++----
 src/main/scala/sbt/TrapExit.scala           |  8 +++++---
 src/sbt-test/source-dependencies/added/test |  2 --
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index d8340bf39..163a69af3 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -537,6 +537,8 @@ object Reflective
 trait ReflectiveLibraryDependencies extends ManagedProject
 {
 	def excludeIDs: Iterable[ModuleID] = projectID :: Nil
+	/** Defines the library dependencies of this project.  By default, this finds vals of type ModuleID defined on the project.
+	* This can be overridden to directly provide dependencies */
 	def libraryDependencies: Set[ModuleID] = reflectiveLibraryDependencies
 	def reflectiveLibraryDependencies : Set[ModuleID] = Set[ModuleID](Reflective.reflectiveMappings[ModuleID](this).values.toList: _*) -- excludeIDs
 }
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 5662e5d87..41a495801 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -90,7 +90,10 @@ object Run extends ScalaRun
 							(new java.io.File(pathString)).toURI.toURL
 					log.info("Running " + mainClass + " ...")
 					log.debug("  Classpath:" + (classpathURLs ++ extraURLs).mkString("\n\t", "\n\t",""))
-					executeTrapExit( ObjectRunner.run(classpathURLs ++ extraURLs, mainClass, options.toList), log )
+					def execute =
+						try { ObjectRunner.run(classpathURLs ++ extraURLs, mainClass, options.toList) }
+						catch { case e: java.lang.reflect.InvocationTargetException => throw e.getCause }
+					executeTrapExit( execute, log )
 				}
 			}
 		}
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index 7e6a59fb4..e5bbf1bb3 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -173,15 +173,24 @@ abstract class LazyTestFramework extends TestFramework
 	* tests for this framework.*/
 	protected def testRunnerClassName: String
 	
+	protected def bundledTestRunnerClassName: Option[String] = None
+	
 	/** Creates an instance of the runner given by 'testRunnerClassName'.*/
 	final def testRunner(projectLoader: ClassLoader, listeners: Iterable[TestReportListener], log: Logger): TestRunner =
 	{
-		val runnerClassName = testRunnerClassName
 		val frameworkClasspath = FileUtilities.classLocation(getClass)
 		val sbtURL = FileUtilities.sbtJar.toURI.toURL
-		val lazyLoader = new LazyFrameworkLoader(runnerClassName, Array(frameworkClasspath, sbtURL), projectLoader, getClass.getClassLoader)
-		val runnerClass = Class.forName(runnerClassName, true, lazyLoader).asSubclass(classOf[TestRunner])
-
+		val projectClasspath = projectLoader.asInstanceOf[java.net.URLClassLoader].getURLs
+		val loaderURLs = Array(frameworkClasspath, sbtURL) ++ projectClasspath
+		
+		def load(name: String): Option[Class[_]] =
+		{
+			val lazyLoader = new LazyFrameworkLoader(name, loaderURLs, projectLoader, getClass.getClassLoader)
+			try { Some(Class.forName(name, true, lazyLoader)) }
+			catch { case e: ClassNotFoundException => None }
+		}
+		val c = bundledTestRunnerClassName.flatMap(load).orElse(load(testRunnerClassName))
+		val runnerClass = c.getOrElse(error("Could not find test runner")).asSubclass(classOf[TestRunner])
 		runnerClass.getConstructor(classOf[Logger], classOf[Seq[TestReportListener]], classOf[ClassLoader]).newInstance(log, listeners, projectLoader)
 	}
 }
@@ -196,6 +205,7 @@ object ScalaTestFramework extends LazyTestFramework
 	def testSubClassType = ClassType.Class
 	
 	def testRunnerClassName = "sbt.impl.ScalaTestRunner"
+	override def bundledTestRunnerClassName = Some("org.scalatest.sbt.ScalaTestRunner")
 }
 /** The test framework definition for ScalaCheck.*/
 object ScalaCheckFramework extends LazyTestFramework
diff --git a/src/main/scala/sbt/TrapExit.scala b/src/main/scala/sbt/TrapExit.scala
index c66b8f208..aef7cebb5 100644
--- a/src/main/scala/sbt/TrapExit.scala
+++ b/src/main/scala/sbt/TrapExit.scala
@@ -29,7 +29,7 @@ object TrapExit
 		* the threads that were created by 'execute'.*/
 		val originalThreads = allThreads
 		val code = new ExitCode
-		val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code))
+		val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code, log))
 		val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { execute } }
 		
 		val originalSecurityManager = System.getSecurityManager
@@ -162,7 +162,7 @@ object TrapExit
 	}
 	/** An uncaught exception handler that delegates to the original uncaught exception handler except when
 	* the cause was a call to System.exit (which generated a SecurityException)*/
-	private final class ExitHandler(originalHandler: Thread.UncaughtExceptionHandler, originalThreads: Set[Thread], codeHolder: ExitCode) extends Thread.UncaughtExceptionHandler
+	private final class ExitHandler(originalHandler: Thread.UncaughtExceptionHandler, originalThreads: Set[Thread], codeHolder: ExitCode, log: Logger) extends Thread.UncaughtExceptionHandler
 	{
 		def uncaughtException(t: Thread, e: Throwable)
 		{
@@ -173,7 +173,9 @@ object TrapExit
 			}
 			catch
 			{
-				case _ => originalHandler.uncaughtException(t, e)
+				case _ =>
+					log.trace(e)
+					originalHandler.uncaughtException(t, e)
 			}
 		}
 	}
diff --git a/src/sbt-test/source-dependencies/added/test b/src/sbt-test/source-dependencies/added/test
index 8938af326..5ba6a5af9 100644
--- a/src/sbt-test/source-dependencies/added/test
+++ b/src/sbt-test/source-dependencies/added/test
@@ -29,8 +29,6 @@ $ copy-file changes/A3.scala src/main/scala/A.scala
 #   val x: String = B.y
 $ copy-file changes/B2.scala src/main/scala/B.scala
 [success]
-$ pause
-[success]
 > compile
 [failure]
 

From da85255f8e8e3f8a279ce5c3140fa1cc8809aa15 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 16 Jul 2009 13:31:46 +0000
Subject: [PATCH 027/268] Properly emulate main thread exceptions terminating
 application even if other threads are running

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@866 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/TrapExit.scala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/TrapExit.scala b/src/main/scala/sbt/TrapExit.scala
index aef7cebb5..43a63615d 100644
--- a/src/main/scala/sbt/TrapExit.scala
+++ b/src/main/scala/sbt/TrapExit.scala
@@ -30,7 +30,13 @@ object TrapExit
 		val originalThreads = allThreads
 		val code = new ExitCode
 		val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code, log))
-		val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { execute } }
+		val executionThread =
+			new Thread(customThreadGroup, "run-main")
+			{
+				override def run(): Unit =
+					try { execute }
+					catch { case e => log.trace(e); System.exit(1) } // an exception in the main thread causes the whole program to terminate
+			}
 		
 		val originalSecurityManager = System.getSecurityManager
 		try

From f8489a77c5922d67088232e48be87cf4d9454108 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 16 Jul 2009 13:51:19 +0000
Subject: [PATCH 028/268] Revert change that exited on exception in main thread
 (that behavior is a Scala runner bug)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@867 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/TrapExit.scala | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/scala/sbt/TrapExit.scala b/src/main/scala/sbt/TrapExit.scala
index 43a63615d..aef7cebb5 100644
--- a/src/main/scala/sbt/TrapExit.scala
+++ b/src/main/scala/sbt/TrapExit.scala
@@ -30,13 +30,7 @@ object TrapExit
 		val originalThreads = allThreads
 		val code = new ExitCode
 		val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code, log))
-		val executionThread =
-			new Thread(customThreadGroup, "run-main")
-			{
-				override def run(): Unit =
-					try { execute }
-					catch { case e => log.trace(e); System.exit(1) } // an exception in the main thread causes the whole program to terminate
-			}
+		val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { execute } }
 		
 		val originalSecurityManager = System.getSecurityManager
 		try

From 8067eb42d51012cdd1bec509a2ad1c44921dc58b Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 16 Jul 2009 15:40:12 +0000
Subject: [PATCH 029/268] Added test-failed test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@869 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../tests/test-failed/changes/Fail.scala      |  7 +++++
 .../tests/test-failed/changes/Success.scala   |  7 +++++
 .../test-failed/project/build.properties      |  2 ++
 .../project/build/TestQuickProject.scala      |  5 ++++
 src/sbt-test/tests/test-failed/test           | 26 +++++++++++++++++++
 5 files changed, 47 insertions(+)
 create mode 100644 src/sbt-test/tests/test-failed/changes/Fail.scala
 create mode 100644 src/sbt-test/tests/test-failed/changes/Success.scala
 create mode 100644 src/sbt-test/tests/test-failed/project/build.properties
 create mode 100644 src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
 create mode 100644 src/sbt-test/tests/test-failed/test

diff --git a/src/sbt-test/tests/test-failed/changes/Fail.scala b/src/sbt-test/tests/test-failed/changes/Fail.scala
new file mode 100644
index 000000000..1fa4e4bdd
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/changes/Fail.scala
@@ -0,0 +1,7 @@
+import org.scalatest._
+
+class TestQuickSuite extends FunSuite {
+	test("a test") {
+		throw new IllegalStateException
+	}
+}
diff --git a/src/sbt-test/tests/test-failed/changes/Success.scala b/src/sbt-test/tests/test-failed/changes/Success.scala
new file mode 100644
index 000000000..85489d7e6
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/changes/Success.scala
@@ -0,0 +1,7 @@
+import org.scalatest._
+
+class TestQuickSuite extends FunSuite {
+	test("a test") {
+		true
+	}
+}
diff --git a/src/sbt-test/tests/test-failed/project/build.properties b/src/sbt-test/tests/test-failed/project/build.properties
new file mode 100644
index 000000000..2b68418d4
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/project/build.properties
@@ -0,0 +1,2 @@
+project.version=1.0
+project.name=Test Failed
\ No newline at end of file
diff --git a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
new file mode 100644
index 000000000..b8f8efd3d
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
@@ -0,0 +1,5 @@
+import sbt._
+
+class TestQuickProject(info: ProjectInfo) extends DefaultProject(info) {
+    val scalatest = "org.scalatest" % "scalatest" % "0.9.3"
+}
diff --git a/src/sbt-test/tests/test-failed/test b/src/sbt-test/tests/test-failed/test
new file mode 100644
index 000000000..244aea8ac
--- /dev/null
+++ b/src/sbt-test/tests/test-failed/test
@@ -0,0 +1,26 @@
+> update
+[success]
+
+$ copy-file changes/Fail.scala src/test/scala/TestQuickSuite.scala
+[success]
+
+> test-failed
+[failure]
+
+> test-failed *
+[failure]
+
+> test-failed TestQuickSuite
+[failure]
+
+$ copy-file changes/Success.scala src/test/scala/TestQuickSuite.scala
+[success]
+
+> test-failed
+[success]
+
+> test-failed *
+[success]
+
+> test-failed TestQuickSuite
+[success]
\ No newline at end of file

From 066e5588c75290c447c253f2204d2d222ed4df12 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 16 Jul 2009 16:11:30 +0000
Subject: [PATCH 030/268] Added basic binary plugin test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@870 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/sbt-test/project/plugins/project/build.properties      | 2 ++
 src/sbt-test/project/plugins/project/build/UsePlugin.scala | 7 +++++++
 src/sbt-test/project/plugins/project/plugins/Plugins.scala | 5 +++++
 src/sbt-test/project/plugins/test                          | 2 ++
 4 files changed, 16 insertions(+)
 create mode 100644 src/sbt-test/project/plugins/project/build.properties
 create mode 100644 src/sbt-test/project/plugins/project/build/UsePlugin.scala
 create mode 100644 src/sbt-test/project/plugins/project/plugins/Plugins.scala
 create mode 100644 src/sbt-test/project/plugins/test

diff --git a/src/sbt-test/project/plugins/project/build.properties b/src/sbt-test/project/plugins/project/build.properties
new file mode 100644
index 000000000..6752177e3
--- /dev/null
+++ b/src/sbt-test/project/plugins/project/build.properties
@@ -0,0 +1,2 @@
+project.version=1.0
+project.name=Plugins Test
\ No newline at end of file
diff --git a/src/sbt-test/project/plugins/project/build/UsePlugin.scala b/src/sbt-test/project/plugins/project/build/UsePlugin.scala
new file mode 100644
index 000000000..129cf4f99
--- /dev/null
+++ b/src/sbt-test/project/plugins/project/build/UsePlugin.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class UsePlugin(info: ProjectInfo) extends DefaultProject(info)
+{
+	import antlr.Tool // verify that antlr is on compile classpath
+	lazy val check = task { Class.forName("antlr.Tool"); None } // verify antlr is on runtime classpath
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/plugins/project/plugins/Plugins.scala b/src/sbt-test/project/plugins/project/plugins/Plugins.scala
new file mode 100644
index 000000000..48924e7d2
--- /dev/null
+++ b/src/sbt-test/project/plugins/project/plugins/Plugins.scala
@@ -0,0 +1,5 @@
+import sbt._
+class Plugins(info: ProjectInfo) extends PluginDefinition(info)
+{
+  val a = "antlr" % "antlr" % "2.7.7"
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/plugins/test b/src/sbt-test/project/plugins/test
new file mode 100644
index 000000000..f9d588aa7
--- /dev/null
+++ b/src/sbt-test/project/plugins/test
@@ -0,0 +1,2 @@
+> check
+[success]
\ No newline at end of file

From f2fe9bcfe38be713c17629e2d7d9dff9d9d0fd7f Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 16 Jul 2009 20:03:20 +0000
Subject: [PATCH 031/268] Fixed tab completion for multi-project builds

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@872 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Main.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 877599824..aa8f13091 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -208,7 +208,7 @@ object Main
 		*   (tail recursively) to prompt for the next command. */
 		def loop(currentProject: Project): RunCompleteAction =
 		{
-			updateTaskCompletions(baseProject) // this is done after every command because the completions could change due to the action invoked
+			updateTaskCompletions(currentProject) // this is done after every command because the completions could change due to the action invoked
 			reader.readLine("> ") match
 			{
 				case Some(line) =>

From 8420606a8cd3416612db0f82ffa2dbc5ed378c08 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 21 Jul 2009 23:44:29 +0000
Subject: [PATCH 032/268]  * fixed tab completion for method tasks for
 multi-project builds  * check that tasks in compoundTask do not reference
 static tasks  * make toString of Paths in subprojects relative to root
 project directory  * crossScalaVersions is now inherited from parent  * Added
 scala-library.jar to the javac classpath  * Added Process.cat that will send
 contents of URLs and Files to standard output

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@877 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Compile.scala              | 37 ++++++++---
 src/main/scala/sbt/FileUtilities.scala        |  1 +
 src/main/scala/sbt/ManageDependencies.scala   |  4 +-
 src/main/scala/sbt/Path.scala                 |  9 ++-
 src/main/scala/sbt/Process.scala              | 62 ++++++++++++-------
 src/main/scala/sbt/Project.scala              | 10 ++-
 src/main/scala/sbt/ProjectInfo.scala          |  6 +-
 src/main/scala/sbt/TaskManager.scala          | 22 ++++++-
 src/main/scala/sbt/impl/ProcessImpl.scala     | 55 +++++++++-------
 src/test/scala/sbt/ProcessSpecification.scala |  3 +-
 10 files changed, 143 insertions(+), 66 deletions(-)

diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index 3dd80ec86..b9473ee14 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -3,10 +3,16 @@
  */
 package sbt
 
+import java.io.File
+
 object CompileOrder extends Enumeration
 {
 	val Mixed, JavaThenScala, ScalaThenJava = Value
 }
+private object CompilerCore
+{
+	def scalaClasspathForJava = FileUtilities.scalaJars.map(_.getAbsolutePath).mkString(File.pathSeparator)
+}
 sealed abstract class CompilerCore
 {
 	val ClasspathOptionString = "-classpath"
@@ -16,25 +22,35 @@ sealed abstract class CompilerCore
 	protected def process(args: List[String], log: Logger): Boolean
 	// Returns false if there were errors, true if there were not.
 	protected def processJava(args: List[String], log: Logger): Boolean = true
+	protected def scalaClasspathForJava: String
 	def actionStartMessage(label: String): String
 	def actionNothingToDoMessage: String
 	def actionSuccessfulMessage: String
 	def actionUnsuccessfulMessage: String
+	
+	private def classpathString(rawClasspathString: String, includeScala: Boolean) =
+		if(includeScala)
+			List(rawClasspathString, scalaClasspathForJava).mkString(File.pathSeparator)
+		else
+			rawClasspathString
 
 	final def apply(label: String, sources: Iterable[Path], classpathString: String, outputDirectory: Path, options: Seq[String], log: Logger): Option[String] =
 		apply(label, sources, classpathString, outputDirectory, options, Nil, CompileOrder.Mixed, log)
-	final def apply(label: String, sources: Iterable[Path], classpathString: String, outputDirectory: Path, options: Seq[String], javaOptions: Seq[String], order: CompileOrder.Value, log: Logger): Option[String] =
+	final def apply(label: String, sources: Iterable[Path], rawClasspathString: String, outputDirectory: Path, options: Seq[String], javaOptions: Seq[String], order: CompileOrder.Value, log: Logger): Option[String] =
 	{
 		log.info(actionStartMessage(label))
-		val classpathOption: List[String] =
-			if(classpathString.isEmpty)
+		def classpathOption(includeScala: Boolean): List[String] =
+		{
+			val classpath = classpathString(rawClasspathString, includeScala)
+			if(classpath.isEmpty)
 				Nil
 			else
-				List(ClasspathOptionString, classpathString)
+				List(ClasspathOptionString, classpath)
+		}
 		val outputDir = outputDirectory.asFile
 		FileUtilities.createDirectory(outputDir, log) orElse
 		{
-			val classpathAndOut: List[String] = OutputOptionString :: outputDir.getAbsolutePath :: classpathOption
+			def classpathAndOut(javac: Boolean): List[String] = OutputOptionString :: outputDir.getAbsolutePath :: classpathOption(javac)
 			
 			Control.trapUnit("Compiler error: ", log)
 			{
@@ -47,7 +63,7 @@ sealed abstract class CompilerCore
 				else
 				{
 					def filteredSources(extension: String) = sourceList.filter(_.endsWith(extension))
-					def compile(label: String, sources: List[String], options: Seq[String])(process: (List[String], Logger) => Boolean) =
+					def compile(label: String, sources: List[String], options: Seq[String], includeScala: Boolean)(process: (List[String], Logger) => Boolean) =
 					{
 						if(sources.isEmpty)
 						{
@@ -56,7 +72,7 @@ sealed abstract class CompilerCore
 						}
 						else
 						{
-							val arguments = (options ++ classpathAndOut ++ sources).toList
+							val arguments = (options ++ classpathAndOut(includeScala) ++ sources).toList
 							log.debug(label + " arguments: " + arguments.mkString(" "))
 							process(arguments, log)
 						}
@@ -64,12 +80,12 @@ sealed abstract class CompilerCore
 					def scalaCompile = () =>
 					{
 						val scalaSourceList = if(order == CompileOrder.Mixed) sourceList else filteredSources(".scala")
-						compile("Scala", scalaSourceList, options)(process)
+						compile("Scala", scalaSourceList, options, false)(process)
 					}
 					def javaCompile = () =>
 					{
 						val javaSourceList = filteredSources(".java")
-						compile("Java", javaSourceList, javaOptions)(processJava)
+						compile("Java", javaSourceList, javaOptions, true)(processJava)
 					}
 					
 					val (first, second) = if(order == CompileOrder.JavaThenScala) (javaCompile, scalaCompile) else (scalaCompile, javaCompile)
@@ -100,6 +116,7 @@ final class ForkCompile(config: ForkScalaCompiler) extends CompilerBase
 		Fork.scalac(config.javaHome, config.compileJVMOptions, config.scalaJars, arguments, log) == 0
 	override protected def processJava(args: List[String], log: Logger) =
 		Fork.javac(config.javaHome, args, log) == 0
+	override protected def scalaClasspathForJava = config.scalaJars.mkString(File.pathSeparator)
 }
 object ForkCompile
 {
@@ -152,9 +169,11 @@ final class Compile(maximumErrors: Int) extends CompilerBase
 	}
 	override protected def processJava(args: List[String], log: Logger) =
 		(Process("javac", args) ! log) == 0
+	protected def scalaClasspathForJava = CompilerCore.scalaClasspathForJava
 }
 final class Scaladoc(maximumErrors: Int) extends CompilerCore
 {
+	protected def scalaClasspathForJava = CompilerCore.scalaClasspathForJava
 	protected def process(arguments: List[String], log: Logger) =
 	{
 		import scala.tools.nsc.{doc, CompilerCommand, FatalError, Global, reporters, util}
diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index c63106b0a..ae3259f09 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -803,6 +803,7 @@ object FileUtilities
 	lazy val sbtJar: File = classLocationFile(getClass)
 	lazy val scalaLibraryJar: File = classLocationFile[scala.ScalaObject]
 	lazy val scalaCompilerJar: File = classLocationFile[scala.tools.nsc.Settings]
+	def scalaJars: Iterable[File] = List(scalaLibraryJar, scalaCompilerJar)
 	
 	/** The producer of randomness for unique name generation.*/
 	private val random = new java.util.Random
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index c6f0f2461..f154afbe2 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -309,8 +309,8 @@ object ManageDependencies
 				configSet.toArray
 			}
 		}
-		def excludeScalaJar(name: String)
-			{ module.addExcludeRule(excludeRule(ScalaArtifacts.Organization, name, configurationNames)) }
+		def excludeScalaJar(name: String): Unit =
+			module.addExcludeRule(excludeRule(ScalaArtifacts.Organization, name, configurationNames))
 		excludeScalaJar(ScalaArtifacts.LibraryID)
 		excludeScalaJar(ScalaArtifacts.CompilerID)
 	}
diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
index 23236371d..7c9aaa696 100644
--- a/src/main/scala/sbt/Path.scala
+++ b/src/main/scala/sbt/Path.scala
@@ -82,13 +82,16 @@ private[sbt] final class FilePath(file: File) extends Path
 	def projectRelativePathString(separator: String) = relativePathString(separator)
 	private[sbt] def prependTo(s: String) = absolutePath + sep + s
 }
-private[sbt] final class ProjectDirectory(file: File) extends Path
+// toRoot is the path between this and the root project path and is used for toString
+private[sbt] final class ProjectDirectory(file: File, toRoot: Option[Path]) extends Path
 {
+	def this(file: File) = this(file, None)
 	lazy val asFile = absolute(file)
-	override def toString = "."
+	override def toString = foldToRoot(_.toString, ".")
 	def relativePathString(separator: String) = ""
 	def projectRelativePathString(separator: String) = ""
-	private[sbt] def prependTo(s: String) = "." + sep + s
+	private[sbt] def prependTo(s: String) = foldToRoot(_.prependTo(s), "." + sep + s)
+	private[sbt] def foldToRoot[T](f: Path => T, orElse: T) = toRoot.map(f).getOrElse(orElse)
 }
 private[sbt] final class RelativePath(val parentPath: Path, val component: String) extends Path
 {
diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index ac6e106b4..9341699dc 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -20,23 +20,51 @@ object Process
 	implicit def apply(command: scala.xml.Elem): ProcessBuilder = apply(command.text.trim)
 	def apply(value: Boolean): ProcessBuilder = apply(value.toString, if(value) 0 else 1)
 	def apply(name: String, exitValue: => Int): ProcessBuilder = new DummyProcessBuilder(name, exitValue)
+	
+	def cat(file: SourcePartialBuilder, files: SourcePartialBuilder*): ProcessBuilder = cat(file :: files.toList)
+	private[this] def cat(files: Seq[SourcePartialBuilder]): ProcessBuilder =
+	{
+		require(!files.isEmpty)
+		files.map(_.cat).reduceLeft(_ #&& _)
+	}
 }
 
-trait URLPartialBuilder extends NotNull
+trait SourcePartialBuilder extends NotNull
 {
-	def #>(b: ProcessBuilder): ProcessBuilder
-	def #>>(b: File): ProcessBuilder
-	def #>(b: File): ProcessBuilder
+	/** Writes the output stream of this process to the given file. */
+	def #> (f: File): ProcessBuilder = toFile(f, false)
+	/** Appends the output stream of this process to the given file. */
+	def #>> (f: File): ProcessBuilder = toFile(f, true)
+	/** Writes the output stream of this process to the given OutputStream. The
+	* argument is call-by-name, so the stream is recreated, written, and closed each
+	* time this process is executed. */
+	def #>(out: => OutputStream): ProcessBuilder = #> (new OutputStreamBuilder(out))
+	def #>(b: ProcessBuilder): ProcessBuilder = new PipedProcessBuilder(toSource, b, false)
+	private def toFile(f: File, append: Boolean) = #> (new FileOutput(f, append))
+	def cat = toSource
+	protected def toSource: ProcessBuilder
 }
-trait FilePartialBuilder extends NotNull
+trait SinkPartialBuilder extends NotNull
 {
-	def #>(b: ProcessBuilder): ProcessBuilder
-	def #<(b: ProcessBuilder): ProcessBuilder
-	def #<(url: URL): ProcessBuilder
-	def #>>(b: File): ProcessBuilder
-	def #>(b: File): ProcessBuilder
-	def #<(file: File): ProcessBuilder
-	def #<<(file: File): ProcessBuilder
+	/** Reads the given file into the input stream of this process. */
+	def #< (f: File): ProcessBuilder = #< (new FileInput(f))
+	/** Reads the given URL into the input stream of this process. */
+	def #< (f: URL): ProcessBuilder = #< (new URLInput(f))
+	/** Reads the given InputStream into the input stream of this process. The
+	* argument is call-by-name, so the stream is recreated, read, and closed each
+	* time this process is executed. */
+	def #<(in: => InputStream): ProcessBuilder = #< (new InputStreamBuilder(in))
+	def #<(b: ProcessBuilder): ProcessBuilder = new PipedProcessBuilder(b, toSink, false)
+	protected def toSink: ProcessBuilder
+}
+
+trait URLPartialBuilder extends SourcePartialBuilder
+trait FilePartialBuilder extends SinkPartialBuilder with SourcePartialBuilder
+{
+	def #<<(f: File): ProcessBuilder
+	def #<<(u: URL): ProcessBuilder
+	def #<<(i: => InputStream): ProcessBuilder
+	def #<<(p: ProcessBuilder): ProcessBuilder
 }
 
 /** Represents a process that is running or has finished running.
@@ -49,7 +77,7 @@ trait Process extends NotNull
 	def destroy(): Unit
 }
 /** Represents a runnable process. */
-trait ProcessBuilder extends NotNull
+trait ProcessBuilder extends SourcePartialBuilder with SinkPartialBuilder
 {
 	/** Starts the process represented by this builder, blocks until it exits, and returns the exit code.  Standard output and error are
 	* sent to the console.*/
@@ -85,14 +113,6 @@ trait ProcessBuilder extends NotNull
 	def #| (other: ProcessBuilder): ProcessBuilder
 	/** Constructs a command that will run this command and then `other`.  The exit code will be the exit code of `other`.*/
 	def ## (other: ProcessBuilder): ProcessBuilder
-	/** Reads the given file into the input stream of this process. */
-	def #< (f: File): ProcessBuilder
-	/** Reads the given URL into the input stream of this process. */
-	def #< (f: URL): ProcessBuilder
-	/** Writes the output stream of this process to the given file. */
-	def #> (f: File): ProcessBuilder
-	/** Appends the output stream of this process to the given file. */
-	def #>> (f: File): ProcessBuilder
 
 	def canPipeTo: Boolean
 }
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index ac4527d45..fef74bf9a 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -46,7 +46,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* are different tasks with the same name, only one will be included. */
 	def taskList: String = descriptionList(deepTasks)
 	
-	final def taskName(task: Task) = tasks.find( _._2 eq task ).map(_._1).getOrElse(UnnamedName)
+	final def taskName(task: Task) = tasks.find( _._2 eq task ).map(_._1)
 	/** A description of all available tasks in this project and all dependencies and all
 	* available method tasks in this project, but not of dependencies.  If there
 	* are different tasks or methods with the same name, only one will be included. */
@@ -233,7 +233,12 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	protected def disableCrossPaths = crossScalaVersions.isEmpty
 	/** By default, this is empty and cross-building is disabled.  Overriding this to a Set of Scala versions
 	* will enable cross-building against those versions.*/
-	def crossScalaVersions = scala.collection.immutable.Set.empty[String]
+	def crossScalaVersions: immutable.Set[String] =
+		info.parent match
+		{
+			case Some(p) => p.crossScalaVersions
+			case None => immutable.Set.empty[String]
+		}
 	/** A `PathFinder` that determines the files watched when an action is run with a preceeding ~ when this is the current
 	* project.  This project does not need to include the watched paths for projects that this project depends on.*/
 	def watchPaths: PathFinder = Path.emptyPathFinder
@@ -256,7 +261,6 @@ private[sbt] final class LoadSetupError(val message: String) extends LoadResult
 
 object Project
 {
-	val UnnamedName = "<anonymous>"
 	val BootDirectoryName = "boot"
 	val DefaultOutputDirectoryName = "target"
 	val DefaultEnvBackingName = "build.properties"
diff --git a/src/main/scala/sbt/ProjectInfo.scala b/src/main/scala/sbt/ProjectInfo.scala
index 80002cb1b..b2e4fe349 100644
--- a/src/main/scala/sbt/ProjectInfo.scala
+++ b/src/main/scala/sbt/ProjectInfo.scala
@@ -8,7 +8,11 @@ import FileUtilities._
 
 final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Project], parent: Option[Project]) extends NotNull
 {
-	val projectPath = new ProjectDirectory(projectDirectory)
+	val projectPath: Path =
+	{
+		val toRoot = parent.flatMap(p => Path.relativize(p.info.projectPath, projectDirectory))
+		new ProjectDirectory(projectDirectory, toRoot)
+	}
 	val builderPath = projectPath / ProjectInfo.MetadataDirectoryName
 	def bootPath = builderPath / Project.BootDirectoryName
 	def builderProjectPath = builderPath / Project.BuilderProjectDirectoryName
diff --git a/src/main/scala/sbt/TaskManager.scala b/src/main/scala/sbt/TaskManager.scala
index 4d42f4f4b..55960d124 100644
--- a/src/main/scala/sbt/TaskManager.scala
+++ b/src/main/scala/sbt/TaskManager.scala
@@ -3,6 +3,8 @@
  */
 package sbt
 
+import TaskManager._
+
 trait Described extends NotNull
 {
 	def description: Option[String]
@@ -19,7 +21,8 @@ trait TaskManager{
 	/** Creates a method task that executes the given action when invoked. */
 	def task(action: Array[String] => ManagedTask) = new MethodTask(None, action, Nil)
 	
-	def taskName(t: Task): String
+	def taskName(t: Task): Option[String]
+	final def taskNameString(task: Task): String = taskName(task).getOrElse(UnnamedName)
 	
 	/** A method task is an action that has parameters.  Note that it is not a Task, though,
 	* because it requires arguments to perform its work.  It therefore cannot be a dependency of
@@ -42,7 +45,8 @@ trait TaskManager{
 			this(None, description, dependencies, interactive, action)
 		checkTaskDependencies(dependencies)
 		def manager: ManagerType = TaskManager.this
-		def name = explicitName.getOrElse(taskName(this))
+		def name = explicitName.getOrElse(implicitName)
+		private[sbt] def implicitName = taskNameString(this)
 		def named(name: String) = construct(Some(name), description,dependencies, interactive, action)
 		override def toString = "Task " + name
 		
@@ -77,8 +81,16 @@ trait TaskManager{
 			interactive: Boolean, action : => Option[String]) = new CompoundTask(explicitName, description, dependencies, interactive, action, createWork)
 		def work = createWork
 	}
-	def compoundTask(createTask: => Project#Task) = new CompoundTask(SubWork[Project#Task](createTask))
+	def dynamic(createTask: => Project#Task) = new CompoundTask(SubWork[Project#Task](checkDynamic(createTask)))
 	
+	/** Verifies that the given dynamically created task does not depend on any statically defined tasks.
+	* Returns the task if it is valid.*/
+	private def checkDynamic(task: Project#Task) =
+	{
+		for(t <- task.topologicalSort; staticName <- t.implicitName)
+			error("Dynamic task " + task.name + " depends on static task " + staticName)
+		task
+	}
 	private def checkTaskDependencies(dependencyList: List[ManagedTask])
 	{
 		val nullDependencyIndex = dependencyList.findIndexOf(_ == null)
@@ -87,3 +99,7 @@ trait TaskManager{
 		require(interactiveDependencyIndex < 0, "Dependency (at index " + interactiveDependencyIndex + ") is interactive.  Interactive tasks cannot be dependencies.")
 	}
 }
+object TaskManager
+{
+	val UnnamedName = "<anonymous>"
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
index 42e538a08..ab8157a4a 100644
--- a/src/main/scala/sbt/impl/ProcessImpl.scala
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -5,7 +5,7 @@ package sbt
 
 import java.lang.{Process => JProcess, ProcessBuilder => JProcessBuilder}
 import java.io.{BufferedReader, Closeable, InputStream, InputStreamReader, IOException, OutputStream, PrintStream}
-import java.io.{PipedInputStream, PipedOutputStream}
+import java.io.{FilterInputStream, FilterOutputStream, PipedInputStream, PipedOutputStream}
 import java.io.{File, FileInputStream, FileOutputStream}
 import java.net.URL
 
@@ -79,7 +79,7 @@ private object BasicIO
 }
 
 
-private abstract class AbstractProcessBuilder extends ProcessBuilder
+private abstract class AbstractProcessBuilder extends ProcessBuilder with SinkPartialBuilder with SourcePartialBuilder
 {
 	def #&&(other: ProcessBuilder): ProcessBuilder = new AndProcessBuilder(this, other)
 	def #||(other: ProcessBuilder): ProcessBuilder = new OrProcessBuilder(this, other)
@@ -90,10 +90,8 @@ private abstract class AbstractProcessBuilder extends ProcessBuilder
 	}
 	def ##(other: ProcessBuilder): ProcessBuilder = new SequenceProcessBuilder(this, other)
 	
-	def #< (f: File): ProcessBuilder = new PipedProcessBuilder(new FileInput(f), this, false)
-	def #< (url: URL): ProcessBuilder = new PipedProcessBuilder(new URLInput(url), this, false)
-	def #> (f: File): ProcessBuilder = new PipedProcessBuilder(this, new FileOutput(f, false), false)
-	def #>> (f: File): ProcessBuilder = new PipedProcessBuilder(this, new FileOutput(f, true), true)
+	protected def toSource = this
+	protected def toSink = this
 	
 	def run(): Process = run(false)
 	def run(connectInput: Boolean): Process = run(BasicIO.standard(connectInput))
@@ -115,23 +113,19 @@ private abstract class AbstractProcessBuilder extends ProcessBuilder
 
 	def canPipeTo = false
 }
-private[sbt] class URLBuilder(url: URL) extends URLPartialBuilder
+
+private[sbt] class URLBuilder(url: URL) extends URLPartialBuilder with SourcePartialBuilder
 {
-	def #>(b: ProcessBuilder): ProcessBuilder = b #< url
-	def #>>(file: File): ProcessBuilder = toFile(file, true)
-	def #>(file: File): ProcessBuilder = toFile(file, false)
-	private def toFile(file: File, append: Boolean) = new PipedProcessBuilder(new URLInput(url), new FileOutput(file, append), false)
+	protected def toSource = new URLInput(url)
 }
-private[sbt] class FileBuilder(base: File) extends FilePartialBuilder
+private[sbt] class FileBuilder(base: File) extends FilePartialBuilder with SinkPartialBuilder with SourcePartialBuilder
 {
-	def #>(b: ProcessBuilder): ProcessBuilder = b #< base
-	def #<(b: ProcessBuilder): ProcessBuilder = b #> base
-	def #<(url: URL): ProcessBuilder = new URLBuilder(url) #> base
-	def #>>(file: File): ProcessBuilder = pipe(base, file, true)
-	def #>(file: File): ProcessBuilder = pipe(base, file, false)
-	def #<(file: File): ProcessBuilder = pipe(file, base, false)
-	def #<<(file: File): ProcessBuilder = pipe(file, base, true)
-	private def pipe(from: File, to: File, append: Boolean) = new PipedProcessBuilder(new FileInput(from), new FileOutput(to, append), false)
+	protected def toSource = new FileInput(base)
+	protected def toSink = new FileOutput(base, false)
+	def #<<(f: File): ProcessBuilder = #<<(new FileInput(f))
+	def #<<(u: URL): ProcessBuilder = #<<(new URLInput(u))
+	def #<<(s: => InputStream): ProcessBuilder = #<<(new InputStreamBuilder(s))
+	def #<<(b: ProcessBuilder): ProcessBuilder = new PipedProcessBuilder(b, new FileOutput(base, true), false)
 }
 
 private abstract class BasicBuilder extends AbstractProcessBuilder
@@ -369,8 +363,15 @@ private class FileOutput(file: File, append: Boolean) extends OutputStreamBuilde
 private class URLInput(url: URL) extends InputStreamBuilder(url.openStream, url.toString)
 private class FileInput(file: File) extends InputStreamBuilder(new FileInputStream(file), file.getAbsolutePath)
 
-private class OutputStreamBuilder(stream: => OutputStream, label: String) extends ThreadProcessBuilder(label, _.writeInput(stream))
-private class InputStreamBuilder(stream: => InputStream, label: String) extends ThreadProcessBuilder(label, _.processOutput(stream))
+import Uncloseable.protect
+private class OutputStreamBuilder(stream: => OutputStream, label: String) extends ThreadProcessBuilder(label, _.writeInput(protect(stream)))
+{
+	def this(stream: => OutputStream) = this(stream, "<output stream>")
+}
+private class InputStreamBuilder(stream: => InputStream, label: String) extends ThreadProcessBuilder(label, _.processOutput(protect(stream)))
+{
+	def this(stream: => InputStream) = this(stream, "<input stream>")
+}
 
 private abstract class ThreadProcessBuilder(override val toString: String, runImpl: ProcessIO => Unit) extends AbstractProcessBuilder
 {
@@ -381,7 +382,7 @@ private abstract class ThreadProcessBuilder(override val toString: String, runIm
 		new ThreadProcess(Spawn {runImpl(io); success.set(true) }, success)
 	}
 }
-private class ThreadProcess(thread: Thread, success: SyncVar[Boolean]) extends Process
+private final class ThreadProcess(thread: Thread, success: SyncVar[Boolean]) extends Process
 {
 	override def exitValue() =
 	{
@@ -389,4 +390,12 @@ private class ThreadProcess(thread: Thread, success: SyncVar[Boolean]) extends P
 		if(success.get) 0 else 1
 	}
 	override def destroy() { thread.interrupt() }
+}
+
+object Uncloseable
+{
+	def apply(in: InputStream): InputStream = new FilterInputStream(in) { override def close() {} }
+	def apply(out: OutputStream): OutputStream = new FilterOutputStream(out) { override def close() {} }
+	def protect(in: InputStream): InputStream = if(in eq System.in) Uncloseable(in) else in
+	def protect(out: OutputStream): OutputStream = if( (out eq System.out) || (out eq System.err)) Uncloseable(out) else out
 }
\ No newline at end of file
diff --git a/src/test/scala/sbt/ProcessSpecification.scala b/src/test/scala/sbt/ProcessSpecification.scala
index 5dcbcf67a..15d979232 100644
--- a/src/test/scala/sbt/ProcessSpecification.scala
+++ b/src/test/scala/sbt/ProcessSpecification.scala
@@ -13,6 +13,7 @@ object ProcessSpecification extends Properties("Process I/O")
 	specify("Correct exit code", (exitCode: Byte) => checkExit(exitCode))
 	specify("#&& correct", (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #&& _)(_ && _))
 	specify("#|| correct", (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #|| _)(_ || _))
+	specify("## correct", (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ ## _)( (x,latest) => latest))
 	specify("Pipe to output file", (data: Array[Byte]) => checkFileOut(data))
 	specify("Pipe to input file", (data: Array[Byte]) => checkFileIn(data))
 	specify("Pipe to process", (data: Array[Byte]) => checkPipe(data))
@@ -28,7 +29,7 @@ object ProcessSpecification extends Properties("Process I/O")
 		}
 	}
 	private def toBoolean(exitCode: Int) = exitCode == 0
-	private def checkExit(code: Byte) =
+	private def checkExit(code: Byte) = 
 	{
 		val exitCode = unsigned(code)
 		(process("sbt.exit " + exitCode) !) == exitCode

From e58cd74987250f108cf844d2bd523dd7af71439a Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 22 Jul 2009 02:56:57 +0000
Subject: [PATCH 033/268] Support for classifiers to the extent that Ivy
 supports them:  - can publish artifacts with classifiers  - can retrieve
 artifacts with classifiers, but classifier does not appear in generated pom

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@879 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala      | 16 +++++++++++-----
 src/main/scala/sbt/ManagedInterface.scala        | 10 ++++++----
 src/main/scala/sbt/wrap/Wrappers.scala           |  8 ++++++++
 .../classifier/project/build.properties          |  2 ++
 .../classifier/project/build/Test.scala          |  6 ++++++
 .../dependency-management/classifier/test        |  2 ++
 6 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/classifier/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/classifier/project/build/Test.scala
 create mode 100644 src/sbt-test/dependency-management/classifier/test

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index f154afbe2..7bcf2bc58 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -268,13 +268,16 @@ object ManageDependencies
 			ivy.pushContext()
 			try
 			{
-				moduleDescriptor.right.flatMap(checkModule).right.flatMap { mdAndConf =>
-					doWithIvy(ivy, mdAndConf._1, mdAndConf._2)
+				moduleDescriptor.right.flatMap(checkModule).right.flatMap { case (md, conf) =>
+					addExtraNamespaces(toDefaultModuleDescriptor(md))
+					doWithIvy(ivy, md, conf)
 				}
 			}
 			finally { ivy.popContext() }
 		}
 	}
+	private def addExtraNamespaces(md: DefaultModuleDescriptor): Unit =
+		md.getExtraAttributesNamespaces.asInstanceOf[java.util.Map[String,String]].put("m", "m")
 	/** Checks the immediate dependencies of module for dependencies on scala jars and verifies that the version on the
 	* dependencies matches scalaVersion. */
 	private def checkDependencies(module: ModuleDescriptor, scalaVersion: String, configurations: Iterable[Configuration]): Option[String] =
@@ -488,8 +491,9 @@ object ManageDependencies
 			}
 			for(artifact <- dependency.explicitArtifacts)
 			{
-				import artifact.{name, `type`, extension, url}
-				val ivyArtifact = new DefaultDependencyArtifactDescriptor(dependencyDescriptor, name, `type`, extension, url.getOrElse(null), null)
+				import artifact.{name, classifier, `type`, extension, url}
+				val extraMap = extra(artifact)
+				val ivyArtifact = new DefaultDependencyArtifactDescriptor(dependencyDescriptor, name, `type`, extension, url.getOrElse(null), extraMap)
 				for(conf <- dependencyDescriptor.getModuleConfigurations)
 					dependencyDescriptor.addDependencyArtifact(conf, ivyArtifact)
 			}
@@ -513,6 +517,8 @@ object ManageDependencies
 			configurationStrings.foreach(configuration => moduleID.addArtifact(configuration, ivyArtifact))
 		}
 	}
+	private def extra(artifact: Artifact) =
+		artifact.classifier.map(c => wrap.Wrappers.javaMap("m:classifier" -> c)).getOrElse(null)
 	private def toURL(file: File) = file.toURI.toURL
 	/** Adds the ivy.xml main artifact. */
 	private def addMainArtifact(moduleID: DefaultModuleDescriptor)
@@ -551,7 +557,7 @@ object ManageDependencies
 	}
 	private def toIvyArtifact(moduleID: ModuleDescriptor, a: Artifact, configurations: Iterable[String]): MDArtifact =
 	{
-		val artifact = new MDArtifact(moduleID, a.name, a.`type`, a.extension)
+		val artifact = new MDArtifact(moduleID, a.name, a.`type`, a.extension, null, extra(a))
 		configurations.foreach(artifact.addConfiguration)
 		artifact
 	}
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 9063e901b..f4a9ff4a5 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -60,6 +60,7 @@ final case class ModuleID(organization: String, name: String, revision: String,
 	def intransitive() = ModuleID(organization, name, revision, configurations, isChanging, false, explicitArtifacts)
 	def changing() = ModuleID(organization, name, revision, configurations, true, isTransitive, explicitArtifacts)
 	def from(url: String) = artifacts(Artifact(name, new URL(url)))
+	def classifier(c: String) = artifacts(Artifact(name, c))
 	def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts)
 }
 object ModuleID
@@ -319,12 +320,13 @@ final case class Configuration(name: String, description: String, isPublic: Bool
 	override def toString = name
 }
 
-final case class Artifact(name: String, `type`: String, extension: String, configurations: Iterable[Configuration], url: Option[URL]) extends NotNull
+final case class Artifact(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL]) extends NotNull
 object Artifact
 {
-	def apply(name: String): Artifact = Artifact(name, defaultType, defaultExtension, Nil, None)
-	def apply(name: String, `type`: String, extension: String): Artifact = Artifact(name, `type`, extension, Nil, None)
-	def apply(name: String, url: URL): Artifact =Artifact(name, extract(url, defaultType), extract(url, defaultExtension), Nil, Some(url))
+	def apply(name: String): Artifact = Artifact(name, defaultType, defaultExtension, None, Nil, None)
+	def apply(name: String, classifier: String): Artifact = Artifact(name, defaultType, defaultExtension, Some(classifier), Nil, None)
+	def apply(name: String, `type`: String, extension: String): Artifact = Artifact(name, `type`, extension, None, Nil, None)
+	def apply(name: String, url: URL): Artifact =Artifact(name, extract(url, defaultType), extract(url, defaultExtension), None, Nil, Some(url))
 	val defaultExtension = "jar"
 	val defaultType = "jar"
 	private[this] def extract(url: URL, default: String) =
diff --git a/src/main/scala/sbt/wrap/Wrappers.scala b/src/main/scala/sbt/wrap/Wrappers.scala
index 34f0ba55b..e78ca2207 100644
--- a/src/main/scala/sbt/wrap/Wrappers.scala
+++ b/src/main/scala/sbt/wrap/Wrappers.scala
@@ -9,6 +9,14 @@ import java.util.{Map => JMap, Set => JSet}
 
 private[sbt] object Wrappers
 {
+	def javaMap[K,V](pairs: (K,V)*) =
+	{
+		val basic = basicMap[K,V]
+		for( (k,v) <- pairs)
+			basic(k) = v
+		basic.underlying
+	}
+	def basicMap[K,V] = new MutableMapWrapper(new java.util.HashMap[K,V])
 	def identityMap[K,V] = new MutableMapWrapper(new java.util.IdentityHashMap[K,V])
 	def weakMap[K,V] = new MutableMapWrapper(new java.util.WeakHashMap[K,V])
 	def toList[K,V](s: java.util.Map[K,V]): List[(K,V)] = toList(s.entrySet).map(e => (e.getKey, e.getValue))
diff --git a/src/sbt-test/dependency-management/classifier/project/build.properties b/src/sbt-test/dependency-management/classifier/project/build.properties
new file mode 100644
index 000000000..0f796df80
--- /dev/null
+++ b/src/sbt-test/dependency-management/classifier/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test Classifier
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/classifier/project/build/Test.scala b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
new file mode 100644
index 000000000..5d7f24f5e
--- /dev/null
+++ b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	val testng = "org.testng" % "testng" % "5.7" classifier "jdk15"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/classifier/test b/src/sbt-test/dependency-management/classifier/test
new file mode 100644
index 000000000..93397d07c
--- /dev/null
+++ b/src/sbt-test/dependency-management/classifier/test
@@ -0,0 +1,2 @@
+> update
+[success]
\ No newline at end of file

From d0a9e631405527f19e7b13315534568a8c8ff3cb Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 22 Jul 2009 12:05:50 +0000
Subject: [PATCH 034/268] Fixed dynamic task checking

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@880 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/TaskManager.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/TaskManager.scala b/src/main/scala/sbt/TaskManager.scala
index 55960d124..b8043fd05 100644
--- a/src/main/scala/sbt/TaskManager.scala
+++ b/src/main/scala/sbt/TaskManager.scala
@@ -45,8 +45,8 @@ trait TaskManager{
 			this(None, description, dependencies, interactive, action)
 		checkTaskDependencies(dependencies)
 		def manager: ManagerType = TaskManager.this
-		def name = explicitName.getOrElse(implicitName)
-		private[sbt] def implicitName = taskNameString(this)
+		def name = explicitName.getOrElse(taskNameString(this))
+		private[sbt] def implicitName = taskName(this)
 		def named(name: String) = construct(Some(name), description,dependencies, interactive, action)
 		override def toString = "Task " + name
 		
@@ -87,7 +87,7 @@ trait TaskManager{
 	* Returns the task if it is valid.*/
 	private def checkDynamic(task: Project#Task) =
 	{
-		for(t <- task.topologicalSort; staticName <- t.implicitName)
+		for(t <- task.topologicalSort if !(t eq task); staticName <- t.implicitName)
 			error("Dynamic task " + task.name + " depends on static task " + staticName)
 		task
 	}

From 6cbe27ed9592fe8d1663591456010e9851c14184 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 25 Jul 2009 21:43:25 +0000
Subject: [PATCH 035/268] Fixed scripted test framework to test version of sbt
 being built.  Trying out cross-classloader logger.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@884 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 scripted/src/main/scala/Scripted.scala       | 37 +++++++++------
 scripted/src/main/scala/ScriptedLoader.scala | 29 ------------
 scripted/src/main/scala/ScriptedLogger.scala | 50 ++++++++++++++++++++
 scripted/src/main/scala/ScriptedTests.scala  | 13 +++--
 4 files changed, 83 insertions(+), 46 deletions(-)
 delete mode 100644 scripted/src/main/scala/ScriptedLoader.scala
 create mode 100644 scripted/src/main/scala/ScriptedLogger.scala

diff --git a/scripted/src/main/scala/Scripted.scala b/scripted/src/main/scala/Scripted.scala
index 76190ce17..4d4a7ab53 100644
--- a/scripted/src/main/scala/Scripted.scala
+++ b/scripted/src/main/scala/Scripted.scala
@@ -4,7 +4,9 @@
 package sbt.test
 
 import Scripted._
+import FileUtilities.{classLocation, sbtJar, scalaCompilerJar, scalaLibraryJar, wrapNull}
 import java.io.File
+import java.net.URLClassLoader
 
 trait ScalaScripted extends BasicScalaProject with Scripted with MavenStyleScalaPaths
 {
@@ -16,7 +18,7 @@ trait ScalaScripted extends BasicScalaProject with Scripted with MavenStyleScala
 	
 	lazy val scriptedOnly = scriptedMethodTask(scriptedDependencies : _*)
 	
-	override def scriptedClasspath = runClasspath +++ Path.lazyPathFinder { Path.fromFile(FileUtilities.sbtJar) :: Nil }
+	override def scriptedClasspath = runClasspath +++ Path.lazyPathFinder { Path.fromFile(sbtJar) :: Nil }
 }
 trait SbtScripted extends ScalaScripted
 {
@@ -35,32 +37,39 @@ final case class ScriptedTest(group: String, name: String) extends NotNull
 trait Scripted extends Project with MultiTaskProject
 {
 	def sbtTests: Path
-	def scriptedTask(dependencies: ManagedTask*) = compoundTask(scriptedTests(listTests, dependencies : _*))
+	def scriptedTask(dependencies: ManagedTask*) = dynamic(scriptedTests(listTests, dependencies : _*))
 	def scriptedMethodTask(dependencies: ManagedTask*) = multiTask(listTests.map(_.toString).toList) { includeFunction =>
 		scriptedTests(listTests.filter(test => includeFunction(test.toString)), dependencies : _*)
 	}
 	def listTests = (new ListTests(sbtTests.asFile, include _, log)).listTests
 	def scriptedTests(tests: Seq[ScriptedTest], dependencies: ManagedTask*) =
 	{
-		// load ScriptedTests using a ClassLoader that loads from the project classpath so that the version
-		// of sbt being built is tested, not the one doing the building.
-		val loader = ScriptedLoader(_scriptedClasspath.toArray)
-		val scriptedClass = Class.forName(ScriptedClassName, true, loader)
-		val scriptedConstructor = scriptedClass.getConstructor(classOf[File], classOf[ClassLoader])
-		val rawRunner = scriptedConstructor.newInstance(sbtTests.asFile, loader)
-		val runner = rawRunner.asInstanceOf[{def scriptedTest(group: String, name: String, log: Logger): Option[String]}]
+		val localLogger = new LocalLogger(log)
+		lazy val runner =
+		{
+			// load ScriptedTests using a ClassLoader that loads from the project classpath so that the version
+			// of sbt being built is tested, not the one doing the building.
+			val filtered = new FilteredLoader(ClassLoader.getSystemClassLoader, Seq("sbt.", "scala.", "ch.epfl.", "org.apache.", "org.jsch."))
+			val loader = new URLClassLoader(_scriptedClasspath.toArray, filtered)
+			val scriptedClass = Class.forName(ScriptedClassName, true, loader)
+			val scriptedConstructor = scriptedClass.getConstructor(classOf[File], classOf[ClassLoader])
+			val rawRunner = scriptedConstructor.newInstance(sbtTests.asFile, loader)
+			rawRunner.asInstanceOf[{def scriptedTest(group: String, name: String, log: Reflected.Logger): String}]
+		}
 		
 		val startTask = task { None } named("scripted-test-start") dependsOn(dependencies  : _*)
-		def scriptedTest(test: ScriptedTest) = task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask)
+		def scriptedTest(test: ScriptedTest) =
+			task { unwrapOption(runner.scriptedTest(test.group, test.name, localLogger)) } named test.toString dependsOn(startTask)
 		val testTasks = tests.map(scriptedTest)
 		task { None } named("scripted-test-complete") dependsOn(testTasks : _*)
 	}
+	private def unwrapOption[T](s: T): Option[T] = if(s == null) None else Some(s)
 	/** The classpath to use for scripted tests.   This ensures that the version of sbt being built is the one used for testing.*/
 	private def _scriptedClasspath =
 	{
-		val buildClasspath = FileUtilities.classLocation[Scripted]
-		val scalacJar = FileUtilities.scalaCompilerJar.toURI.toURL
-		buildClasspath :: scalacJar :: scriptedClasspath.get.map(_.asURL).toList
+		val buildClasspath = classLocation[Scripted]
+		val scalaJars = List(scalaLibraryJar, scalaCompilerJar).map(_.toURI.toURL).toList
+		buildClasspath :: scalaJars ::: scriptedClasspath.get.map(_.asURL).toList
 	}
 	def scriptedClasspath: PathFinder = Path.emptyPathFinder
 	
@@ -71,7 +80,7 @@ private[test] object Scripted
 {
 	val ScriptedClassName = "sbt.test.ScriptedTests"
 	val SbtTestDirectoryName = "sbt-test"
-	def list(directory: File, filter: java.io.FileFilter) = FileUtilities.wrapNull(directory.listFiles(filter))
+	def list(directory: File, filter: java.io.FileFilter) = wrapNull(directory.listFiles(filter))
 }
 private[test] final class ListTests(baseDirectory: File, accept: ScriptedTest => Boolean, log: Logger) extends NotNull
 {
diff --git a/scripted/src/main/scala/ScriptedLoader.scala b/scripted/src/main/scala/ScriptedLoader.scala
deleted file mode 100644
index 4ef45e3b7..000000000
--- a/scripted/src/main/scala/ScriptedLoader.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009  Mark Harrah
- */
-package sbt.test
-
-import java.net.URL
-
-object ScriptedLoader
-{
-	def apply(paths: Array[URL]): ClassLoader = new ScriptedLoader(paths)
-}
-private class ScriptedLoader(paths: Array[URL]) extends LoaderBase(paths, classOf[ScriptedLoader].getClassLoader)
-{
-	private val delegateFor = List("sbt.Logger", "sbt.LogEvent", "sbt.SetLevel", "sbt.Success", "sbt.Log", "sbt.SetTrace", "sbt.Trace", "sbt.ControlEvent")
-	def doLoadClass(className: String): Class[_] =
-	{
-		// Logger needs to be loaded from the version of sbt building the project because we need to pass
-		// a Logger from that loader into ScriptedTests.
-		// All other sbt classes should be loaded from the project classpath so that we test those classes with 'scripted'
-		if(!shouldDelegate(className) && (className.startsWith("sbt.") || className.startsWith("scala.tools.")))
-			findClass(className)
-		else
-			selfLoadClass(className)
-	}
-
-	private def shouldDelegate(className: String) = delegateFor.exists(check => isNestedOrSelf(className, check))
-	private def isNestedOrSelf(className: String, checkAgainst: String) =
-		className == checkAgainst || className.startsWith(checkAgainst + "$")
-}
\ No newline at end of file
diff --git a/scripted/src/main/scala/ScriptedLogger.scala b/scripted/src/main/scala/ScriptedLogger.scala
new file mode 100644
index 000000000..e7be8b30a
--- /dev/null
+++ b/scripted/src/main/scala/ScriptedLogger.scala
@@ -0,0 +1,50 @@
+package sbt.test
+
+object Reflected
+{
+	type Logger =
+	{
+		def enableTrace(flag: Boolean): Unit
+		def traceEnabled: Boolean
+		def getLevel: Int
+		def setLevel(level: Int): Unit
+
+		def trace(t: F0[Throwable]): Unit
+		def success(message: F0[String]): Unit
+		def log(level: Int, message: F0[String]): Unit
+		def control(event: Int, message: F0[String]): Unit
+	}
+	type F0[T] = 
+	{
+		def apply(): T
+	}
+}
+
+final class LocalLogger(logger: Logger) extends NotNull
+{
+	import Reflected.F0
+	def enableTrace(flag: Boolean) = logger.enableTrace(flag)
+	def traceEnabled = logger.traceEnabled
+	def getLevel = logger.getLevel.id
+	def setLevel(level: Int) = logger.setLevel(Level(level))
+
+	def trace(t: F0[Throwable]) = logger.trace(t())
+	def success(message: F0[String]) = logger.success(message())
+	def log(level: Int, message: F0[String]) = logger.log(Level(level), message())
+	def control(event: Int, message: F0[String]) = logger.control(ControlEvent(event), message())
+}
+
+final class RemoteLogger(logger: Reflected.Logger) extends Logger
+{
+	private final class F0[T](s: => T) extends NotNull { def apply(): T = s }
+	def getLevel: Level.Value = Level(logger.getLevel)
+	def setLevel(newLevel: Level.Value) = logger.setLevel(newLevel.id)
+	def enableTrace(flag: Boolean) = logger.enableTrace(flag)
+	def traceEnabled = logger.traceEnabled
+	
+	def trace(t: => Throwable) = logger.trace(new F0(t))
+	def success(message: => String) = logger.success(new F0(message))
+	def log(level: Level.Value, message: => String) = logger.log(level.id, new F0(message))
+	def control(event: ControlEvent.Value, message: => String) = logger.control(event.id, new F0(message))
+	def logAll(events: Seq[LogEvent]) = events.foreach(log)
+}
\ No newline at end of file
diff --git a/scripted/src/main/scala/ScriptedTests.scala b/scripted/src/main/scala/ScriptedTests.scala
index 4c3982bfa..1016fa72d 100644
--- a/scripted/src/main/scala/ScriptedTests.scala
+++ b/scripted/src/main/scala/ScriptedTests.scala
@@ -14,12 +14,19 @@ final class ScriptedTests(testResources: Resources) extends NotNull
 	val ScriptFilename = "test"
 	import testResources._
 	
-	def scriptedTest(group: String, name: String, log: Logger): Option[String] =
-		readOnlyResourceDirectory(group, name).fold(err => Some(err), testDirectory => scriptedTest(testDirectory, log))
-	def scriptedTest(testDirectory: File, log: Logger): Option[String] =
+	private def printClass(c: Class[_]) = println(c.getName + " loader=" +c.getClassLoader + " location=" + FileUtilities.classLocationFile(c))
+	
+	def scriptedTest(group: String, name: String, logger: Reflected.Logger): String =
+	{
+		val log = new RemoteLogger(logger)
+		val result = readOnlyResourceDirectory(group, name).fold(err => Some(err), testDirectory => scriptedTest(testDirectory, log))
+		wrapOption(result)
+	}
+	private def scriptedTest(testDirectory: File, log: Logger): Option[String] =
 	{
 		(for(script <- (new TestScriptParser(testDirectory, log)).parse(new File(testDirectory, ScriptFilename)).right;
 			u <- withProject(testDirectory, log)(script).right )
 		yield u).left.toOption
 	}
+	private[this] def wrapOption[T >: Null](s: Option[T]): T = s match { case Some(t) => t; case None => null }
 }

From ff97bbec4b300804fada37b5c06bc9715e094d09 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 26 Jul 2009 19:25:54 +0000
Subject: [PATCH 036/268]  * Cleanup  * Exposed
 ClasspathUtilities.toLoader(PathFinder) methods  * Implemented adding project
 dependencies for Ivy files

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@885 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala  | 15 ++++++++++-----
 src/main/scala/sbt/ClasspathUtilities.scala | 11 +++++++----
 src/main/scala/sbt/Logger.scala             |  1 -
 src/main/scala/sbt/ManageDependencies.scala |  2 +-
 src/main/scala/sbt/TaskManager.scala        |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 163a69af3..2669b1664 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -391,19 +391,24 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 				Nil
 			pathPatterns.map(_.relativePath)
 		}
-		def extraDependencies: Iterable[ModuleID] = Nil//deliverProjectDependencies
+		def extraDependencies: Iterable[ModuleID] = deliverProjectDependencies
 		/**  The configurations to include in the publish/deliver action: specify none for all public configurations. */
 		def configurations: Option[Iterable[Configuration]] = None
 	}
 	
+	private[this] def depMap[T](f: BasicManagedProject => T) =
+		topologicalSort.dropRight(1).flatMap { case m: BasicManagedProject => f(m) :: Nil; case _ => Nil }
+	
 	lazy val update = updateAction
 	lazy val makePom = makePomAction
-	lazy val deliverLocal = deliverLocalAction
-	lazy val publishLocal = publishLocalAction
-	lazy val deliver = deliverAction
-	lazy val publish = publishAction
 	lazy val cleanLib = cleanLibAction
 	lazy val cleanCache = cleanCacheAction
+	// deliver must run after its dependencies' `publish` so that the artifacts produced by the dependencies can be resolved
+	//  (deliver requires a resolve first)
+	lazy val deliverLocal: Task = deliverLocalAction dependsOn(depMap(_.publishLocal) : _*)
+	lazy val publishLocal: Task = publishLocalAction
+	lazy val deliver: Task = deliverAction dependsOn(depMap(_.publish) : _*)
+	lazy val publish: Task = publishAction
 }
 
 object BasicManagedProject
diff --git a/src/main/scala/sbt/ClasspathUtilities.scala b/src/main/scala/sbt/ClasspathUtilities.scala
index 878798002..29f71bb48 100644
--- a/src/main/scala/sbt/ClasspathUtilities.scala
+++ b/src/main/scala/sbt/ClasspathUtilities.scala
@@ -9,7 +9,7 @@ import java.util.Collections
 import scala.collection.Set
 import scala.collection.mutable.{HashSet, ListBuffer}
 
-private[sbt] object ClasspathUtilities
+object ClasspathUtilities
 {
 	def toClasspath(finder: PathFinder): Array[URL] = toClasspath(finder.get)
 	def toClasspath(paths: Iterable[Path]): Array[URL] = paths.map(_.asURL).toSeq.toArray
@@ -18,13 +18,16 @@ private[sbt] object ClasspathUtilities
 	def toLoader(paths: Iterable[Path]): ClassLoader = new URLClassLoader(toClasspath(paths), getClass.getClassLoader)
 	def toLoader(paths: Iterable[Path], parent: ClassLoader): ClassLoader = new URLClassLoader(toClasspath(paths), parent)
 	
+	private[sbt] def printSource(c: Class[_]) =
+		println(c.getName + " loader=" +c.getClassLoader + " location=" + FileUtilities.classLocationFile(c))
+	
 	def isArchive(path: Path): Boolean = isArchive(path.asFile)
 	def isArchive(file: File): Boolean = isArchiveName(file.getName)
 	def isArchiveName(fileName: String) = fileName.endsWith(".jar") || fileName.endsWith(".zip")
 	// Partitions the given classpath into (jars, directories)
-	def separate(paths: Iterable[File]): (Iterable[File], Iterable[File]) = paths.partition(isArchive)
+	private[sbt] def separate(paths: Iterable[File]): (Iterable[File], Iterable[File]) = paths.partition(isArchive)
 	// Partitions the given classpath into (jars, directories)
-	def separatePaths(paths: Iterable[Path]) = separate(paths.map(_.asFile.getCanonicalFile))
+	private[sbt] def separatePaths(paths: Iterable[Path]) = separate(paths.map(_.asFile.getCanonicalFile))
 	private[sbt] def buildSearchPaths(classpath: Iterable[Path]): (wrap.Set[File], wrap.Set[File]) =
 	{
 		val (jars, dirs) = separatePaths(classpath)
@@ -40,7 +43,7 @@ private[sbt] object ClasspathUtilities
 	}
 	
 	/** Returns all entries in 'classpath' that correspond to a compiler plugin.*/
-	def compilerPlugins(classpath: Iterable[Path]): Iterable[File] =
+	private[sbt] def compilerPlugins(classpath: Iterable[Path]): Iterable[File] =
 	{
 		val loader = new URLClassLoader(classpath.map(_.asURL).toList.toArray)
 		wrap.Wrappers.toList(loader.getResources("scalac-plugin.xml")).flatMap(asFile)
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index 3ee042897..12b820808 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -35,7 +35,6 @@ abstract class Logger extends NotNull
 	def log(level: Level.Value, message: => String): Unit
 	def control(event: ControlEvent.Value, message: => String): Unit
 	
-	/** Use this method to ensure calls. */
 	def logAll(events: Seq[LogEvent]): Unit
 	/** Defined in terms of other methods in Logger and should not be called from them. */
 	final def log(event: LogEvent)
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 7bcf2bc58..76f293543 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -408,7 +408,7 @@ object ManageDependencies
 			Control.trapUnit("Could not deliver: ", ivyConfig.log)
 			{
 				val module = addLateDependencies(ivy, md, default, extraDependencies)
-				resolve(ivy, updateConfig, module) orElse
+				resolve(ivy, updateConfig, module) orElse // todo: set download = false for resolve
 				{
 					val revID = module.getModuleRevisionId
 					val options = DeliverOptions.newInstance(ivy.getSettings).setStatus(status)
diff --git a/src/main/scala/sbt/TaskManager.scala b/src/main/scala/sbt/TaskManager.scala
index b8043fd05..8977c728f 100644
--- a/src/main/scala/sbt/TaskManager.scala
+++ b/src/main/scala/sbt/TaskManager.scala
@@ -82,7 +82,7 @@ trait TaskManager{
 		def work = createWork
 	}
 	def dynamic(createTask: => Project#Task) = new CompoundTask(SubWork[Project#Task](checkDynamic(createTask)))
-	
+	@deprecated def compoundTask(createTask: => Project#Task) = dynamic(createTask)
 	/** Verifies that the given dynamically created task does not depend on any statically defined tasks.
 	* Returns the task if it is valid.*/
 	private def checkDynamic(task: Project#Task) =

From 11339e35180239cd3bab9232ecb27a13c16e5e6f Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 26 Jul 2009 23:15:02 +0000
Subject: [PATCH 037/268] Track dependencies for Java sources using classfile
 parsing (with the usual limitations of this approach)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@886 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BuilderProject.scala       |   4 +-
 src/main/scala/sbt/Conditional.scala          |   8 +-
 src/main/scala/sbt/DefaultProject.scala       |   2 +
 src/main/scala/sbt/IntegrationTesting.scala   |   1 +
 src/main/scala/sbt/ProjectPaths.scala         |  10 +-
 src/main/scala/sbt/classfile/Analyze.scala    |  98 ++++++++++
 src/main/scala/sbt/classfile/ClassFile.scala  |  65 +++++++
 src/main/scala/sbt/classfile/Parser.scala     | 171 ++++++++++++++++++
 .../java/separate/project/build.properties    |   2 +
 .../project/build/src/TestProject.scala       |   6 +
 .../java/separate/src/main/java/F.java        |   5 +
 .../java/separate/src/main/scala/Dual.scala   |  11 ++
 .../java/separate/src/main/scala/FImpl.scala  |   3 +
 src/sbt-test/java/separate/test               |   9 +
 .../java-basic/changes/A.java                 |   6 +
 .../java-basic/changes/A2.java                |   6 +
 .../java-basic/changes/B1.java                |   6 +
 .../java-basic/changes/B2.java                |   6 +
 .../java-basic/changes/B3.java                |   6 +
 .../java-basic/project/build.properties       |   2 +
 .../source-dependencies/java-basic/test       |  61 +++++++
 21 files changed, 482 insertions(+), 6 deletions(-)
 create mode 100644 src/main/scala/sbt/classfile/Analyze.scala
 create mode 100644 src/main/scala/sbt/classfile/ClassFile.scala
 create mode 100644 src/main/scala/sbt/classfile/Parser.scala
 create mode 100644 src/sbt-test/java/separate/project/build.properties
 create mode 100644 src/sbt-test/java/separate/project/build/src/TestProject.scala
 create mode 100644 src/sbt-test/java/separate/src/main/java/F.java
 create mode 100644 src/sbt-test/java/separate/src/main/scala/Dual.scala
 create mode 100644 src/sbt-test/java/separate/src/main/scala/FImpl.scala
 create mode 100644 src/sbt-test/java/separate/test
 create mode 100644 src/sbt-test/source-dependencies/java-basic/changes/A.java
 create mode 100644 src/sbt-test/source-dependencies/java-basic/changes/A2.java
 create mode 100644 src/sbt-test/source-dependencies/java-basic/changes/B1.java
 create mode 100644 src/sbt-test/source-dependencies/java-basic/changes/B2.java
 create mode 100644 src/sbt-test/source-dependencies/java-basic/changes/B3.java
 create mode 100644 src/sbt-test/source-dependencies/java-basic/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/java-basic/test

diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index ebdf8372b..738833939 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -47,6 +47,7 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 		new BuilderCompileConfiguration
 		{
 			def label = "builder"
+			def sourceRoots = info.projectPath +++ path(DefaultSourceDirectoryName)
 			def sources = (info.projectPath * sourceFilter) +++ path(DefaultSourceDirectoryName).descendentsExcept(sourceFilter, defaultExcludes)
 			def outputDirectory = compilePath
 			def classpath = projectClasspath
@@ -188,7 +189,8 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 			new BuilderCompileConfiguration
 			{
 				def label = "plugin builder"
-				def sources = descendents(managedSourcePath, sourceFilter)
+				def sourceRoots = managedSourcePath
+				def sources = descendents(sourceRoots, sourceFilter)
 				def outputDirectory = outputPath / "plugin-classes"
 				def classpath: PathFinder = pluginClasspath +++ sbtJarPath
 				def analysisPath = outputPath / "plugin-analysis"
diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
index fe757a469..fb31fb60f 100644
--- a/src/main/scala/sbt/Conditional.scala
+++ b/src/main/scala/sbt/Conditional.scala
@@ -52,7 +52,10 @@ trait Conditional[Source, Product, External] extends NotNull
 		removedSources --= sourcesSnapshot
 		val removedCount = removedSources.size
 		for(removed <- removedSources)
+		{
+			log.debug("Source " + removed + " removed.")
 			analysis.removeDependent(removed)
+		}
 		
 		val unmodified = new HashSet[Source]
 		val modified = new HashSet[Source]
@@ -186,6 +189,7 @@ trait Conditional[Source, Product, External] extends NotNull
 abstract class AbstractCompileConfiguration extends NotNull
 {
 	def label: String
+	def sourceRoots: PathFinder
 	def sources: PathFinder
 	def outputDirectory: Path
 	def classpath: PathFinder
@@ -321,7 +325,9 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 		val id = AnalysisCallback.register(analysisCallback)
 		val allOptions = (("-Xplugin:" + FileUtilities.sbtJar.getAbsolutePath) ::
 			("-P:sbt-analyzer:callback:" + id.toString) :: Nil) ++ options
-		val r = (new Compile(config.maxErrors))(label, dirtySources, classpathString, outputDirectory, allOptions, javaOptions, compileOrder, log)
+		def run = (new Compile(config.maxErrors))(label, dirtySources, classpathString, outputDirectory, allOptions, javaOptions, compileOrder, log)
+		val loader = ClasspathUtilities.toLoader(cp)
+		val r = classfile.Analyze(projectPath, outputDirectory, dirtySources, sourceRoots.get, log)(analysis.allProducts, analysisCallback, loader)(run)
 		AnalysisCallback.unregister(id)
 		if(log.atLevel(Level.Debug))
 		{
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 7552a1fa1..b08419246 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -190,6 +190,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	{
 		def baseCompileOptions = compileOptions
 		def label = mainLabel
+		def sourceRoots = mainSourceRoots
 		def sources = mainSources
 		def outputDirectory = mainCompilePath
 		def classpath = compileClasspath
@@ -201,6 +202,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	{
 		def baseCompileOptions = testCompileOptions
 		def label = testLabel
+		def sourceRoots = testSourceRoots
 		def sources = testSources
 		def outputDirectory = testCompilePath
 		def classpath = testClasspath
diff --git a/src/main/scala/sbt/IntegrationTesting.scala b/src/main/scala/sbt/IntegrationTesting.scala
index f37592748..2329e06ac 100644
--- a/src/main/scala/sbt/IntegrationTesting.scala
+++ b/src/main/scala/sbt/IntegrationTesting.scala
@@ -68,6 +68,7 @@ trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTe
 	class IntegrationTestCompileConfig extends BaseCompileConfig
 	{
 		def label = integrationTestLabel
+		def sourceRoots = integrationTestScalaSourceRoots
 		def sources = integrationTestSources
 		def outputDirectory = integrationTestCompilePath
 		def classpath = integrationTestClasspath
diff --git a/src/main/scala/sbt/ProjectPaths.scala b/src/main/scala/sbt/ProjectPaths.scala
index c29dc41fa..7a75faa40 100644
--- a/src/main/scala/sbt/ProjectPaths.scala
+++ b/src/main/scala/sbt/ProjectPaths.scala
@@ -19,6 +19,8 @@ trait ScalaPaths extends PackagePaths
 	def mainSources: PathFinder
 	/** A PathFinder that selects all test sources.*/
 	def testSources: PathFinder
+	def mainSourceRoots: PathFinder
+	def testSourceRoots: PathFinder
 	/** A PathFinder that selects all main resources.*/
 	def mainResources: PathFinder
 	/** A PathFinder that selects all test resources. */
@@ -62,8 +64,6 @@ trait ScalaPaths extends PackagePaths
 
 trait BasicScalaPaths extends Project with ScalaPaths
 {
-	def mainSourceRoots: PathFinder
-	def testSourceRoots: PathFinder
 	def mainResourcesPath: PathFinder
 	def testResourcesPath: PathFinder
 	def managedDependencyRootPath: Path
@@ -265,6 +265,7 @@ trait MavenStyleWebstartPaths extends WebstartPaths with MavenStyleScalaPaths
 trait IntegrationTestPaths extends NotNull
 {
 	def integrationTestSources: PathFinder
+	def integrationTestScalaSourceRoots: PathFinder
 	def integrationTestResourcesPath: Path
 
 	def integrationTestCompilePath: Path
@@ -273,8 +274,9 @@ trait IntegrationTestPaths extends NotNull
 trait BasicIntegrationTestPaths extends IntegrationTestPaths
 {
 	def integrationTestScalaSourcePath: Path
-	def integrationTestSources = sources(integrationTestScalaSourcePath)
-	protected def sources(base: Path): PathFinder
+	def integrationTestScalaSourceRoots: PathFinder = integrationTestScalaSourcePath
+	def integrationTestSources = sources(integrationTestScalaSourceRoots)
+	protected def sources(base: PathFinder): PathFinder
 }
 trait MavenStyleIntegrationTestPaths extends BasicIntegrationTestPaths with MavenStyleScalaPaths
 {
diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
new file mode 100644
index 000000000..bde2c1304
--- /dev/null
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -0,0 +1,98 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.classfile
+
+import scala.collection.mutable
+import mutable.{ArrayBuffer, Buffer}
+import java.io.File
+
+object Analyze
+{
+	def apply[T](basePath: Path, outputDirectory: Path, sources: Iterable[Path], roots: Iterable[Path], log: Logger)
+		(allProducts: => scala.collection.Set[Path], analysis: AnalysisCallback, loader: ClassLoader)
+		(compile: => Option[String]): Option[String] =
+	{
+		val sourceSet = Set(sources.toSeq : _*)
+		val classesFinder = outputDirectory ** GlobFilter("*.class")
+		val existingClasses = classesFinder.get
+		
+		// runs after compilation
+		def analyze()
+		{
+			val allClasses = Set(classesFinder.get.toSeq : _*)
+			val newClasses = allClasses -- existingClasses -- allProducts
+			
+			val productToSource = new mutable.HashMap[Path, Path]
+			val sourceToClassFiles = new mutable.HashMap[Path, Buffer[ClassFile]]
+			
+			// parse class files and assign classes to sources.  This must be done before dependencies, since the information comes
+			// as class->class dependencies that must be mapped back to source->class dependencies using the source+class assignment
+			for(newClass <- newClasses;
+				path <- Path.relativize(outputDirectory, newClass);
+				classFile = Parser(newClass.asFile, log);
+				sourceFile <- classFile.sourceFile;
+				source <- guessSourcePath(sourceSet, roots, classFile.className, log))
+			{
+				analysis.beginSource(source)
+				analysis.generatedClass(source, path)
+				productToSource(path) = source
+				sourceToClassFiles.getOrElseUpdate(source, new ArrayBuffer[ClassFile]) += classFile
+			}
+			
+			// get class to class dependencies and map back to source to class dependencies
+			for( (source, classFiles) <- sourceToClassFiles )
+			{
+				for(classFile <- classFiles if isTopLevel(classFile);
+					method <- classFile.methods; if method.isMain)
+						analysis.foundApplication(source, classFile.className)
+				def processDependency(tpeSlashed: String)
+				{
+					val tpe = tpeSlashed.replace('/','.')
+					Control.trapAndLog(log)
+					{
+						val clazz = Class.forName(tpe, false, loader)
+						val file = FileUtilities.classLocationFile(clazz)
+						if(file.isDirectory)
+						{
+							val resolved = resolveClassFile(file, tpeSlashed)
+							require(resolved.exists)
+							val resolvedPath = Path.fromFile(resolved)
+							if(Path.fromFile(file) == outputDirectory)
+							{
+								productToSource.get(resolvedPath) match
+								{
+									case Some(dependsOn) => analysis.sourceDependency(dependsOn, source)
+									case None => analysis.productDependency(resolvedPath, source)
+								}
+							}
+							else
+								analysis.classDependency(resolved, source)
+						}
+						else
+							analysis.jarDependency(file, source)
+					}
+				}
+				
+				classFiles.flatMap(_.types).foreach(processDependency)
+				analysis.endSource(source)
+			}
+		}
+		
+		compile orElse Control.convertErrorMessage(log)(analyze()).left.toOption
+	}
+	private def resolveClassFile(file: File, className: String): File = (file /: (className + ".class").split("""\\"""))(new File(_, _))
+	private def guessSourcePath(sources: scala.collection.Set[Path], roots: Iterable[Path], className: String, log: Logger) =
+	{
+		val relativeSourceFile = className.replace('.', '/') + ".java"
+		val candidates = roots.map(root => Path.fromString(root, relativeSourceFile)).filter(sources.contains).toList
+		candidates match
+		{
+			case Nil => log.warn("Could not determine source for class " + className)
+			case head :: Nil => ()
+			case _ =>log.warn("Multiple sources matched for class " + className + ": " + candidates.mkString(", "))
+		}
+		candidates
+	}
+	private def isTopLevel(classFile: ClassFile) = classFile.className.indexOf('$') < 0
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/classfile/ClassFile.scala b/src/main/scala/sbt/classfile/ClassFile.scala
new file mode 100644
index 000000000..f101261e2
--- /dev/null
+++ b/src/main/scala/sbt/classfile/ClassFile.scala
@@ -0,0 +1,65 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.classfile
+
+import Constants._
+import java.io.File
+
+trait ClassFile
+{
+	val majorVersion: Int
+	val minorVersion: Int
+	val fileName: String
+	val className: String
+	val superClassName: String
+	val interfaceNames: RandomAccessSeq[String]
+	val accessFlags: Int
+	val constantPool: RandomAccessSeq[Constant]
+	val fields: RandomAccessSeq[FieldOrMethodInfo]
+	val methods: RandomAccessSeq[FieldOrMethodInfo]
+	val attributes: RandomAccessSeq[AttributeInfo]
+	val sourceFile: Option[String]
+	def types: Set[String]
+	def stringValue(a: AttributeInfo): String
+}
+
+final case class Constant(tag: Byte, nameIndex: Int, typeIndex: Int, value: Option[AnyRef]) extends NotNull
+{
+	def this(tag: Byte, nameIndex: Int, typeIndex: Int) = this(tag, nameIndex, typeIndex, None)
+	def this(tag: Byte, nameIndex: Int) = this(tag, nameIndex, -1)
+	def this(tag: Byte, value: AnyRef) = this(tag, -1, -1, Some(value))
+	def wide = tag == ConstantLong || tag == ConstantDouble
+}
+final case class FieldOrMethodInfo(accessFlags: Int, name: Option[String], descriptor: Option[String], attributes: RandomAccessSeq[AttributeInfo]) extends NotNull
+{
+	def isStatic = (accessFlags&ACC_STATIC)== ACC_STATIC
+	def isPublic = (accessFlags&ACC_PUBLIC)==ACC_PUBLIC
+	def isMain = isPublic && isStatic && descriptor.filter(_ == "([Ljava/lang/String;)V").isDefined
+}
+final case class AttributeInfo(name: Option[String], value: Array[Byte]) extends NotNull
+{
+	def isNamed(s: String) = name.filter(s == _).isDefined
+	def isSignature = isNamed("Signature")
+	def isSourceFile = isNamed("SourceFile")
+}
+object Constants
+{
+	final val ACC_STATIC = 0x0008
+	final val ACC_PUBLIC = 0x0001
+
+	final val JavaMagic = 0xCAFEBABE
+	final val ConstantUTF8 = 1
+	final val ConstantUnicode = 2
+	final val ConstantInteger = 3
+	final val ConstantFloat = 4
+	final val ConstantLong = 5
+	final val ConstantDouble = 6
+	final val ConstantClass = 7
+	final val ConstantString = 8
+	final val ConstantField = 9
+	final val ConstantMethod = 10
+	final val ConstantInterfaceMethod = 11
+	final val ConstantNameAndType = 12
+	final val ClassDescriptor = 'L'
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/classfile/Parser.scala b/src/main/scala/sbt/classfile/Parser.scala
new file mode 100644
index 000000000..2c9c0eea6
--- /dev/null
+++ b/src/main/scala/sbt/classfile/Parser.scala
@@ -0,0 +1,171 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt.classfile
+
+import java.io.{DataInputStream, File, InputStream}
+
+// Translation of jdepend.framework.ClassFileParser by Mike Clark, Clarkware Consulting, Inc.
+// BSD Licensed
+//
+// Note that unlike the rest of sbt, some things might be null.
+
+import Constants._
+
+object Parser
+{
+	def apply(file: File, log: Logger): ClassFile = FileUtilities.readStreamValue(file, log)(parse(file.getCanonicalPath, log)).right.get
+	private def parse(fileName: String, log: Logger)(is: InputStream): Either[String, ClassFile] = Right(parseImpl(fileName, is, log))
+	private def parseImpl(filename: String, is: InputStream, log: Logger): ClassFile =
+	{
+		val in = new DataInputStream(is)
+		new ClassFile
+		{
+			assume(in.readInt() == JavaMagic, "Invalid class file: " + fileName)
+			
+			val fileName = filename
+			val minorVersion: Int = in.readUnsignedShort()
+			val majorVersion: Int = in.readUnsignedShort()
+
+			val constantPool = parseConstantPool(in)
+			val accessFlags: Int = in.readUnsignedShort()
+
+			val className = getClassConstantName(in.readUnsignedShort())
+			val superClassName = getClassConstantName(in.readUnsignedShort())
+			val interfaceNames = array(in.readUnsignedShort())(getClassConstantName(in.readUnsignedShort()))
+
+			val fields = readFieldsOrMethods()
+			val methods = readFieldsOrMethods()
+
+			val attributes = array(in.readUnsignedShort())(parseAttribute())
+
+			lazy val sourceFile =
+				for(sourceFileAttribute <- attributes.find(_.isSourceFile)) yield
+					toUTF8(entryIndex(sourceFileAttribute))
+
+			def stringValue(a: AttributeInfo) = toUTF8(entryIndex(a))
+
+			private def readFieldsOrMethods() = array(in.readUnsignedShort())(parseFieldOrMethodInfo())
+			private def toUTF8(entryIndex: Int) =
+			{
+				val entry = constantPool(entryIndex)
+				assume(entry.tag == ConstantUTF8, "Constant pool entry is not a UTF8 type: " + entryIndex)
+				entry.value.get.asInstanceOf[String]
+			}
+			private def getClassConstantName(entryIndex: Int) =
+			{
+				val entry = constantPool(entryIndex)
+				if(entry == null) ""
+				else slashesToDots(toUTF8(entry.nameIndex))
+			}
+			private def toString(index: Int) =
+			{
+				if(index <= 0) None
+				else Some(toUTF8(index))
+			}
+			private def parseFieldOrMethodInfo() =
+				new FieldOrMethodInfo(in.readUnsignedShort(), toString(in.readUnsignedShort()), toString(in.readUnsignedShort()),
+					array(in.readUnsignedShort())(parseAttribute()) )
+			private def parseAttribute() =
+			{
+				val nameIndex = in.readUnsignedShort()
+				val name = if(nameIndex == -1) None else Some(toUTF8(nameIndex))
+				val value = array(in.readInt())(in.readByte())
+				new AttributeInfo(name, value)
+			}
+
+			def types = Set((fieldTypes ++ methodTypes ++ classConstantReferences) : _*)
+
+			private def getTypes(fieldsOrMethods: Array[FieldOrMethodInfo]) =
+				fieldsOrMethods.flatMap { fieldOrMethod =>
+					descriptorToTypes(fieldOrMethod.descriptor)
+				}
+			
+			private def fieldTypes = getTypes(fields)
+			private def methodTypes = getTypes(methods)
+			
+			private def classConstantReferences =
+				constants.flatMap { constant =>
+					constant.tag match
+					{
+						case ConstantClass => toUTF8(constant.nameIndex) :: Nil
+						case _ => Nil
+					}
+				}
+			private def constants =
+			{
+				def next(i: Int, list: List[Constant]): List[Constant] =
+				{
+					if(i < constantPool.length)
+					{
+						val constant = constantPool(i)
+						next(if(constant.wide) i+2 else i+1, constant :: list)
+					}
+					else
+						list
+				}
+				next(1, Nil)
+			}
+		}
+    }
+    private def array[T](size: Int)(f: => T) = Array.fromFunction(i => f)(size)
+	private def parseConstantPool(in: DataInputStream) =
+	{
+		val constantPoolSize = in.readUnsignedShort()
+		val pool = new Array[Constant](constantPoolSize)
+		
+		def parse(i: Int): Unit =
+			if(i < constantPoolSize)
+			{
+				val constant = getConstant(in)
+				pool(i) = constant
+				parse( if(constant.wide) i+2 else i+1 )
+			}
+		
+		parse(1) // to lookup: why 1?
+		pool
+	}
+
+	private def getConstant(in: DataInputStream) =
+	{
+		val tag = in.readByte()
+		tag match
+		{
+			case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort())
+			case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType => 
+				new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort())
+			case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt()))
+			case ConstantFloat => new Constant(tag, new java.lang.Float(in.readFloat()))
+			case ConstantLong => new Constant(tag, new java.lang.Long(in.readLong()))
+			case ConstantDouble => new Constant(tag, new java.lang.Double(in.readDouble()))
+			case ConstantUTF8 => new Constant(tag, in.readUTF())
+			case _ => error("Unknown constant: " + tag)
+		}
+	}
+
+	private def toInt(v: Byte) = if(v < 0) v + 256 else v.toInt
+	private def entryIndex(a: AttributeInfo) =
+	{
+		val Array(v0, v1) = a.value
+		toInt(v0) * 256 + toInt(v1)
+	}
+
+	private def slashesToDots(s: String) = s.replace('/', '.')
+
+	private def descriptorToTypes(descriptor: Option[String]) =
+	{
+		def toTypes(descriptor: String, types: List[String]): List[String] =
+		{
+			val startIndex = descriptor.indexOf(ClassDescriptor)
+			if(startIndex < 0)
+				types
+			else
+			{
+				val endIndex = descriptor.indexOf(';', startIndex+1)
+				val tpe = slashesToDots(descriptor.substring(startIndex + 1, endIndex))
+				toTypes(descriptor.substring(endIndex), tpe :: types)
+			}
+		}
+		toTypes(descriptor.getOrElse(""), Nil)
+    }
+}
diff --git a/src/sbt-test/java/separate/project/build.properties b/src/sbt-test/java/separate/project/build.properties
new file mode 100644
index 000000000..cefcdcae9
--- /dev/null
+++ b/src/sbt-test/java/separate/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
diff --git a/src/sbt-test/java/separate/project/build/src/TestProject.scala b/src/sbt-test/java/separate/project/build/src/TestProject.scala
new file mode 100644
index 000000000..6f01635ae
--- /dev/null
+++ b/src/sbt-test/java/separate/project/build/src/TestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def compileOrder = CompileOrder.JavaThenScala
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/separate/src/main/java/F.java b/src/sbt-test/java/separate/src/main/java/F.java
new file mode 100644
index 000000000..2564e13b2
--- /dev/null
+++ b/src/sbt-test/java/separate/src/main/java/F.java
@@ -0,0 +1,5 @@
+package fj;
+
+public interface F<A, B> {
+  B f(A a);
+}
diff --git a/src/sbt-test/java/separate/src/main/scala/Dual.scala b/src/sbt-test/java/separate/src/main/scala/Dual.scala
new file mode 100644
index 000000000..89d5e538a
--- /dev/null
+++ b/src/sbt-test/java/separate/src/main/scala/Dual.scala
@@ -0,0 +1,11 @@
+package scalaz
+
+trait Dual[A] {
+  val value : A
+}
+
+object Dual {
+  implicit def dual[A](a: A) = new Dual[A] {
+    val value = a
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/separate/src/main/scala/FImpl.scala b/src/sbt-test/java/separate/src/main/scala/FImpl.scala
new file mode 100644
index 000000000..ac3778aee
--- /dev/null
+++ b/src/sbt-test/java/separate/src/main/scala/FImpl.scala
@@ -0,0 +1,3 @@
+package test
+
+trait FImpl[A,B] extends fj.F[A,B]
\ No newline at end of file
diff --git a/src/sbt-test/java/separate/test b/src/sbt-test/java/separate/test
new file mode 100644
index 000000000..fc6cce7bf
--- /dev/null
+++ b/src/sbt-test/java/separate/test
@@ -0,0 +1,9 @@
+> clean
+[success]
+
+> test
+[success]
+
+# this will fail if the sources are recompiled again (see the project definition)
+> test
+[success]
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/changes/A.java b/src/sbt-test/source-dependencies/java-basic/changes/A.java
new file mode 100644
index 000000000..c84f997f4
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-basic/changes/A.java
@@ -0,0 +1,6 @@
+package a;
+
+public class A
+{
+	public static int x() { return 3; }
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/changes/A2.java b/src/sbt-test/source-dependencies/java-basic/changes/A2.java
new file mode 100644
index 000000000..36270f805
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-basic/changes/A2.java
@@ -0,0 +1,6 @@
+package a.b;
+
+public class A
+{
+	public static int x() { return 3; }
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/changes/B1.java b/src/sbt-test/source-dependencies/java-basic/changes/B1.java
new file mode 100644
index 000000000..ec9a67e1a
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-basic/changes/B1.java
@@ -0,0 +1,6 @@
+package a.b;
+
+public class B
+{
+	public int y() { return 3; }
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/changes/B2.java b/src/sbt-test/source-dependencies/java-basic/changes/B2.java
new file mode 100644
index 000000000..551900114
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-basic/changes/B2.java
@@ -0,0 +1,6 @@
+package a.b;
+
+public class B
+{
+	public int y() { return a.A.x(); }
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/changes/B3.java b/src/sbt-test/source-dependencies/java-basic/changes/B3.java
new file mode 100644
index 000000000..1ec729b74
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-basic/changes/B3.java
@@ -0,0 +1,6 @@
+package a.b;
+
+public class B
+{
+	public static void main(String[] args) {}
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/project/build.properties b/src/sbt-test/source-dependencies/java-basic/project/build.properties
new file mode 100644
index 000000000..5838ca7f8
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-basic/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Basic Java Dependency Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/test b/src/sbt-test/source-dependencies/java-basic/test
new file mode 100644
index 000000000..5dca1b173
--- /dev/null
+++ b/src/sbt-test/source-dependencies/java-basic/test
@@ -0,0 +1,61 @@
+# Basic test for Java dependency tracking
+
+# A is a basic Java file with no dependencies.  Just a basic check for Java compilation
+$ copy-file changes/A.java src/main/java/a/A.java
+[success]
+> compile
+[success]
+
+# A2 is a basic Java file with no dependencies.  This is added to verify
+# that classes are properly mapped back to their source.
+# (There are two files named A.java now, one in a/ and one in a/b)
+$ copy-file changes/A2.java src/main/java/a/b/A.java
+[success]
+> compile
+[success]
+
+# This adds B, another basic Java file with no dependencies
+$ copy-file changes/B1.java src/main/java/a/b/B.java
+[success]
+> compile
+[success]
+
+# Now, modify B so that it depends on a.A
+# This ensures that dependencies on a source not included in the compilation
+# (a/A.java has not changed) are tracked
+$ copy-file changes/B2.java src/main/java/a/b/B.java
+[success]
+> compile
+[success]
+
+# Remove a.b.A and there should be no problem compiling, since B should
+# have recorded a dependency on a.A and not a.b.A
+$ delete src/main/java/a/b/A.java
+[success]
+> compile
+[success]
+
+# Remove a.A and B should be recompiled if the dependency on a.A was properly
+# recorded.  This should be a compile error, since we haven't updated B to not
+# depend on A
+$ delete src/main/java/a/A.java
+[success]
+> compile
+[failure]
+
+# Replace B with a new B that doesn't depend on a.A and so it should compile
+# It shouldn't run though, because it doesn't have a main method
+$ copy-file changes/B1.java src/main/java/a/b/B.java
+[success]
+> compile
+[success]
+> run
+[failure]
+
+
+# Replace B with a new B that has a main method and should therefore run
+# if the main method was properly detected
+$ copy-file changes/B3.java src/main/java/a/b/B.java
+[success]
+> run
+[success]
\ No newline at end of file

From ab7bdaedab01b705fa3c48e5c01167245ea1255c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 26 Jul 2009 23:17:24 +0000
Subject: [PATCH 038/268] Update notice and add license for JDepend-based
 classfile parser

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@887 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 NOTICE                   | 25 ++++++++++++++-----------
 licenses/LICENSE_jdepend | 29 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 licenses/LICENSE_jdepend

diff --git a/NOTICE b/NOTICE
index a249cda2e..07766ee52 100644
--- a/NOTICE
+++ b/NOTICE
@@ -2,28 +2,31 @@ Simple Build Tool (sbt)
 Copyright 2008, 2009 Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
 
 
+Portions based on code by Mike Clark in JDepend
+Copyright 1999-2004 Clarkware Consulting, Inc.
+Licensed under BSD-style license (see licenses/LICENSE_jdepend)
+
 Portions based on code by Pete Kirkham in Nailgun
 Copyright 2004, Martian Software, Inc
-Licensed under the Apache License, Version 2.0
-(see licenses/LICENSE_Apache)
+Licensed under the Apache License, Version 2.0 (see licenses/LICENSE_Apache)
 
 Portions based on code from the Scala compiler
 Copyright 2002-2008 EPFL, Lausanne
 Licensed under BSD-style license (see licenses/LICENSE_Scala)
 
 Portions based on code from specs
-Copyright (c) 2007-2008 Eric Torreborre
+Copyright 2007-2008 Eric Torreborre
 Licensed under MIT license (see licenses/LICENSE_specs)
 
-The following test frameworks are distributed with sbt (in
-the subversion repository):
- specs (see licenses/LICENSE_specs)
- ScalaCheck (see licenses/LICENSE_ScalaCheck)
- ScalaTest (see licenses/LICENSE_Apache)
+Portions based on code from ScalaTest
+Copyright 2001-2008 Artima, Inc.
+Licensed under the Apache License, Version 2.0(see licenses/LICENSE_Apache)
 
-Jetty is distributed with sbt (in the subversion repository) and is
-licensed under the Apache License, Version 2.0 (see
-licenses/LICENSE_Apache).
+Portions based on code from ScalaCheck
+Copyright 2007, Rickard Nilsson
+Licensed under BSD-style license (see licenses/LICENSE_ScalaCheck)
+
+Jetty is licensed under the Apache License, Version 2.0 (see licenses/LICENSE_Apache).
 
 ScalaTest is distributed with sbt (in the subversion repository)
 and requires the following notice:
diff --git a/licenses/LICENSE_jdepend b/licenses/LICENSE_jdepend
new file mode 100644
index 000000000..c26cd20fa
--- /dev/null
+++ b/licenses/LICENSE_jdepend
@@ -0,0 +1,29 @@
+Copyright (C) 1999-2004 Clarkware Consulting, Inc.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright 
+      notice, this list of conditions and the following disclaimer in the 
+      documentation and/or other materials provided with the distribution.
+
+   3. Neither the name of Clarkware Consulting, Inc. nor the names of its 
+      contributors may be used to endorse or promote products derived 
+      from this software without prior written permission. For written 
+      permission, please contact clarkware@clarkware.com.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+CLARKWARE CONSULTING OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN  ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 443984daf99a4b55360a61062b3828e7b6127468 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 02:34:38 +0000
Subject: [PATCH 039/268] Bump versions

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@889 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/ProjectProperties.scala | 6 +++---
 install/project/build.properties            | 8 ++++----
 project/build.properties                    | 6 +++---
 project/build/SbtProject.scala              | 2 +-
 project/plugins/Plugins.scala               | 4 ++--
 scripted/project/build.properties           | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/boot/src/main/scala/ProjectProperties.scala b/boot/src/main/scala/ProjectProperties.scala
index 4f0a0df08..7d27141e7 100644
--- a/boot/src/main/scala/ProjectProperties.scala
+++ b/boot/src/main/scala/ProjectProperties.scala
@@ -4,12 +4,12 @@
 package sbt.boot
 
 /*
-Project does not exist, create new project? [y/N] y
+Project does not exist, create new project? [y/N/s] y
 Name: 
 Organization []:
 Version [1.0]: 
 Scala version [2.7.5]: 
-sbt version [0.5.1]: 
+sbt version [0.5.2]: 
 */
 import java.io.File
 /** Constants related to reading/writing the build.properties file in a project.
@@ -48,7 +48,7 @@ private object ProjectProperties
 	/** The default version of the new user project when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultVersion = "1.0"
 	/** The default version of sbt when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultSbtVersion = "0.5.1"
+	val DefaultSbtVersion = "0.5.2"
 	/** The default version of Scala when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultScalaVersion = "2.7.5"
 
diff --git a/install/project/build.properties b/install/project/build.properties
index 63434d2ee..a5d08b8a0 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Thu Jun 25 14:31:30 EDT 2009
+#Sun Jul 26 22:17:46 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=extract
-sbt.version=0.5.1
-project.version=0.1
-scala.version=2.7.5
+sbt.version=0.5.2
+project.version=0.2
+scala.version=2.7.4
diff --git a/project/build.properties b/project/build.properties
index 88b6596f0..78b3fa99c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Sat Jul 04 12:43:34 EDT 2009
+#Sat Jul 25 19:50:26 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.5.1
-project.version=0.5.2-p1
+sbt.version=0.5.2
+project.version=0.5.3-SNAPSHOT
 scala.version=2.7.2
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 3c2df1980..aa52d3cf1 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -24,7 +24,7 @@ class SbtProject(info: ProjectInfo) extends ParentProject(info)
 	override def publishLocalAction = noAction
 }
 
-protected class MainProject(val info: ProjectInfo) extends CrossCompileProject with test.ScalaScripted
+protected class MainProject(val info: ProjectInfo) extends CrossCompileProject with test.SbtScripted
 {
 	override def mainSources =
 		if(ScalaVersion.currentString.startsWith("2.8")) // cannot compile against test libraries currently
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 655940b99..285ed4c00 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.5.1"
-}
\ No newline at end of file
+	val scripted = "org.scala-tools.sbt" % "test" % "0.5.2"
+}
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index c096cde6d..3f9316f18 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,8 +1,8 @@
 #Project properties
-#Wed Jul 01 23:57:40 EDT 2009
+#Sat Jul 25 23:01:36 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=test
-sbt.version=0.5.1
-project.version=0.5.1
+sbt.version=0.5.2
+project.version=0.5.2
 scala.version=2.7.5
 project.initialize=false

From b6da7c4e5cde3059acdf414e24a3e1562e3f9c93 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 12:51:29 +0000
Subject: [PATCH 040/268] Properly track anonymous classes generated from Java
 sources.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@892 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/FileUtilities.scala     |  7 ++++++-
 src/main/scala/sbt/classfile/Analyze.scala | 14 +++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index ae3259f09..ea87b8895 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -794,7 +794,12 @@ object FileUtilities
 	
 	/** The directory in which temporary files are placed.*/
 	val temporaryDirectory = new File(System.getProperty("java.io.tmpdir"))
-	def classLocation(cl: Class[_]): URL = cl.getProtectionDomain.getCodeSource.getLocation
+	def classLocation(cl: Class[_]): URL =
+	{
+		val codeSource = cl.getProtectionDomain.getCodeSource
+		if(codeSource == null) null // TODO: return something nicer, probably the location of rt.jar
+		else codeSource.getLocation
+	}
 	def classLocationFile(cl: Class[_]): File = toFile(classLocation(cl))
 	def classLocation[T](implicit mf: scala.reflect.Manifest[T]): URL = classLocation(mf.erasure)
 	def classLocationFile[T](implicit mf: scala.reflect.Manifest[T]): File = classLocationFile(mf.erasure)
diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
index bde2c1304..2e53a76a2 100644
--- a/src/main/scala/sbt/classfile/Analyze.scala
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -32,7 +32,7 @@ object Analyze
 				path <- Path.relativize(outputDirectory, newClass);
 				classFile = Parser(newClass.asFile, log);
 				sourceFile <- classFile.sourceFile;
-				source <- guessSourcePath(sourceSet, roots, classFile.className, log))
+				source <- guessSourcePath(sourceSet, roots, classFile, log))
 			{
 				analysis.beginSource(source)
 				analysis.generatedClass(source, path)
@@ -82,15 +82,19 @@ object Analyze
 		compile orElse Control.convertErrorMessage(log)(analyze()).left.toOption
 	}
 	private def resolveClassFile(file: File, className: String): File = (file /: (className + ".class").split("""\\"""))(new File(_, _))
-	private def guessSourcePath(sources: scala.collection.Set[Path], roots: Iterable[Path], className: String, log: Logger) =
+	private def guessSourcePath(sources: scala.collection.Set[Path], roots: Iterable[Path], classFile: ClassFile, log: Logger) =
 	{
-		val relativeSourceFile = className.replace('.', '/') + ".java"
+		val classNameParts = classFile.className.split("""\.""")
+		val lastIndex = classNameParts.length - 1
+		val (pkg, simpleClassName) = (classNameParts.take(lastIndex), classNameParts(lastIndex))
+		val sourceFileName = classFile.sourceFile.getOrElse(simpleClassName.takeWhile(_ != '$').mkString("", "", ".java"))
+		val relativeSourceFile = (pkg ++ (sourceFileName :: Nil)).mkString("/")
 		val candidates = roots.map(root => Path.fromString(root, relativeSourceFile)).filter(sources.contains).toList
 		candidates match
 		{
-			case Nil => log.warn("Could not determine source for class " + className)
+			case Nil => log.warn("Could not determine source for class " + classFile.className)
 			case head :: Nil => ()
-			case _ =>log.warn("Multiple sources matched for class " + className + ": " + candidates.mkString(", "))
+			case _ =>log.warn("Multiple sources matched for class " + classFile.className + ": " + candidates.mkString(", "))
 		}
 		candidates
 	}

From dd32ac75dac14fd951b54713dbd07eedd84aee47 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 13:52:38 +0000
Subject: [PATCH 041/268] Fix class file resolution issue

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@893 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/classfile/Analyze.scala | 12 ++++++------
 src/main/scala/sbt/classfile/Parser.scala  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
index 2e53a76a2..698cf3dec 100644
--- a/src/main/scala/sbt/classfile/Analyze.scala
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -46,17 +46,16 @@ object Analyze
 				for(classFile <- classFiles if isTopLevel(classFile);
 					method <- classFile.methods; if method.isMain)
 						analysis.foundApplication(source, classFile.className)
-				def processDependency(tpeSlashed: String)
+				def processDependency(tpe: String)
 				{
-					val tpe = tpeSlashed.replace('/','.')
 					Control.trapAndLog(log)
 					{
 						val clazz = Class.forName(tpe, false, loader)
 						val file = FileUtilities.classLocationFile(clazz)
 						if(file.isDirectory)
 						{
-							val resolved = resolveClassFile(file, tpeSlashed)
-							require(resolved.exists)
+							val resolved = resolveClassFile(file, tpe)
+							require(resolved.exists, "Resolved class file " + resolved + " did not exist")
 							val resolvedPath = Path.fromFile(resolved)
 							if(Path.fromFile(file) == outputDirectory)
 							{
@@ -81,12 +80,13 @@ object Analyze
 		
 		compile orElse Control.convertErrorMessage(log)(analyze()).left.toOption
 	}
-	private def resolveClassFile(file: File, className: String): File = (file /: (className + ".class").split("""\\"""))(new File(_, _))
+	private def resolveClassFile(file: File, className: String): File = (file /: (className.replace('.','/') + ".class").split("/"))(new File(_, _))
 	private def guessSourcePath(sources: scala.collection.Set[Path], roots: Iterable[Path], classFile: ClassFile, log: Logger) =
 	{
 		val classNameParts = classFile.className.split("""\.""")
 		val lastIndex = classNameParts.length - 1
-		val (pkg, simpleClassName) = (classNameParts.take(lastIndex), classNameParts(lastIndex))
+		val pkg = classNameParts.take(lastIndex)
+		val simpleClassName = classNameParts(lastIndex)
 		val sourceFileName = classFile.sourceFile.getOrElse(simpleClassName.takeWhile(_ != '$').mkString("", "", ".java"))
 		val relativeSourceFile = (pkg ++ (sourceFileName :: Nil)).mkString("/")
 		val candidates = roots.map(root => Path.fromString(root, relativeSourceFile)).filter(sources.contains).toList
diff --git a/src/main/scala/sbt/classfile/Parser.scala b/src/main/scala/sbt/classfile/Parser.scala
index 2c9c0eea6..9d622f621 100644
--- a/src/main/scala/sbt/classfile/Parser.scala
+++ b/src/main/scala/sbt/classfile/Parser.scala
@@ -88,7 +88,7 @@ object Parser
 				constants.flatMap { constant =>
 					constant.tag match
 					{
-						case ConstantClass => toUTF8(constant.nameIndex) :: Nil
+						case ConstantClass => slashesToDots(toUTF8(constant.nameIndex)) :: Nil
 						case _ => Nil
 					}
 				}

From 3cd6f75b4afd458e3a9aded492ea05bf4c284914 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 15:13:55 +0000
Subject: [PATCH 042/268] More fixes for tracking Java sources.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@894 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/FileUtilities.scala     |  2 +-
 src/main/scala/sbt/classfile/Analyze.scala | 26 ++++++++++++----------
 src/main/scala/sbt/classfile/Parser.scala  |  7 +++++-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index ea87b8895..50a19fd0e 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -797,7 +797,7 @@ object FileUtilities
 	def classLocation(cl: Class[_]): URL =
 	{
 		val codeSource = cl.getProtectionDomain.getCodeSource
-		if(codeSource == null) null // TODO: return something nicer, probably the location of rt.jar
+		if(codeSource == null) error("No class location for " + cl)
 		else codeSource.getLocation
 	}
 	def classLocationFile(cl: Class[_]): File = toFile(classLocation(cl))
diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
index 698cf3dec..5d6262644 100644
--- a/src/main/scala/sbt/classfile/Analyze.scala
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -51,25 +51,27 @@ object Analyze
 					Control.trapAndLog(log)
 					{
 						val clazz = Class.forName(tpe, false, loader)
-						val file = FileUtilities.classLocationFile(clazz)
-						if(file.isDirectory)
+						for(file <- Control.convertException(FileUtilities.classLocationFile(clazz)).right)
 						{
-							val resolved = resolveClassFile(file, tpe)
-							require(resolved.exists, "Resolved class file " + resolved + " did not exist")
-							val resolvedPath = Path.fromFile(resolved)
-							if(Path.fromFile(file) == outputDirectory)
+							if(file.isDirectory)
 							{
-								productToSource.get(resolvedPath) match
+								val resolved = resolveClassFile(file, tpe)
+								assume(resolved.exists, "Resolved class file " + resolved + " from " + source + " did not exist")
+								val resolvedPath = Path.fromFile(resolved)
+								if(Path.fromFile(file) == outputDirectory)
 								{
-									case Some(dependsOn) => analysis.sourceDependency(dependsOn, source)
-									case None => analysis.productDependency(resolvedPath, source)
+									productToSource.get(resolvedPath) match
+									{
+										case Some(dependsOn) => analysis.sourceDependency(dependsOn, source)
+										case None => analysis.productDependency(resolvedPath, source)
+									}
 								}
+								else
+									analysis.classDependency(resolved, source)
 							}
 							else
-								analysis.classDependency(resolved, source)
+								analysis.jarDependency(file, source)
 						}
-						else
-							analysis.jarDependency(file, source)
 					}
 				}
 				
diff --git a/src/main/scala/sbt/classfile/Parser.scala b/src/main/scala/sbt/classfile/Parser.scala
index 9d622f621..a80331289 100644
--- a/src/main/scala/sbt/classfile/Parser.scala
+++ b/src/main/scala/sbt/classfile/Parser.scala
@@ -88,7 +88,12 @@ object Parser
 				constants.flatMap { constant =>
 					constant.tag match
 					{
-						case ConstantClass => slashesToDots(toUTF8(constant.nameIndex)) :: Nil
+						case ConstantClass =>
+							val name = toUTF8(constant.nameIndex)
+							if(name.startsWith("["))
+								descriptorToTypes(Some(name))
+							else
+								slashesToDots(name) :: Nil
 						case _ => Nil
 					}
 				}

From c8f0a72da9afbe018793a56b69e305d48dd4dc5b Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 15:17:43 +0000
Subject: [PATCH 043/268] Added test for tracking anonymous classes from Java
 sources

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@895 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties                        |  6 +++---
 .../java/track-anonymous/changes/Anon.java      |  9 +++++++++
 .../track-anonymous/project/build.properties    |  2 ++
 .../project/build/AnonTest.scala                |  5 +++++
 src/sbt-test/java/track-anonymous/test          | 17 +++++++++++++++++
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 src/sbt-test/java/track-anonymous/changes/Anon.java
 create mode 100644 src/sbt-test/java/track-anonymous/project/build.properties
 create mode 100644 src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
 create mode 100644 src/sbt-test/java/track-anonymous/test

diff --git a/project/build.properties b/project/build.properties
index 78b3fa99c..6a4e93e00 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Sat Jul 25 19:50:26 EDT 2009
+#Mon Jul 27 09:16:46 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
 sbt.version=0.5.2
-project.version=0.5.3-SNAPSHOT
-scala.version=2.7.2
+project.version=0.5.2
+scala.version=2.7.4
diff --git a/src/sbt-test/java/track-anonymous/changes/Anon.java b/src/sbt-test/java/track-anonymous/changes/Anon.java
new file mode 100644
index 000000000..ea0908c4d
--- /dev/null
+++ b/src/sbt-test/java/track-anonymous/changes/Anon.java
@@ -0,0 +1,9 @@
+import java.util.Iterator;
+class Anon
+{
+	public static final Iterator<String> it = new Iterator<String>() {
+		public boolean hasNext() { return false; }
+		public String next() { return ""; }
+		public void remove() {}
+	};
+}
diff --git a/src/sbt-test/java/track-anonymous/project/build.properties b/src/sbt-test/java/track-anonymous/project/build.properties
new file mode 100644
index 000000000..2b4d7e5a1
--- /dev/null
+++ b/src/sbt-test/java/track-anonymous/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala b/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
new file mode 100644
index 000000000..4119dca17
--- /dev/null
+++ b/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
@@ -0,0 +1,5 @@
+import sbt._
+class AnonTest(info: ProjectInfo) extends DefaultProject(info)
+{
+  override def compileOrder = CompileOrder.JavaThenScala
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/track-anonymous/test b/src/sbt-test/java/track-anonymous/test
new file mode 100644
index 000000000..75a470c0e
--- /dev/null
+++ b/src/sbt-test/java/track-anonymous/test
@@ -0,0 +1,17 @@
+$ copy-file changes/Anon.java src/main/java/Anon.java
+[success]
+
+> compile
+[success]
+
+$ exists target/classes/Anon.class target/classes/Anon$1.class
+[success]
+
+$ delete src/main/java/Anon.java
+[success]
+
+> compile
+[success]
+
+$ absent target/classes/Anon.class target/classes/Anon$1.class
+[success]
\ No newline at end of file

From c94decd6cdb084635a4eaed35766c073d236287e Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 15:33:34 +0000
Subject: [PATCH 044/268] Fixed compiler-project test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@896 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../run-test/project/build/src/TestProject.scala                | 2 +-
 src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
index 868aa0cff..f9ab1439c 100644
--- a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
+++ b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
@@ -2,6 +2,6 @@ import sbt._
 
 class TestProject(info: ProjectInfo) extends DefaultProject(info)
 {
-	override def useMavenConfigurations = true
+	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.fromFile(FileUtilities.sbtJar)
 	val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default"
 }
diff --git a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
index 4f0c03709..1b58be453 100644
--- a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
+++ b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
@@ -6,7 +6,7 @@ import scala.tools.nsc.{Interpreter, Settings}
 
 class Foo {
 	val settings = new Settings()
-	settings.classpath.value = FileUtilities.toFile(classOf[Holder].getProtectionDomain.getCodeSource.getLocation).getAbsolutePath
+	settings.classpath.value = sbt.FileUtilities.classLocationFile[Holder].getAbsolutePath
 	val inter = new Interpreter(settings)
 
 	def eval(code: String): Any = {

From 355d8ca35ba318c41c56f25c1b75c50c60e44709 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 15:34:12 +0000
Subject: [PATCH 045/268] Reverted sbt.version used to build

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@897 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 6a4e93e00..c05d56c01 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -2,6 +2,6 @@
 #Mon Jul 27 09:16:46 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.5.2
+sbt.version=0.5.1
 project.version=0.5.2
 scala.version=2.7.4

From 2c7276cc42adf771072900b34b3db46981133419 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 15:37:11 +0000
Subject: [PATCH 046/268] Reverted version of test framework

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@898 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/plugins/Plugins.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 285ed4c00..bccf0edf9 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.5.2"
+	val scripted = "org.scala-tools.sbt" % "test" % "0.5.1"
 }

From bd833bd348564623da55e83870dc2d9803809e48 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 15:53:31 +0000
Subject: [PATCH 047/268] Bump versions again

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@902 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties      | 4 ++--
 project/plugins/Plugins.scala | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index c05d56c01..7ff5ccc22 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -2,6 +2,6 @@
 #Mon Jul 27 09:16:46 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.5.1
-project.version=0.5.2
+sbt.version=0.5.2
+project.version=0.5.3-SNAPSHOT
 scala.version=2.7.4
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index bccf0edf9..285ed4c00 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.5.1"
+	val scripted = "org.scala-tools.sbt" % "test" % "0.5.2"
 }

From 26c26a2da0f3b1c2df7e961d8f8bf2d5acd1ce58 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 16:19:31 +0000
Subject: [PATCH 048/268] Small fix to make scripted action actually runnable

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@903 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 scripted/src/main/scala/Scripted.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripted/src/main/scala/Scripted.scala b/scripted/src/main/scala/Scripted.scala
index 4d4a7ab53..71f1a1a4c 100644
--- a/scripted/src/main/scala/Scripted.scala
+++ b/scripted/src/main/scala/Scripted.scala
@@ -37,7 +37,7 @@ final case class ScriptedTest(group: String, name: String) extends NotNull
 trait Scripted extends Project with MultiTaskProject
 {
 	def sbtTests: Path
-	def scriptedTask(dependencies: ManagedTask*) = dynamic(scriptedTests(listTests, dependencies : _*))
+	def scriptedTask(dependencies: ManagedTask*) = dynamic(scriptedTests(listTests)) dependsOn(dependencies : _*)
 	def scriptedMethodTask(dependencies: ManagedTask*) = multiTask(listTests.map(_.toString).toList) { includeFunction =>
 		scriptedTests(listTests.filter(test => includeFunction(test.toString)), dependencies : _*)
 	}

From e502847dfbcc42d833bc59ed4d0da276bd1e2dae Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 19:14:57 +0000
Subject: [PATCH 049/268]  * Add test for publish-local for multi-projects.  *
 Make `managedStyle` inherit from parent when unspecified  * Define method
 containing package actions to run before deliver,deliver-local

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@904 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala    | 15 ++++++++----
 src/main/scala/sbt/DefaultProject.scala       |  4 +---
 src/main/scala/sbt/ManageDependencies.scala   |  2 +-
 .../publish-local/project/build.properties    |  2 ++
 .../project/build/MultiPublishTest.scala      | 23 +++++++++++++++++++
 .../dependency-management/publish-local/test  | 20 ++++++++++++++++
 6 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/publish-local/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
 create mode 100644 src/sbt-test/dependency-management/publish-local/test

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 2669b1664..038a9215e 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -267,7 +267,12 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations))
 	def useMavenConfigurations = true // TODO: deprecate after going through a minor version series to verify that this works ok
 	def useDefaultConfigurations = useMavenConfigurations
-	def managedStyle: ManagedType = Auto
+	def managedStyle: ManagedType = 
+		info.parent match
+		{
+			case Some(m: BasicManagedProject) => m.managedStyle
+			case _ => Auto
+		}
 	protected implicit final val defaultPatterns: RepositoryHelpers.Patterns =
 	{
 		managedStyle match
@@ -396,18 +401,20 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		def configurations: Option[Iterable[Configuration]] = None
 	}
 	
+	def packageToPublishActions: Seq[ManagedTask] = Nil
+	
 	private[this] def depMap[T](f: BasicManagedProject => T) =
 		topologicalSort.dropRight(1).flatMap { case m: BasicManagedProject => f(m) :: Nil; case _ => Nil }
 	
 	lazy val update = updateAction
-	lazy val makePom = makePomAction
+	lazy val makePom = makePomAction dependsOn(packageToPublishActions : _*)
 	lazy val cleanLib = cleanLibAction
 	lazy val cleanCache = cleanCacheAction
 	// deliver must run after its dependencies' `publish` so that the artifacts produced by the dependencies can be resolved
 	//  (deliver requires a resolve first)
-	lazy val deliverLocal: Task = deliverLocalAction dependsOn(depMap(_.publishLocal) : _*)
+	lazy val deliverLocal: Task = deliverLocalAction dependsOn((depMap(_.publishLocal) ++ packageToPublishActions) : _*)
 	lazy val publishLocal: Task = publishLocalAction
-	lazy val deliver: Task = deliverAction dependsOn(depMap(_.publish) : _*)
+	lazy val deliver: Task = deliverAction dependsOn((depMap(_.publish) ++ packageToPublishActions)  : _*)
 	lazy val publish: Task = publishAction
 }
 
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index b08419246..310b51bf7 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -248,9 +248,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def defaultTestTask(testOptions: => Seq[TestOption]) =
 		testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile) describedAs TestDescription
 		
-	override protected def makePomAction = super.makePomAction dependsOn(`package`)
-	override protected def deliverLocalAction = super.deliverLocalAction dependsOn(`package`)
-	override protected def deliverAction = super.deliverAction dependsOn(`package`)
+	override def packageToPublishActions: Seq[ManagedTask] = `package` :: Nil
 	
 	protected def packageAction = packageTask(packagePaths, jarPath, packageOptions).dependsOn(compile) describedAs PackageDescription
 	protected def packageTestAction = packageTask(packageTestPaths, packageTestJar).dependsOn(testCompile) describedAs TestPackageDescription
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 76f293543..a0703dc4b 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -368,7 +368,7 @@ object ManageDependencies
 		val module = toDefaultModuleDescriptor(md)
 		val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
 		parser.setMd(module)
-		val defaultConf = if(defaultConfiguration.contains("->")) defaultConfiguration else (defaultConfiguration + "->default")
+		val defaultConf = if(defaultConfiguration.contains("->")) defaultConfiguration else (defaultConfiguration + "->default(compile)")
 		parser.setDefaultConf(defaultConf)
 		addDependencies(module, extraDependencies, parser)
 		module
diff --git a/src/sbt-test/dependency-management/publish-local/project/build.properties b/src/sbt-test/dependency-management/publish-local/project/build.properties
new file mode 100644
index 000000000..5a5bc0dec
--- /dev/null
+++ b/src/sbt-test/dependency-management/publish-local/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Publish Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
new file mode 100644
index 000000000..af013d8ee
--- /dev/null
+++ b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
@@ -0,0 +1,23 @@
+import sbt._
+
+class MultiPublishTest(info: ProjectInfo) extends ParentProject(info)
+{
+	override def managedStyle =
+		if(path("mavenStyle").exists)
+			ManagedStyle.Maven
+		else
+			ManagedStyle.Auto
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	
+	lazy val sub = project("sub", "Sub Project", new SubProject(_))
+	class SubProject(info: ProjectInfo) extends DefaultProject(info)
+	{
+		override def managedStyle =
+			if(path("mavenStyle").exists)
+				ManagedStyle.Maven
+			else
+				ManagedStyle.Auto
+		val publishTo = "Scala Tools Nexus" at (outputPath / "test-repo").absolutePath
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/publish-local/test b/src/sbt-test/dependency-management/publish-local/test
new file mode 100644
index 000000000..ce87c08b9
--- /dev/null
+++ b/src/sbt-test/dependency-management/publish-local/test
@@ -0,0 +1,20 @@
+> publish-local
+[success]
+
+> clean [success]
+$ touch mavenStyle [success]
+$ reload [success]
+> publish-local
+[success]
+
+> clean [success]
+$ touch sub/mavenStyle [success]
+$ reload [success]
+> publish-local
+[success]
+
+> clean [success]
+$ delete mavenStyle [success]
+$ reload [success]
+> publish-local
+[success]
\ No newline at end of file

From 1c3b2a1de22c93c53009b5e01b77a22deb078887 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 19:20:06 +0000
Subject: [PATCH 050/268] Revert versions for third try at 0.5.2

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@905 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties      | 8 ++++----
 project/plugins/Plugins.scala | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 7ff5ccc22..9a5169dda 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Mon Jul 27 09:16:46 EDT 2009
+#Mon Jul 27 15:17:30 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.5.2
-project.version=0.5.3-SNAPSHOT
-scala.version=2.7.4
+sbt.version=0.5.1
+project.version=0.5.2
+scala.version=2.7.2
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 285ed4c00..bccf0edf9 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.5.2"
+	val scripted = "org.scala-tools.sbt" % "test" % "0.5.1"
 }

From d44f7711255bb49a277c35799dcd8a1d531cee4d Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 19:38:09 +0000
Subject: [PATCH 051/268] Make code in sbt.classfile private[sbt]

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@908 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/classfile/Analyze.scala   |  2 +-
 src/main/scala/sbt/classfile/ClassFile.scala | 10 +++++-----
 src/main/scala/sbt/classfile/Parser.scala    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
index 5d6262644..4173ae203 100644
--- a/src/main/scala/sbt/classfile/Analyze.scala
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -7,7 +7,7 @@ import scala.collection.mutable
 import mutable.{ArrayBuffer, Buffer}
 import java.io.File
 
-object Analyze
+private[sbt] object Analyze
 {
 	def apply[T](basePath: Path, outputDirectory: Path, sources: Iterable[Path], roots: Iterable[Path], log: Logger)
 		(allProducts: => scala.collection.Set[Path], analysis: AnalysisCallback, loader: ClassLoader)
diff --git a/src/main/scala/sbt/classfile/ClassFile.scala b/src/main/scala/sbt/classfile/ClassFile.scala
index f101261e2..a9fa3441a 100644
--- a/src/main/scala/sbt/classfile/ClassFile.scala
+++ b/src/main/scala/sbt/classfile/ClassFile.scala
@@ -6,7 +6,7 @@ package sbt.classfile
 import Constants._
 import java.io.File
 
-trait ClassFile
+private[sbt] trait ClassFile
 {
 	val majorVersion: Int
 	val minorVersion: Int
@@ -24,26 +24,26 @@ trait ClassFile
 	def stringValue(a: AttributeInfo): String
 }
 
-final case class Constant(tag: Byte, nameIndex: Int, typeIndex: Int, value: Option[AnyRef]) extends NotNull
+private[sbt] final case class Constant(tag: Byte, nameIndex: Int, typeIndex: Int, value: Option[AnyRef]) extends NotNull
 {
 	def this(tag: Byte, nameIndex: Int, typeIndex: Int) = this(tag, nameIndex, typeIndex, None)
 	def this(tag: Byte, nameIndex: Int) = this(tag, nameIndex, -1)
 	def this(tag: Byte, value: AnyRef) = this(tag, -1, -1, Some(value))
 	def wide = tag == ConstantLong || tag == ConstantDouble
 }
-final case class FieldOrMethodInfo(accessFlags: Int, name: Option[String], descriptor: Option[String], attributes: RandomAccessSeq[AttributeInfo]) extends NotNull
+private[sbt] final case class FieldOrMethodInfo(accessFlags: Int, name: Option[String], descriptor: Option[String], attributes: RandomAccessSeq[AttributeInfo]) extends NotNull
 {
 	def isStatic = (accessFlags&ACC_STATIC)== ACC_STATIC
 	def isPublic = (accessFlags&ACC_PUBLIC)==ACC_PUBLIC
 	def isMain = isPublic && isStatic && descriptor.filter(_ == "([Ljava/lang/String;)V").isDefined
 }
-final case class AttributeInfo(name: Option[String], value: Array[Byte]) extends NotNull
+private[sbt] final case class AttributeInfo(name: Option[String], value: Array[Byte]) extends NotNull
 {
 	def isNamed(s: String) = name.filter(s == _).isDefined
 	def isSignature = isNamed("Signature")
 	def isSourceFile = isNamed("SourceFile")
 }
-object Constants
+private[sbt] object Constants
 {
 	final val ACC_STATIC = 0x0008
 	final val ACC_PUBLIC = 0x0001
diff --git a/src/main/scala/sbt/classfile/Parser.scala b/src/main/scala/sbt/classfile/Parser.scala
index a80331289..514133b10 100644
--- a/src/main/scala/sbt/classfile/Parser.scala
+++ b/src/main/scala/sbt/classfile/Parser.scala
@@ -12,7 +12,7 @@ import java.io.{DataInputStream, File, InputStream}
 
 import Constants._
 
-object Parser
+private[sbt] object Parser
 {
 	def apply(file: File, log: Logger): ClassFile = FileUtilities.readStreamValue(file, log)(parse(file.getCanonicalPath, log)).right.get
 	private def parse(fileName: String, log: Logger)(is: InputStream): Either[String, ClassFile] = Right(parseImpl(fileName, is, log))

From cc2b68a4ddf6c42e15384cab4a815a043930e44c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 27 Jul 2009 19:39:37 +0000
Subject: [PATCH 052/268] Bump versions for the last time.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@911 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties      | 4 ++--
 project/plugins/Plugins.scala | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 9a5169dda..70083d02e 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -2,6 +2,6 @@
 #Mon Jul 27 15:17:30 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool Parent
-sbt.version=0.5.1
-project.version=0.5.2
+sbt.version=0.5.2
+project.version=0.5.3-SNAPSHOT
 scala.version=2.7.2
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index bccf0edf9..285ed4c00 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.5.1"
+	val scripted = "org.scala-tools.sbt" % "test" % "0.5.2"
 }

From fa29b38b3811f8c5ff46b65bc4a662056dfab1db Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 30 Jul 2009 00:11:42 +0000
Subject: [PATCH 053/268] Fixed problem with overriding testDefinitionClasses
 too specifically (Nil)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@918 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/DefaultProject.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 310b51bf7..4f72edbad 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -174,8 +174,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def mainLabel = "main"
 	def testLabel = "test"
 	
-	def mainCompileConfiguration = new MainCompileConfig
-	def testCompileConfiguration = new TestCompileConfig
+	def mainCompileConfiguration: CompileConfiguration = new MainCompileConfig
+	def testCompileConfiguration: CompileConfiguration = new TestCompileConfig
 	abstract class BaseCompileConfig extends CompileConfiguration
 	{
 		def log = BasicScalaProject.this.log
@@ -195,7 +195,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def outputDirectory = mainCompilePath
 		def classpath = compileClasspath
 		def analysisPath = mainAnalysisPath
-		def testDefinitionClassNames = Nil
+		def testDefinitionClassNames: Iterable[String] = Nil
 		def javaOptions = javaOptionsAsString(javaCompileOptions)
 	}
 	class TestCompileConfig extends BaseCompileConfig
@@ -207,7 +207,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def outputDirectory = testCompilePath
 		def classpath = testClasspath
 		def analysisPath = testAnalysisPath
-		def testDefinitionClassNames = testFrameworks.map(_.testSuperClassName)
+		def testDefinitionClassNames: Iterable[String] = testFrameworks.map(_.testSuperClassName)
 		def javaOptions = javaOptionsAsString(testJavaCompileOptions)
 	}
 	

From d58d29c7d99f5ca874617b418b20e88d6479343d Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 30 Jul 2009 00:15:44 +0000
Subject: [PATCH 054/268] Run method properly fails when executed code throws
 an exception in the main thread

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@919 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Run.scala                  | 30 ++++++++-----------
 src/main/scala/sbt/TrapExit.scala             |  3 +-
 .../run/error/changes/RunFailureMain.scala    |  7 +++++
 .../run/error/changes/RunSuccess.scala        |  4 +++
 .../run/error/changes/ThreadRunError.scala    | 11 +++++++
 .../run/error/project/build.properties        |  2 ++
 src/sbt-test/run/error/test                   | 15 ++++++++++
 7 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 src/sbt-test/run/error/changes/RunFailureMain.scala
 create mode 100644 src/sbt-test/run/error/changes/RunSuccess.scala
 create mode 100644 src/sbt-test/run/error/changes/ThreadRunError.scala
 create mode 100644 src/sbt-test/run/error/project/build.properties
 create mode 100644 src/sbt-test/run/error/test

diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 41a495801..370efb667 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -77,24 +77,20 @@ object Run extends ScalaRun
 	/** Runs the class 'mainClass' using the given classpath and options using the scala runner.*/
 	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger) =
 	{
-		createSettings(log)
-		{
-			(settings: Settings) =>
+		createSettings(log) { (settings: Settings) =>
+			Control.trapUnit("Error during run: ", log)
 			{
-				Control.trapUnit("Error during run: ", log)
-				{
-					val classpathURLs = classpath.map(_.asURL).toList
-					val bootClasspath = FileUtilities.pathSplit(settings.bootclasspath.value)
-					val extraURLs =
-						for(pathString <- bootClasspath if pathString.length > 0) yield
-							(new java.io.File(pathString)).toURI.toURL
-					log.info("Running " + mainClass + " ...")
-					log.debug("  Classpath:" + (classpathURLs ++ extraURLs).mkString("\n\t", "\n\t",""))
-					def execute =
-						try { ObjectRunner.run(classpathURLs ++ extraURLs, mainClass, options.toList) }
-						catch { case e: java.lang.reflect.InvocationTargetException => throw e.getCause }
-					executeTrapExit( execute, log )
-				}
+				val classpathURLs = classpath.map(_.asURL).toList
+				val bootClasspath = FileUtilities.pathSplit(settings.bootclasspath.value)
+				val extraURLs =
+					for(pathString <- bootClasspath if pathString.length > 0) yield
+						(new java.io.File(pathString)).toURI.toURL
+				log.info("Running " + mainClass + " ...")
+				log.debug("  Classpath:" + (classpathURLs ++ extraURLs).mkString("\n\t", "\n\t",""))
+				def execute =
+					try { ObjectRunner.run(classpathURLs ++ extraURLs, mainClass, options.toList) }
+					catch { case e: java.lang.reflect.InvocationTargetException => throw e.getCause }
+				executeTrapExit( execute, log )
 			}
 		}
 	}
diff --git a/src/main/scala/sbt/TrapExit.scala b/src/main/scala/sbt/TrapExit.scala
index aef7cebb5..7567f4b2f 100644
--- a/src/main/scala/sbt/TrapExit.scala
+++ b/src/main/scala/sbt/TrapExit.scala
@@ -29,8 +29,9 @@ object TrapExit
 		* the threads that were created by 'execute'.*/
 		val originalThreads = allThreads
 		val code = new ExitCode
+		def executeMain = try { execute } catch { case x => code.set(1); throw x }
 		val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code, log))
-		val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { execute } }
+		val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { executeMain } }
 		
 		val originalSecurityManager = System.getSecurityManager
 		try
diff --git a/src/sbt-test/run/error/changes/RunFailureMain.scala b/src/sbt-test/run/error/changes/RunFailureMain.scala
new file mode 100644
index 000000000..2971eabbe
--- /dev/null
+++ b/src/sbt-test/run/error/changes/RunFailureMain.scala
@@ -0,0 +1,7 @@
+object Spawn
+{
+	def main(args: Array[String])
+	{
+		error("Test error main")
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/run/error/changes/RunSuccess.scala b/src/sbt-test/run/error/changes/RunSuccess.scala
new file mode 100644
index 000000000..29ad02cd7
--- /dev/null
+++ b/src/sbt-test/run/error/changes/RunSuccess.scala
@@ -0,0 +1,4 @@
+object Spawn
+{
+	def main(args: Array[String]) {}
+}
\ No newline at end of file
diff --git a/src/sbt-test/run/error/changes/ThreadRunError.scala b/src/sbt-test/run/error/changes/ThreadRunError.scala
new file mode 100644
index 000000000..e4465379c
--- /dev/null
+++ b/src/sbt-test/run/error/changes/ThreadRunError.scala
@@ -0,0 +1,11 @@
+object Spawn
+{
+	def main(args: Array[String])
+	{
+		(new ThreadA).start
+	}
+	class ThreadA extends Thread
+	{
+		override def run(): Unit = error("Test error thread")
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/run/error/project/build.properties b/src/sbt-test/run/error/project/build.properties
new file mode 100644
index 000000000..12d341422
--- /dev/null
+++ b/src/sbt-test/run/error/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test Run Errors
+project.version=10.0
\ No newline at end of file
diff --git a/src/sbt-test/run/error/test b/src/sbt-test/run/error/test
new file mode 100644
index 000000000..886910b23
--- /dev/null
+++ b/src/sbt-test/run/error/test
@@ -0,0 +1,15 @@
+$ copy-file changes/RunSuccess.scala src/main/scala/Run.scala
+[success]
+> run
+[success]
+
+$ copy-file changes/RunFailureMain.scala src/main/scala/Run.scala
+[success]
+> run
+[failure]
+
+# an exception in a non-main thread should still be exit code 0
+$ copy-file changes/ThreadRunError.scala src/main/scala/Run.scala
+[success]
+> run
+[success]

From 86361ad33d09b51943a2e7b5e730ffa25c9f6413 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 00:53:38 +0000
Subject: [PATCH 055/268] Add maven central to repositories searched by
 launcher to find scala-library.jar and scala-compiler.jar

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@923 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/Update.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/src/main/scala/Update.scala b/boot/src/main/scala/Update.scala
index d5bfa8c0e..91c4754bc 100644
--- a/boot/src/main/scala/Update.scala
+++ b/boot/src/main/scala/Update.scala
@@ -165,11 +165,11 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 		newDefault.setName("redefined-public")
 		newDefault.add(localResolver(settings.getDefaultIvyUserDir.getAbsolutePath))
 		newDefault.add(mavenLocal)
+		newDefault.add(mavenMainResolver)
 		target match
 		{
 			case UpdateSbt =>
 				newDefault.add(sbtResolver(scalaVersion))
-				newDefault.add(mavenMainResolver)
 			case UpdateScala =>
 				newDefault.add(mavenResolver("Scala-Tools Maven2 Repository", "http://scala-tools.org/repo-releases"))
 				newDefault.add(mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots"))

From 9a816b20d08572af233f6801d589d2002a598d66 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 00:54:12 +0000
Subject: [PATCH 056/268] Small comment in a test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@924 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/sbt-test/run/error/test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sbt-test/run/error/test b/src/sbt-test/run/error/test
index 886910b23..8f7c86954 100644
--- a/src/sbt-test/run/error/test
+++ b/src/sbt-test/run/error/test
@@ -3,6 +3,7 @@ $ copy-file changes/RunSuccess.scala src/main/scala/Run.scala
 > run
 [success]
 
+# an exception in the main thread should be a nonzero exit code
 $ copy-file changes/RunFailureMain.scala src/main/scala/Run.scala
 [success]
 > run

From e7522e5691d9127aec3e98095767f4ab47c2a24e Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 00:55:46 +0000
Subject: [PATCH 057/268] Reenable building against 2.8.0-SNAPSHOT

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@925 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build/CrossCompileProject.scala | 13 ++++++++++---
 project/build/SbtProject.scala          |  5 -----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
index e9c9ad9c6..1c1e6b52e 100644
--- a/project/build/CrossCompileProject.scala
+++ b/project/build/CrossCompileProject.scala
@@ -15,7 +15,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private val version2_7_3 = "2.7.3"
 	private val version2_7_4 = "2.7.4"
 	private val version2_7_5 = "2.7.5"
-	private val version2_8_0 = "2.8.0.r18093-b20090623200909"
+	private val version2_8_0 = "2.8.0-SNAPSHOT"
 	private val base = "base"
 
 	/* The configurations for the versions of Scala.*/
@@ -28,7 +28,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	// the list of all configurations cross-compile supports
 	private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_8_0 :: Nil
 	// the list of configurations to actually build against
-	private val buildConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil//allConfigurations not currently used because of issues with 2.8.0
+	private val buildConfigurations = allConfigurations//conf_2_7_2 :: conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil//allConfigurations not currently used because of issues with 2.8.0
 	// the configuration to use for normal development (when cross-building is not done)
 	private def developmentVersion = buildConfigurations.first
 	
@@ -175,6 +175,12 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private def crossJarName(scalaVersion: Configuration) = sbt(scalaVersion) + "-" + version.toString +  ".jar"
 	// This creates a task that compiles sbt against the given version of scala.  Classes are put in classes-<scalaVersion>.
 	private def compileForScala(version: Configuration)=
+	{
+		def filteredSources =
+			if(version eq conf_2_8_0) // cannot compile against test libraries currently
+				Path.lazyPathFinder { mainSources.get.filter(!_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
+			else
+				mainSources
 		task
 		{
 			val classes = classesPath(version)
@@ -188,7 +194,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 			
 			// The libraries to compile sbt against
 			val classpath = fullClasspath(version) +++ optionalClasspath(version)
-			val sources: List[String] = pathListStrings(mainSources)
+			val sources: List[String] = pathListStrings(filteredSources)
 			val compilerOptions = List("-cp", concatPaths(classpath), "-d", classes.toString)
 			val compilerArguments: List[String] = compilerOptions ::: sources
 			
@@ -201,6 +207,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 			else
 				Some("Nonzero exit value (" + exitValue + ") when calling scalac " + version + " with options: \n" + compilerOptions.mkString(" "))
 		}
+	}
 	private def concatPaths(p: PathFinder): String = Path.makeString(p.get)
 	private def pathListStrings(p: PathFinder): List[String] = p.get.map(_.absolutePath).toList
 	private def classesPath(scalaVersion: Configuration) = ("target"  / ("classes-" + scalaVersion.toString)) ##
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index aa52d3cf1..6a77f589a 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -26,11 +26,6 @@ class SbtProject(info: ProjectInfo) extends ParentProject(info)
 
 protected class MainProject(val info: ProjectInfo) extends CrossCompileProject with test.SbtScripted
 {
-	override def mainSources =
-		if(ScalaVersion.currentString.startsWith("2.8")) // cannot compile against test libraries currently
-			Path.lazyPathFinder { super.mainSources.get.filter(!_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
-		else
-			super.mainSources
 	override def defaultJarBaseName = "sbt_" + version.toString
 	/** Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"

From 9344dcb63e3b8c552f8bb676a06dfe8b1fef4f14 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 00:58:17 +0000
Subject: [PATCH 058/268] First part of fix to scripted test logging.  Second
 part is in main sbt.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@926 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 scripted/project/build.properties             |  4 +-
 scripted/src/main/scala/ScriptedTests.scala   | 41 ++++++++++++++++---
 .../src/main/scala/TestScriptParser.scala     | 36 ++++++++--------
 3 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 3f9316f18..accc374de 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,8 +1,8 @@
 #Project properties
-#Sat Jul 25 23:01:36 EDT 2009
+#Sat Aug 01 10:32:20 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=test
 sbt.version=0.5.2
-project.version=0.5.2
+project.version=0.5.3-p1
 scala.version=2.7.5
 project.initialize=false
diff --git a/scripted/src/main/scala/ScriptedTests.scala b/scripted/src/main/scala/ScriptedTests.scala
index 1016fa72d..b785618bb 100644
--- a/scripted/src/main/scala/ScriptedTests.scala
+++ b/scripted/src/main/scala/ScriptedTests.scala
@@ -20,13 +20,44 @@ final class ScriptedTests(testResources: Resources) extends NotNull
 	{
 		val log = new RemoteLogger(logger)
 		val result = readOnlyResourceDirectory(group, name).fold(err => Some(err), testDirectory => scriptedTest(testDirectory, log))
-		wrapOption(result)
+		translateOption(result)
 	}
 	private def scriptedTest(testDirectory: File, log: Logger): Option[String] =
 	{
-		(for(script <- (new TestScriptParser(testDirectory, log)).parse(new File(testDirectory, ScriptFilename)).right;
-			u <- withProject(testDirectory, log)(script).right )
-		yield u).left.toOption
+		val buffered = new BufferedLogger(log)
+		//buffered.startRecording()
+		val filtered = new FilterLogger(buffered)
+		val parsedScript = (new TestScriptParser(testDirectory, filtered)).parse(new File(testDirectory, ScriptFilename))
+		val result = parsedScript.right.flatMap(withProject(testDirectory, filtered))
+		//result.left.foreach(x => buffered.playAll())
+		//buffered.clearAll()
+		result.left.toOption
 	}
-	private[this] def wrapOption[T >: Null](s: Option[T]): T = s match { case Some(t) => t; case None => null }
+	private[this] def translateOption[T >: Null](s: Option[T]): T = s match { case Some(t) => t; case None => null }
+}
+
+// TODO: remove for sbt 0.5.3
+final class FilterLogger(delegate: Logger) extends BasicLogger
+{
+	def trace(t: => Throwable)
+	{
+		if(traceEnabled)
+			delegate.trace(t)
+	}
+	def log(level: Level.Value, message: => String)
+	{
+		if(atLevel(level))
+			delegate.log(level, message)
+	}
+	def success(message: => String)
+	{
+		if(atLevel(Level.Info))
+			delegate.success(message)
+	}
+	def control(event: ControlEvent.Value, message: => String)
+	{
+		if(atLevel(Level.Info))
+			delegate.control(event, message)
+	}
+	def logAll(events: Seq[LogEvent]): Unit = events.foreach(delegate.log)
 }
diff --git a/scripted/src/main/scala/TestScriptParser.scala b/scripted/src/main/scala/TestScriptParser.scala
index a87e34de6..84b8746c3 100644
--- a/scripted/src/main/scala/TestScriptParser.scala
+++ b/scripted/src/main/scala/TestScriptParser.scala
@@ -134,30 +134,26 @@ private class TestScriptParser(baseDirectory: File, log: Logger) extends RegexPa
 	private def evaluate(successExpected: Boolean, label: String, project: Project)(body: => Option[String]): Option[String] =
 	{
 		def startRecordingLog() { foreachBufferedLogger(project)(_.startRecording()) }
-		def playLog() { foreachBufferedLogger(project)(_.playAll()) }
-		def stopLog() { foreachBufferedLogger(project)(_.stop()) }
+		def clearLog() { foreachBufferedLogger(project)(_.clearAll()) }
+		def playLog(message: String) =
+		{
+			foreachBufferedLogger(project)(_.playAll())
+			Some(message)
+		}
 		
 		startRecordingLog()
-		val result =
-			body match
+		try
+		{
+			val result = body
+			if(result.isEmpty == successExpected)
+				None
+			else
 			{
-				case None =>
-					if(successExpected) None
-					else
-					{
-						playLog()
-						Some(label + " succeeded (expected failure).")
-					}
-				case Some(failure) =>
-					if(successExpected)
-					{
-						playLog()
-						Some(label + " failed (expected success): " + failure)
-					}
-					else None
+				val mainMessage = result.map("failed (expected success): " + _).getOrElse("succeeded (expected failure).")
+				playLog(label + " " + mainMessage)
 			}
-		stopLog()
-		result
+		}
+		finally { clearLog() }
 	}
 	private def evaluateAction(action: List[String], successExpected: Boolean)(project: Project): Option[String] =
 	{

From 1ee23e827e1da583065261fb5feec4768f522c14 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 00:59:54 +0000
Subject: [PATCH 059/268] Changes for compatibility with 2.8

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@927 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Environment.scala       | 4 ++--
 src/main/scala/sbt/classfile/Analyze.scala | 1 +
 src/main/scala/sbt/classfile/Parser.scala  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Environment.scala b/src/main/scala/sbt/Environment.scala
index 3f35f0a55..21060382d 100644
--- a/src/main/scala/sbt/Environment.scala
+++ b/src/main/scala/sbt/Environment.scala
@@ -245,14 +245,14 @@ trait BasicEnvironment extends Environment
 		val vals = Environment.reflectiveMappings(this, classOf[Property[_]])
 		for( (name, property: AnyUserProperty) <- vals)
 			propertyMap(name) = property
-		propertyMap.readOnly
+		propertyMap //.readOnly (not currently in 2.8)
 	}
 	private val initialValues: Map[String, String] =
 	{
 		val map = new scala.collection.mutable.HashMap[String, String]
 		for(errorMsg <- impl.MapUtilities.read(map, envBackingPath, log))
 			log.error("Error loading properties from " + environmentLabel + " : " + errorMsg)
-		map.readOnly
+		map //.readOnly (not currently in 2.8)
 	}
 	
 	def propertyNames: Iterable[String] = propertyMap.keys.toList
diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
index 4173ae203..f861fb128 100644
--- a/src/main/scala/sbt/classfile/Analyze.scala
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -2,6 +2,7 @@
  * Copyright 2009 Mark Harrah
  */
 package sbt.classfile
+import sbt._
 
 import scala.collection.mutable
 import mutable.{ArrayBuffer, Buffer}
diff --git a/src/main/scala/sbt/classfile/Parser.scala b/src/main/scala/sbt/classfile/Parser.scala
index 514133b10..9e44b51db 100644
--- a/src/main/scala/sbt/classfile/Parser.scala
+++ b/src/main/scala/sbt/classfile/Parser.scala
@@ -2,6 +2,7 @@
  * Copyright 2009 Mark Harrah
  */
 package sbt.classfile
+import sbt._
 
 import java.io.{DataInputStream, File, InputStream}
 

From 8d507ea50eb41dec8fd2969aa50e46ebe4b406e6 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:01:55 +0000
Subject: [PATCH 060/268] More 2.8 compatibility changes

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@928 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/impl/MapUtilities.scala       | 1 +
 src/main/scala/sbt/impl/SelectMainClass.scala    | 4 ++++
 src/main/scala/sbt/impl/TestStatusReporter.scala | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/main/scala/sbt/impl/MapUtilities.scala b/src/main/scala/sbt/impl/MapUtilities.scala
index 66a56c98f..dcfd1f0ae 100644
--- a/src/main/scala/sbt/impl/MapUtilities.scala
+++ b/src/main/scala/sbt/impl/MapUtilities.scala
@@ -3,6 +3,7 @@
  */
 
 package sbt.impl
+import sbt._
 
 import java.util.Properties
 import java.io.{File, FileInputStream, FileOutputStream, InputStream, OutputStream}
diff --git a/src/main/scala/sbt/impl/SelectMainClass.scala b/src/main/scala/sbt/impl/SelectMainClass.scala
index f24b5deee..04e73cad3 100644
--- a/src/main/scala/sbt/impl/SelectMainClass.scala
+++ b/src/main/scala/sbt/impl/SelectMainClass.scala
@@ -1,4 +1,8 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
 package sbt.impl
+import sbt._
 
 private[sbt] object SelectMainClass
 {
diff --git a/src/main/scala/sbt/impl/TestStatusReporter.scala b/src/main/scala/sbt/impl/TestStatusReporter.scala
index dddf0eb5a..8debd2c90 100644
--- a/src/main/scala/sbt/impl/TestStatusReporter.scala
+++ b/src/main/scala/sbt/impl/TestStatusReporter.scala
@@ -2,6 +2,7 @@
  * Copyright 2009 Mark Harrah
  */
 package sbt.impl
+import sbt._
 
 import java.io.File
 import scala.collection.mutable.{HashMap, Map}

From 4afeeb1c8b3155724fb9c18eebf37c5372bfa914 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:03:45 +0000
Subject: [PATCH 061/268] Change order of repositories: local,shared,Maven
 central,user defined, and finally, scala-tools

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@929 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index a0703dc4b..d5fee4473 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -201,7 +201,7 @@ object ManageDependencies
 					{
 						log.debug("Using inline repositories.")
 						configureDefaults()
-						val extra = if(flags.addScalaTools) ScalaToolsReleases :: resolvers.toList else resolvers
+						val extra = if(flags.addScalaTools) resolvers ++ List(ScalaToolsReleases) else resolvers // user resolvers come before scala-tools
 						addResolvers(ivy.getSettings, extra, log)
 					}
 					if(autodetect)
@@ -528,12 +528,12 @@ object ManageDependencies
 		moduleID.check()
 	}
 	/** Sets the resolvers for 'settings' to 'resolvers'.  This is done by creating a new chain and making it the default. */
-	private def addResolvers(settings: IvySettings, resolvers: Iterable[Resolver], log: Logger)
+	private def addResolvers(settings: IvySettings, resolvers: Seq[Resolver], log: Logger)
 	{
 		val newDefault = new ChainResolver
 		newDefault.setName("redefined-public")
+		newDefault.add(settings.getDefaultResolver) // put local, shared, and public(Maven Central) repositories before user repositories
 		resolvers.foreach(r => newDefault.add(ConvertResolver(r)))
-		newDefault.add(settings.getDefaultResolver)
 		settings.addResolver(newDefault)
 		settings.setDefaultResolver(newDefault.getName)
 		if(log.atLevel(Level.Debug))

From e798bffc9ca0f53b1a53a875d9b7b1dce480f036 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:04:34 +0000
Subject: [PATCH 062/268] Part II of repository changes

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@930 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManagedInterface.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index f4a9ff4a5..19ccb58ec 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -25,7 +25,7 @@ sealed trait SbtManager extends Manager
 {
 	def autodetect: Boolean
 	def module: ModuleID
-	def resolvers: Iterable[Resolver]
+	def resolvers: Seq[Resolver]
 	def dependencies: Iterable[ModuleID]
 	def autodetectUnspecified: Boolean
 	def dependenciesXML: NodeSeq
@@ -34,7 +34,7 @@ sealed trait SbtManager extends Manager
 	def artifacts: Iterable[Artifact]
 }
 final class SimpleManager private[sbt] (val dependenciesXML: NodeSeq, val autodetectUnspecified: Boolean,
-	val module: ModuleID, val resolvers: Iterable[Resolver], explicitConfigurations: Iterable[Configuration],
+	val module: ModuleID, val resolvers: Seq[Resolver], explicitConfigurations: Iterable[Configuration],
 	val defaultConfiguration: Option[Configuration], val artifacts: Iterable[Artifact], val dependencies: ModuleID*) extends SbtManager
 {
 	def autodetect = dependencies.isEmpty && dependenciesXML.isEmpty && artifacts.isEmpty && explicitConfigurations.isEmpty && autodetectUnspecified

From 91d05d74c80ced8bd57e796d33176f0050ae7ea4 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:06:11 +0000
Subject: [PATCH 063/268] Compatibility with 2.8 reporter/position changes

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@931 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Compile.scala | 53 ++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index b9473ee14..848f9f1fc 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -206,11 +206,11 @@ final class Scaladoc(maximumErrors: Int) extends CompilerCore
 }
 
 // The following code is based on scala.tools.nsc.reporters.{AbstractReporter, ConsoleReporter}
-// Copyright 2002-2008 LAMP/EPFL
+// Copyright 2002-2009 LAMP/EPFL
 // Original author: Martin Odersky
 final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.nsc.reporters.Reporter
 {
-	import scala.tools.nsc.util.{FakePos,Position}
+	import scala.tools.nsc.util.{FakePos,NoPosition,Position}
 	private val positions = new scala.collection.mutable.HashMap[Position, Severity]
 	
 	def error(msg: String) { error(FakePos("scalac"), msg) }
@@ -239,29 +239,36 @@ final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.
 	
 	private def print(level: Level.Value, posIn: Position, msg: String)
 	{
-		if(posIn == null)
-			log.log(level, msg)
-		else
+		// the implicits keep source compatibility with the changes in 2.8 : Position.{source,line,column} are no longer Options
+		implicit def anyToOption[T <: AnyRef](t: T): Option[T] = Some(t)
+		implicit def intToOption(t: Int): Option[Int] = Some(t)
+		val pos =
+			posIn match
+			{
+				case null | NoPosition => NoPosition
+				case x: FakePos => x
+				case x =>
+					posIn.inUltimateSource(posIn.source.get)
+			}
+		pos match
 		{
-			val pos = posIn.inUltimateSource(posIn.source.getOrElse(null))
-			def message =
-			{
-				val sourcePrefix =
-					pos match
-					{
-						case FakePos(msg) => msg + " "
-						case _ => pos.source.map(_.file.path).getOrElse("")
-					}
+			case NoPosition => log.log(level, msg)
+			case FakePos(fmsg) => log.log(level, fmsg+" "+msg)
+			case _ =>
+				val sourcePrefix = pos.source.map(_.file.path).getOrElse("")
 				val lineNumberString = pos.line.map(line => ":" + line + ":").getOrElse(":") + " "
-				sourcePrefix + lineNumberString + msg
-			}
-			log.log(level, message)
-			if (!pos.line.isEmpty)
-			{
-				log.log(level, pos.lineContent.stripLineEnd) // source line with error/warning
-				for(column <- pos.column if column > 0) // pointer to the column position of the error/warning
-					log.log(level, (" " * (column-1)) + '^')
-			}
+				log.log(level, sourcePrefix + lineNumberString + msg)
+				if (!pos.line.isEmpty)
+				{
+					val lineContent = pos.lineContent.stripLineEnd
+					log.log(level, lineContent) // source line with error/warning
+					for(offset <- pos.offset; src <- pos.source)
+					{
+						val pointer = offset - src.lineToOffset(src.offsetToLine(offset))
+						val pointerSpace = lineContent.take(pointer).map { case '\t' => '\t'; case x => ' ' }
+						log.log(level, pointerSpace.mkString + "^") // pointer to the column position of the error/warning
+					}
+				}
 		}
 	}
 	override def reset =

From fb64501c9b3c7e0f71146165105c2b1b2f85626c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:07:09 +0000
Subject: [PATCH 064/268] yet another 2.8 compatibility hack

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@932 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Webstart.scala | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Webstart.scala b/src/main/scala/sbt/Webstart.scala
index e717ec026..3bb4c5727 100644
--- a/src/main/scala/sbt/Webstart.scala
+++ b/src/main/scala/sbt/Webstart.scala
@@ -211,7 +211,15 @@ private object WebstartScalaProject
 	/** Writes the XML string 'xmlString' to the file 'outputPath' if the hashes are different.*/
 	private def writeXML(xml: Elem, outputPath: Path, log: Logger): Option[String] =
 	{
-		val xmlString = scala.xml.Utility.toXML(xml, false)
+		val xmlString =
+		{
+			import scala.xml.Utility
+			implicit def another28Hack(any: AnyRef): { def toXML(xml: Elem, stripComments: Boolean): String } =
+				new {
+					def toXML(xml: Elem, stripComments: Boolean) = Utility.toXML(xml).toString // this will only be called for 2.8, which defaults to stripComments= false, unlike 2.7
+				}
+			scala.xml.Utility.toXML(xml, false) // 2.8 doesn't have this method anymore, so the above implicit will kick in for 2.8 only
+		}
 		if(!outputPath.exists)
 		{
 			log.debug("JNLP file did not exist, writing inline XML to " + outputPath)

From 28061254b072aa51e6dbeee910ade87105632a4e Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:08:25 +0000
Subject: [PATCH 065/268] Fix for using automatic discovery of compiler plugins
 in projects that define plugins

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@933 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ClasspathUtilities.scala | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/ClasspathUtilities.scala b/src/main/scala/sbt/ClasspathUtilities.scala
index 29f71bb48..8852d6bdf 100644
--- a/src/main/scala/sbt/ClasspathUtilities.scala
+++ b/src/main/scala/sbt/ClasspathUtilities.scala
@@ -46,16 +46,17 @@ object ClasspathUtilities
 	private[sbt] def compilerPlugins(classpath: Iterable[Path]): Iterable[File] =
 	{
 		val loader = new URLClassLoader(classpath.map(_.asURL).toList.toArray)
-		wrap.Wrappers.toList(loader.getResources("scalac-plugin.xml")).flatMap(asFile)
+		wrap.Wrappers.toList(loader.getResources("scalac-plugin.xml")).flatMap(asFile(true))
 	}
 	/** Converts the given URL to a File.  If the URL is for an entry in a jar, the File for the jar is returned. */
-	private[sbt] def asFile(url: URL) =
+	private[sbt] def asFile(url: URL): List[File] = asFile(false)(url)
+	private[sbt] def asFile(jarOnly: Boolean)(url: URL): List[File] =
 	{
 		try
 		{
 			url.getProtocol match
 			{
-				case "file" => FileUtilities.toFile(url) :: Nil
+				case "file" if !jarOnly=> FileUtilities.toFile(url) :: Nil
 				case "jar" =>
 					val path = url.getPath
 					val end = path.indexOf('!')

From e3517c7a6f05abb8f51a4a3be38ab5b19b5cd277 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:09:16 +0000
Subject: [PATCH 066/268] Add syncPaths method to FileUtilities for arbitrary
 sources (not just a directory)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@934 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/FileUtilities.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index 50a19fd0e..6bb4ff04c 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -544,8 +544,10 @@ object FileUtilities
 	/** Synchronizes the contents of the <code>sourceDirectory</code> directory to the
 	* <code>targetDirectory</code> directory.*/
 	def sync(sourceDirectory: Path, targetDirectory: Path, log: Logger): Option[String] =
+		syncPaths((sourceDirectory ##) ** AllPassFilter, targetDirectory, log)
+	def syncPaths(sources: PathFinder, targetDirectory: Path, log: Logger): Option[String] =
 	{
-		copy(((sourceDirectory ##) ** AllPassFilter).get, targetDirectory, log).right.flatMap
+		copy(sources.get, targetDirectory, log).right.flatMap
 			{ copiedTo => prune(targetDirectory, copiedTo, log).toLeft(()) }.left.toOption
 	}
 	def prune(directory: Path, keepOnly: Iterable[Path], log: Logger): Option[String] =

From 22f2d5b9935ffdd98603adbd485db2d154af39e3 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:12:24 +0000
Subject: [PATCH 067/268] Add check against uninitialized vals to reflective
 discovery

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@935 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ReflectUtilities.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/ReflectUtilities.scala b/src/main/scala/sbt/ReflectUtilities.scala
index 02822190a..e48ae6b0f 100644
--- a/src/main/scala/sbt/ReflectUtilities.scala
+++ b/src/main/scala/sbt/ReflectUtilities.scala
@@ -42,7 +42,11 @@ object ReflectUtilities
 			if(method.getParameterTypes.length == 0 && clazz.isAssignableFrom(method.getReturnType))
 			{
 				for(field <- correspondingFields.get(method.getName) if field.getType == method.getReturnType)
-					mappings(method.getName) = method.invoke(self).asInstanceOf[T]
+				{
+					val value = method.invoke(self).asInstanceOf[T]
+					assume(value != null, "val " + method.getName + " was null")
+					mappings(method.getName) = value
+				}
 			}
 		}
 		mappings

From cd8c8ea0079b087fa8f864c98382b558ecd74f5e Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 01:26:18 +0000
Subject: [PATCH 068/268]  * Many logging related changes and fixes.  Added
 FilterLogger and cleaned up interaction between Logger, scripted testing, and
 the builder projects.  This included removing the recordingDepth hack from
 Logger. Logger buffering is now enabled/disabled per thread.  * Fix
 compileOptions being fixed after the first compile  * Minor fixes to output
 directory checking  * Added defaultLoggingLevel method for setting the
 initial level of a project's Logger  * Cleaned up internal approach to adding
 extra default configurations like 'plugin'  * Added syncPathsTask for
 synchronizing paths to a target directory  * Allow multiple instances of
 Jetty (new jettyRunTasks can be defined with different ports)  * jettyRunTask
 accepts configuration in a single configuration wrapper object instead of
 many parameters  * Fix web application class loading (#35) by using
 jettyClasspath=testClasspath---jettyRunClasspath for loading Jetty.  A better
 way would be to have a 'jetty' configuration and have
 jettyClasspath=managedClasspath('jetty'), but this maintains compatibility. 
 * Copy resources to target/resources and target/test-resources using
 copyResources and copyTestResources tasks.  Properly include all resources in
 web applications and classpaths (#36).  mainResources and testResources are
 now the definitive methods for getting resources.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@936 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/AnalysisCallback.scala    |   8 +-
 src/main/scala/sbt/AutoCompilerPlugins.scala |  18 +-
 src/main/scala/sbt/BasicProjectTypes.scala   |  18 +-
 src/main/scala/sbt/BuilderProject.scala      |  14 +-
 src/main/scala/sbt/Conditional.scala         |   7 +-
 src/main/scala/sbt/DefaultProject.scala      |  58 ++++--
 src/main/scala/sbt/IntegrationTesting.scala  |   8 +
 src/main/scala/sbt/Logger.scala              | 172 +++++++++---------
 src/main/scala/sbt/Project.scala             |  21 ++-
 src/main/scala/sbt/ProjectInfo.scala         |   3 +-
 src/main/scala/sbt/ProjectPaths.scala        |  16 +-
 src/main/scala/sbt/Resources.scala           |  18 +-
 src/main/scala/sbt/ScalaProject.scala        |  12 +-
 src/main/scala/sbt/WebApp.scala              | 176 ++++++++++---------
 src/main/scala/sbt/impl/ProcessImpl.scala    |   4 +-
 src/main/scala/sbt/impl/RunTask.scala        |  54 +++---
 16 files changed, 308 insertions(+), 299 deletions(-)

diff --git a/src/main/scala/sbt/AnalysisCallback.scala b/src/main/scala/sbt/AnalysisCallback.scala
index 3578c8942..51b5618c5 100644
--- a/src/main/scala/sbt/AnalysisCallback.scala
+++ b/src/main/scala/sbt/AnalysisCallback.scala
@@ -59,9 +59,9 @@ trait AnalysisCallback extends NotNull
 	/** Called when a module with a public 'main' method with the right signature is found.*/
 	def foundApplication(sourcePath: Path, className: String): Unit
 }
-abstract class BasicAnalysisCallback[A <: BasicCompileAnalysis](val basePath: Path, val superclassNames: Iterable[String],
-	protected val analysis: A) extends AnalysisCallback
+abstract class BasicAnalysisCallback[A <: BasicCompileAnalysis](val basePath: Path, protected val analysis: A) extends AnalysisCallback
 {
+	def superclassNames: Iterable[String]
 	def superclassNotFound(superclassName: String) {}
 	
 	def beginSource(sourcePath: Path): Unit =
@@ -85,8 +85,8 @@ abstract class BasicAnalysisCallback[A <: BasicCompileAnalysis](val basePath: Pa
 	def endSource(sourcePath: Path): Unit =
 		analysis.removeSelfDependency(sourcePath)
 }
-abstract class BasicCompileAnalysisCallback(basePath: Path, superclassNames: Iterable[String], analysis: CompileAnalysis)
-	extends BasicAnalysisCallback(basePath, superclassNames, analysis)
+abstract class BasicCompileAnalysisCallback(basePath: Path, analysis: CompileAnalysis)
+	extends BasicAnalysisCallback(basePath, analysis)
 {
 	def foundApplication(sourcePath: Path, className: String): Unit =
 		analysis.addApplication(sourcePath, className)
diff --git a/src/main/scala/sbt/AutoCompilerPlugins.scala b/src/main/scala/sbt/AutoCompilerPlugins.scala
index 1b5a94864..885cfdd68 100644
--- a/src/main/scala/sbt/AutoCompilerPlugins.scala
+++ b/src/main/scala/sbt/AutoCompilerPlugins.scala
@@ -6,22 +6,8 @@ package sbt
 trait AutoCompilerPlugins extends BasicScalaProject
 {
 	import Configurations.CompilerPlugin
-	abstract override def ivyConfigurations =
-	{
-		val superConfigurations = super.ivyConfigurations.toList
-		val newConfigurations =
-			if(superConfigurations.isEmpty)
-			{
-				if(useDefaultConfigurations)
-					CompilerPlugin :: Configurations.defaultMavenConfigurations
-				else
-				 	Configurations.Default :: CompilerPlugin :: Nil
-			}
-			else
-				CompilerPlugin :: superConfigurations
-		log.debug("Auto configurations: " + newConfigurations.toList.mkString(", "))
-		Configurations.removeDuplicates(newConfigurations)
-	}
+	abstract override def extraDefaultConfigurations =
+		CompilerPlugin :: super.extraDefaultConfigurations
 	abstract override def compileOptions = compilerPlugins ++ super.compileOptions
 
 	/** A PathFinder that provides the classpath to search for compiler plugins. */
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 038a9215e..03a1d3073 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -232,7 +232,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	/** The dependency manager that represents inline declarations.  The default manager packages the information
 	* from 'ivyXML', 'projectID', 'repositories', and 'libraryDependencies' and does not typically need to be
 	* be overridden. */
-	def manager = new SimpleManager(ivyXML, true, projectID, repositories, ivyConfigurations, defaultConfiguration, artifacts, libraryDependencies.toList: _*)
+	def manager = new SimpleManager(ivyXML, true, projectID, repositories.toSeq, ivyConfigurations, defaultConfiguration, artifacts, libraryDependencies.toList: _*)
 	
 	/** The pattern for Ivy to use when retrieving dependencies into the local project.  Classpath management
 	* depends on the first directory being [conf] and the extension being [ext].*/
@@ -245,24 +245,18 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	override def ivyConfigurations: Iterable[Configuration] =
 	{
 		val reflective = super.ivyConfigurations
+		val extra = extraDefaultConfigurations
 		if(useDefaultConfigurations)
 		{
-			if(reflective.isEmpty && !useIntegrationTestConfiguration)
+			if(reflective.isEmpty && extra.isEmpty)
 				Nil
 			else
-			{
-				val base = Configurations.defaultMavenConfigurations ++ reflective
-				val allConfigurations =
-					if(useIntegrationTestConfiguration)
-						base ++ List(Configurations.IntegrationTest)
-					else
-						base
-				Configurations.removeDuplicates(allConfigurations)
-			}
+				Configurations.removeDuplicates(Configurations.defaultMavenConfigurations ++ reflective ++ extra)
 		}
 		else
-			reflective
+			reflective ++ extraDefaultConfigurations
 	}
+	def extraDefaultConfigurations: List[Configuration] = Nil
 	def useIntegrationTestConfiguration = false
 	def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations))
 	def useMavenConfigurations = true // TODO: deprecate after going through a minor version series to verify that this works ok
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index 738833939..ceef28d46 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -7,6 +7,7 @@ import BasicProjectPaths._
 
 sealed abstract class InternalProject extends Project
 {
+	override def defaultLoggingLevel = Level.Warn
 	override final def historyPath = None
 	override def tasks: Map[String, Task] = Map.empty
 	override final protected def disableCrossPaths = false
@@ -76,8 +77,9 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 			}
 		}
 		protected def analysisCallback: AnalysisCallback =
-			new BasicAnalysisCallback(info.projectPath, List(Project.ProjectClassName), analysis)
+			new BasicAnalysisCallback(info.projectPath, analysis)
 			{
+				def superclassNames = List(Project.ProjectClassName)
 				def foundApplication(sourcePath: Path, className: String)  {}
 				def foundSubclass(sourcePath: Path, subclassName: String, superclassName: String, isModule: Boolean)
 				{
@@ -107,12 +109,12 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 	override final def methods = Map.empty
 }
 /** The project definition used to build project definitions. */
-private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, additional: Iterable[Path], override protected val logImpl: Logger) extends BasicBuilderProject
+private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, additional: Iterable[Path], rawLogger: Logger) extends BasicBuilderProject
 {
 	private lazy val pluginProject =
 	{
 		if(pluginPath.exists)
-			Some(new PluginBuilderProject(ProjectInfo(pluginPath.asFile, Nil, None)))
+			Some(new PluginBuilderProject(ProjectInfo(pluginPath.asFile, Nil, None)(rawLogger)))
 		else
 			None
 	}
@@ -125,7 +127,6 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 
 	final class PluginBuilderProject(val info: ProjectInfo) extends BasicBuilderProject
 	{
-		override protected def logImpl = BuilderProject.this.log
 		val pluginUptodate = propertyOptional[Boolean](false)
 		def tpe = "plugin definition"
 		def managedSourcePath = path(BasicDependencyPaths.DefaultManagedSourceDirectoryName)
@@ -159,8 +160,8 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 		{
 			Control.thread(projectDefinition) {
 				case Some(definition) =>
-					logInfo("\nUpdating plugins")
-					val pluginInfo = ProjectInfo(info.projectPath.asFile, Nil, None)
+					logInfo("\nUpdating plugins...")
+					val pluginInfo = ProjectInfo(info.projectPath.asFile, Nil, None)(rawLogger)
 					val pluginBuilder = Project.constructProject(pluginInfo, Project.getProjectClass[PluginDefinition](definition, projectClasspath, getClass.getClassLoader))
 					pluginBuilder.projectName() = "Plugin builder"
 					pluginBuilder.projectVersion() = OpaqueVersion("1.0")
@@ -199,6 +200,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 }
 class PluginDefinition(val info: ProjectInfo) extends InternalProject with BasicManagedProject
 {
+	override def defaultLoggingLevel = Level.Info
 	override final def outputPattern = "[artifact](-[revision]).[ext]"
 	override final val tasks = Map("update" -> update)
 	override def projectClasspath(config: Configuration) = Path.emptyPathFinder
diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
index fb31fb60f..446f4d9a1 100644
--- a/src/main/scala/sbt/Conditional.scala
+++ b/src/main/scala/sbt/Conditional.scala
@@ -213,12 +213,11 @@ class CompileConditional(override val config: CompileConfiguration) extends Abst
 	protected def constructAnalysis(analysisPath: Path, projectPath: Path, log: Logger) =
 		new CompileAnalysis(analysisPath, projectPath, log)
 	protected def analysisCallback = new CompileAnalysisCallback
-	protected class CompileAnalysisCallback extends BasicCompileAnalysisCallback(projectPath, testDefinitionClassNames, analysis)
+	protected class CompileAnalysisCallback extends BasicCompileAnalysisCallback(projectPath, analysis)
 	{
-		def foundSubclass(sourcePath: Path, subclassName: String, superclassName: String, isModule: Boolean)
-		{
+		def superclassNames = testDefinitionClassNames
+		def foundSubclass(sourcePath: Path, subclassName: String, superclassName: String, isModule: Boolean): Unit =
 			analysis.addTest(sourcePath, TestDefinition(isModule, subclassName, superclassName))
-		}
 	}
 }
 abstract class AbstractCompileConditional(val config: AbstractCompileConfiguration) extends Conditional[Path, Path, File]
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 4f72edbad..bba9655df 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -147,13 +147,13 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		}
 	}
 	/** The unmanaged base classpath.  By default, the unmanaged classpaths for test and run include this classpath. */
-	protected def mainUnmanagedClasspath = mainCompilePath +++ mainResourceClasspath +++ unmanagedClasspath
+	protected def mainUnmanagedClasspath = mainCompilePath +++ mainResourcesOutputPath +++ unmanagedClasspath
 	/** The unmanaged classpath for the run configuration. By default, it includes the base classpath returned by
 	* `mainUnmanagedClasspath`.*/
 	protected def runUnmanagedClasspath = mainUnmanagedClasspath +++ mainDependencies.scalaCompiler
 	/** The unmanaged classpath for the test configuration.  By default, it includes the run classpath, which includes the base
 	* classpath returned by `mainUnmanagedClasspath`.*/
-	protected def testUnmanagedClasspath = testCompilePath +++ testResourceClasspath  +++ testDependencies.scalaCompiler +++ runUnmanagedClasspath
+	protected def testUnmanagedClasspath = testCompilePath +++ testResourcesOutputPath  +++ testDependencies.scalaCompiler +++ runUnmanagedClasspath
 	
 	/** @deprecated Use `mainDependencies.scalaJars`*/
 	@deprecated protected final def scalaJars: Iterable[File] = mainDependencies.scalaJars.get.map(_.asFile)
@@ -181,9 +181,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def log = BasicScalaProject.this.log
 		def projectPath = info.projectPath
 		def baseCompileOptions: Seq[CompileOption]
-		lazy val localBaseOptions = baseCompileOptions
-		def options = optionsAsString(localBaseOptions.filter(!_.isInstanceOf[MaxCompileErrors]))
-		def maxErrors = maximumErrors(localBaseOptions)
+		def options = optionsAsString(baseCompileOptions.filter(!_.isInstanceOf[MaxCompileErrors]))
+		def maxErrors = maximumErrors(baseCompileOptions)
 		def compileOrder = BasicScalaProject.this.compileOrder
 	}
 	class MainCompileConfig extends BaseCompileConfig
@@ -233,9 +232,9 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def compileAction = task { doCompile(mainCompileConditional) } describedAs MainCompileDescription
 	protected def testCompileAction = task { doCompile(testCompileConditional) } dependsOn compile describedAs TestCompileDescription
 	protected def cleanAction = cleanTask(outputPath, cleanOptions) describedAs CleanDescription
-	protected def runAction = task { args => runTask(getMainClass(true), runClasspath, args, getRunner) dependsOn(compile) } describedAs RunDescription
+	protected def runAction = task { args => runTask(getMainClass(true), runClasspath, args, getRunner) dependsOn(compile, copyResources) } describedAs RunDescription
 	protected def consoleQuickAction = consoleTask(consoleClasspath, getRunner) describedAs ConsoleQuickDescription
-	protected def consoleAction = consoleTask(consoleClasspath, getRunner).dependsOn(testCompile) describedAs ConsoleDescription
+	protected def consoleAction = consoleTask(consoleClasspath, getRunner).dependsOn(testCompile, copyResources, copyTestResources) describedAs ConsoleDescription
 	protected def docAction = scaladocTask(mainLabel, mainSources, mainDocPath, docClasspath, documentOptions).dependsOn(compile) describedAs DocDescription
 	protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription
 	protected def testAction = defaultTestTask(testOptions)
@@ -246,7 +245,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def defaultTestQuickMethod(failedOnly: Boolean) =
 		testQuickMethod(testCompileConditional.analysis, testOptions)(options => defaultTestTask(quickOptions(failedOnly) ::: options.toList))
 	protected def defaultTestTask(testOptions: => Seq[TestOption]) =
-		testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile) describedAs TestDescription
+		testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription
 		
 	override def packageToPublishActions: Seq[ManagedTask] = `package` :: Nil
 	
@@ -263,6 +262,9 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def incrementVersionAction = task { incrementVersionNumber(); None } describedAs IncrementVersionDescription
 	protected def releaseAction = (test && packageAll && incrementVersion) describedAs ReleaseDescription
 	
+	protected def copyResourcesAction = syncPathsTask(mainResources, mainResourcesOutputPath) describedAs CopyResourcesDescription
+	protected def copyTestResourcesAction = syncPathsTask(testResources, testResourcesOutputPath) describedAs CopyTestResourcesDescription
+	
 	lazy val compile = compileAction
 	lazy val testCompile = testCompileAction
 	lazy val clean = cleanAction
@@ -283,6 +285,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	lazy val graph = graphAction
 	lazy val incrementVersion = incrementVersionAction
 	lazy val release = releaseAction
+	lazy val copyResources = copyResourcesAction
+	lazy val copyTestResources = copyTestResourcesAction
 
 	lazy val testQuick = testQuickAction
 	lazy val testFailed = testFailedAction
@@ -306,21 +310,39 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	override def watchPaths = mainSources +++ testSources +++ mainResources +++ testResources
 }
 abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProject with WebScalaPaths
-{
+{ p =>
 	import BasicWebScalaProject._
 	override def watchPaths = super.watchPaths +++ webappResources
 	
 	lazy val prepareWebapp = prepareWebappAction
 	protected def prepareWebappAction =
-		prepareWebappTask(webappResources, temporaryWarPath, webappClasspath, mainDependencies.scalaJars) dependsOn(compile)
+		prepareWebappTask(webappResources, temporaryWarPath, webappClasspath, mainDependencies.scalaJars) dependsOn(compile, copyResources)
 	
+	private lazy val jettyInstance = new JettyRunner(jettyConfiguration)
+	
+	def jettyConfiguration =
+		new DefaultJettyConfiguration
+		{
+			def classpath = jettyRunClasspath
+			def jettyClasspath = p.jettyClasspath
+			def war = jettyWebappPath
+			def contextPath = jettyContextPath
+			def classpathName = "test"
+			def scanDirectories = p.scanDirectories.map(_.asFile)
+			def scanInterval = p.scanInterval
+			def port = jettyPort
+			def log = p.log
+		}
+	/** This is the classpath used to determine what classes, resources, and jars to put in the war file.*/
 	def webappClasspath = publicClasspath
-	def jettyRunClasspath = testClasspath
+	/** This is the classpath containing Jetty.*/
+	def jettyClasspath = testClasspath --- jettyRunClasspath
+	/** This is the classpath containing the web application.*/
+	def jettyRunClasspath = publicClasspath
 	def jettyWebappPath = temporaryWarPath
 	lazy val jettyRun = jettyRunAction
 	lazy val jetty = task { idle() } dependsOn(jettyRun) describedAs(JettyDescription)
-	protected def jettyRunAction =
-		jettyRunTask(jettyWebappPath, jettyContextPath, jettyPort, jettyRunClasspath, "test", scanDirectories.map(_.asFile), scanInterval) dependsOn(prepareWebapp) describedAs(JettyRunDescription)
+	protected def jettyRunAction = jettyRunTask(jettyInstance) dependsOn(prepareWebapp) describedAs(JettyRunDescription)
 	private def idle() =
 	{
 		log.info("Waiting... (press any key to interrupt)")
@@ -338,13 +360,13 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	/** The directories that should be watched to determine if the web application needs to be reloaded..*/
 	def scanDirectories: Seq[Path] = jettyWebappPath :: Nil
 	/** The time in seconds between scans that check whether the web application should be reloaded.*/
-	def scanInterval: Int = 3
+	def scanInterval: Int = JettyRunner.DefaultScanInterval
 	/** The port that Jetty runs on. */
-	def jettyPort: Int = JettyRun.DefaultPort
+	def jettyPort: Int = JettyRunner.DefaultPort
 
 	lazy val jettyRestart = jettyStop && jettyRun
 	lazy val jettyStop = jettyStopAction
-	protected def jettyStopAction = jettyStopTask describedAs(JettyStopDescription)
+	protected def jettyStopAction = jettyStopTask(jettyInstance) describedAs(JettyStopDescription)
 	
 	/** The clean action for a web project is modified so that it first stops jetty if it is running,
 	* since the webapp directory will be removed by the clean.*/
@@ -403,6 +425,10 @@ object BasicScalaProject
 		"Increments the micro part of the version (the third number) by one. (This is only valid for versions of the form #.#.#-*)"
 	val ReleaseDescription =
 		"Compiles, tests, generates documentation, packages, and increments the version."
+	val CopyResourcesDescription =
+		"Copies resources to the target directory where they can be included on classpaths."
+	val CopyTestResourcesDescription =
+		"Copies test resources to the target directory where they can be included on the test classpath."
 		
 	private def warnMultipleMainClasses(log: Logger) =
 	{
diff --git a/src/main/scala/sbt/IntegrationTesting.scala b/src/main/scala/sbt/IntegrationTesting.scala
index 2329e06ac..eaff08c9e 100644
--- a/src/main/scala/sbt/IntegrationTesting.scala
+++ b/src/main/scala/sbt/IntegrationTesting.scala
@@ -56,6 +56,14 @@ trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTe
 
 	def integrationTestFrameworks = testFrameworks
 	override def useIntegrationTestConfiguration = false
+	abstract override def extraDefaultConfigurations =
+	{
+		val superConfigurations = super.extraDefaultConfigurations
+		if(useIntegrationTestConfiguration)
+			integrationTestConfiguration :: superConfigurations
+		else
+			superConfigurations
+	}
 	abstract override def fullUnmanagedClasspath(config: Configuration) =
 	{
 		val superClasspath = super.fullUnmanagedClasspath(config)
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index 12b820808..9941f6b65 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -96,6 +96,34 @@ final class MultiLogger(delegates: List[Logger]) extends BasicLogger
 	private def dispatch(event: LogEvent) { delegates.foreach(_.log(event)) }
 }
 
+/** A filter logger is used to delegate messages but not the logging level to another logger.  This means
+* that messages are logged at the higher of the two levels set by this logger and its delegate.
+* */
+final class FilterLogger(delegate: Logger) extends BasicLogger
+{
+	def trace(t: => Throwable)
+	{
+		if(traceEnabled)
+			delegate.trace(t)
+	}
+	def log(level: Level.Value, message: => String)
+	{
+		if(atLevel(level))
+			delegate.log(level, message)
+	}
+	def success(message: => String)
+	{
+		if(atLevel(Level.Info))
+			delegate.success(message)
+	}
+	def control(event: ControlEvent.Value, message: => String)
+	{
+		if(atLevel(Level.Info))
+			delegate.control(event, message)
+	}
+	def logAll(events: Seq[LogEvent]): Unit = events.foreach(delegate.log)
+}
+
 /** A logger that can buffer the logging done on it by currently executing Thread and
 * then can flush the buffer to the delegate logger provided in the constructor.  Use
 * 'startRecording' to start buffering and then 'play' from to flush the buffer for the
@@ -110,78 +138,67 @@ final class MultiLogger(delegates: List[Logger]) extends BasicLogger
 final class BufferedLogger(delegate: Logger) extends Logger
 {
 	private[this] val buffers = wrap.Wrappers.weakMap[Thread, Buffer[LogEvent]]
-	/* The recording depth part is to enable a weak nesting of recording calls.  When recording is
-	*  nested (recordingDepth >= 2), calls to play/playAll add the buffers for worker Threads to the
-	*  serial buffer (main Thread) and calls to clear/clearAll clear worker Thread buffers only. */
-	private[this] def recording = recordingDepth > 0
-	private[this] var recordingDepth = 0
+	private[this] var recordingAll = false
 	
-	private[this] val mainThread = Thread.currentThread
-	private[this] def getBuffer(key: Thread) = buffers.getOrElseUpdate(key, new ListBuffer[LogEvent])
-	private[this] def buffer = getBuffer(key)
+	private[this] def getOrCreateBuffer = buffers.getOrElseUpdate(key, createBuffer)
+	private[this] def buffer = if(recordingAll) Some(getOrCreateBuffer) else buffers.get(key)
+	private[this] def createBuffer = new ListBuffer[LogEvent]
 	private[this] def key = Thread.currentThread
-	private[this] def serialBuffer = getBuffer(mainThread)
-
-	private[this] def inWorker = Thread.currentThread ne mainThread
 	
-	/** Enables buffering. */
-	def startRecording() { synchronized { recordingDepth += 1 } }
+	@deprecated def startRecording() = recordAll()
+	/** Enables buffering for logging coming from the current Thread. */
+	def record(): Unit = synchronized { buffers(key) = createBuffer }
+	/** Enables buffering for logging coming from all Threads. */
+	def recordAll(): Unit = synchronized{ recordingAll = true }
+	def buffer[T](f: => T): T =
+	{
+		record()
+		try { f }
+		finally { Control.trap(stop()) }
+	}
+	def bufferAll[T](f: => T): T =
+	{
+		recordAll()
+		try { f }
+		finally { Control.trap(stopAll()) }
+	}
+	
 	/** Flushes the buffer to the delegate logger for the current thread.  This method calls logAll on the delegate
 	* so that the messages are written consecutively. The buffer is cleared in the process. */
 	def play(): Unit =
  		synchronized
 		{
-			if(recordingDepth == 1)
+			for(buffer <- buffers.get(key))
 				delegate.logAll(wrap.Wrappers.readOnly(buffer))
-			else if(recordingDepth > 1 && inWorker)
-				serialBuffer ++= buffer
 		}
 	def playAll(): Unit =
 		synchronized
 		{
-			if(recordingDepth == 1)
-			{
-				for(buffer <- buffers.values)
-					delegate.logAll(wrap.Wrappers.readOnly(buffer))
-			}
-			else if(recordingDepth > 1)
-			{
-				for((key, buffer) <- buffers.toList if key ne mainThread)
-					serialBuffer ++= buffer
-			}
+			for(buffer <- buffers.values)
+				delegate.logAll(wrap.Wrappers.readOnly(buffer))
 		}
-	/** Clears buffered events for the current thread.  It does not disable buffering. */
-	def clear(): Unit = synchronized { if(recordingDepth == 1 || inWorker) buffers -= key }
-	/** Clears buffered events for all threads and disables buffering. */
+	/** Clears buffered events for the current thread and disables buffering. */
+	def clear(): Unit = synchronized { buffers -= key }
+	/** Clears buffered events for all threads and disables all buffering. */
+	def clearAll(): Unit = synchronized { buffers.clear(); recordingAll = false }
+	/** Plays buffered events for the current thread and disables buffering. */
 	def stop(): Unit =
 		synchronized
 		{
-			clearAll()
-			if(recordingDepth > 0)
-				recordingDepth -= 1
+			play()
+			clear()
 		}
-	/** Clears buffered events for all threads. */
-	def clearAll(): Unit =
+	def stopAll(): Unit =
 		synchronized
 		{
-			if(recordingDepth <= 1)
-				buffers.clear()
-			else
-			{
-				val serial = serialBuffer
-				buffers.clear()
-				buffers(mainThread) = serial
-			}
+			playAll()
+			clearAll()
 		}
-	def runAndFlush[T](f: => T): T =
-	{
-		try { f }
-		finally { play();  clear() }
-	}
 	
 	def setLevel(newLevel: Level.Value): Unit =
-		synchronized {
-			if(recording) buffer += new SetLevel(newLevel)
+		synchronized
+		{
+			buffer.foreach{_  += new SetLevel(newLevel) }
 			delegate.setLevel(newLevel)
 		}
 	def getLevel = synchronized { delegate.getLevel }
@@ -189,58 +206,39 @@ final class BufferedLogger(delegate: Logger) extends Logger
 	def enableTrace(flag: Boolean): Unit =
 		synchronized
 		{
-			if(recording) buffer += new SetTrace(flag)
+			buffer.foreach{_  += new SetTrace(flag) }
 			delegate.enableTrace(flag)
 		}
 	
 	def trace(t: => Throwable): Unit =
-		synchronized
-		{
-			if(traceEnabled)
-			{
-				if(recording) buffer += new Trace(t)
-				else delegate.trace(t)
-			}
-		}
+		doBufferableIf(traceEnabled, new Trace(t), _.trace(t))
 	def success(message: => String): Unit =
-		synchronized
-		{
-			if(atLevel(Level.Info))
-			{
-				if(recording)
-					buffer += new Success(message)
-				else
-					delegate.success(message)
-			}
-		}
+		doBufferable(Level.Info, new Success(message), _.success(message))
 	def log(level: Level.Value, message: => String): Unit =
-		synchronized
-		{
-			if(atLevel(level))
-			{
-				if(recording)
-					buffer += new Log(level, message)
-				else
-					delegate.log(level, message)
-			}
-		}
+		doBufferable(level, new Log(level, message), _.log(level, message))
 	def logAll(events: Seq[LogEvent]): Unit =
 		synchronized
 		{
-			if(recording)
-				buffer ++= events
-			else
-				delegate.logAll(events)
+			buffer match
+			{
+				case Some(b) => b ++= events
+				case None => delegate.logAll(events)
+			}
 		}
 	def control(event: ControlEvent.Value, message: => String): Unit =
+		doBufferable(Level.Info, new ControlEvent(event, message), _.control(event, message))
+	private def doBufferable(level: Level.Value, appendIfBuffered: => LogEvent, doUnbuffered: Logger => Unit): Unit =
+		doBufferableIf(atLevel(level), appendIfBuffered, doUnbuffered)
+	private def doBufferableIf(condition: => Boolean, appendIfBuffered: => LogEvent, doUnbuffered: Logger => Unit): Unit =
 		synchronized
 		{
-			if(atLevel(Level.Info))
+			if(condition)
 			{
-				if(recording)
-					buffer += new ControlEvent(event, message)
-				else
-					delegate.control(event, message)
+				buffer match
+				{
+					case Some(b) => b += appendIfBuffered
+					case None => doUnbuffered(delegate)
+				}
 			}
 		}
 }
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index fef74bf9a..62587ccd3 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -13,7 +13,13 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 {
 	/** The logger for this project definition. */
 	final val log: Logger = logImpl
-	protected def logImpl: Logger = new BufferedLogger(new ConsoleLogger)
+	protected def logImpl: Logger =
+	{
+		val lg = new BufferedLogger(info.logger)
+		lg.setLevel(defaultLoggingLevel)
+		lg
+	}
+	protected def defaultLoggingLevel = Level.Info
 	
 	trait ActionOption extends NotNull
 	
@@ -166,7 +172,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* The construct function is used to obtain the Project instance. Any project/build/ directory for the project
 	* is ignored.  The project is declared to have the dependencies given by deps.*/
 	def project[P <: Project](path: Path, name: String, construct: ProjectInfo => P, deps: Project*): P =
-		initialize(construct(ProjectInfo(path.asFile, deps, Some(this))), Some(new SetupInfo(name, None, None, false)), log)
+		initialize(construct(ProjectInfo(path.asFile, deps, Some(this))(log)), Some(new SetupInfo(name, None, None, false)), log)
 	
 	/** Initializes the project directories when a user has requested that sbt create a new project.*/
 	def initializeDirectories() {}
@@ -186,14 +192,14 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	
 	/** The list of directories to which this project writes.  This is used to verify that multiple
 	* projects have not been defined with the same output directories. */
-	def outputDirectories: Iterable[Path] = outputRootPath :: Nil
+	def outputDirectories: Iterable[Path] = outputPath :: Nil
 	def rootProject = Project.rootProject(this)
 	/** The path to the file that provides persistence for properties.*/
 	final def envBackingPath = info.builderPath / Project.DefaultEnvBackingName
 	/** The path to the file that provides persistence for history. */
 	def historyPath: Option[Path] = Some(outputRootPath / ".history")
 	def outputPath = crossPath(outputRootPath)
-	def outputRootPath = outputDirectoryName
+	def outputRootPath: Path = outputDirectoryName
 	def outputDirectoryName = DefaultOutputDirectoryName
 	
 	private def getProject(result: LoadResult, path: Path): Project =
@@ -297,7 +303,7 @@ object Project
 		loadProject(projectDirectory, deps, parent, getClass.getClassLoader, log)
 	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], additional: ClassLoader, log: Logger): LoadResult =
 	{
-		val info = ProjectInfo(projectDirectory, deps, parent)
+		val info = ProjectInfo(projectDirectory, deps, parent)(log)
 		ProjectInfo.setup(info, log) match
 		{
 			case err: SetupError => new LoadSetupError(err.message)
@@ -310,12 +316,9 @@ object Project
 	{
 		try
 		{
-			val oldLevel = log.getLevel
-			log.setLevel(Level.Warn)
 			val result =
 				for(builderClass <- getProjectDefinition(info, additional, log).right) yield
 					initialize(constructProject(info, builderClass), setupInfo, log)
-			log.setLevel(oldLevel)
 			result.fold(new LoadError(_), new LoadSuccess(_))
 		}
 		catch
@@ -381,7 +384,7 @@ object Project
 		{
 			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
 			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(FileUtilities.toFile(url))); case _ => Nil }
-			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None), pluginProjectPath, additionalPaths, buildLog)
+			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None)(buildLog), pluginProjectPath, additionalPaths, buildLog)
 			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
 				builderProject.projectDefinition.right.map {
 					case Some(definition) => getProjectClass[Project](definition, builderProject.projectClasspath, additional)
diff --git a/src/main/scala/sbt/ProjectInfo.scala b/src/main/scala/sbt/ProjectInfo.scala
index b2e4fe349..316d3ff0f 100644
--- a/src/main/scala/sbt/ProjectInfo.scala
+++ b/src/main/scala/sbt/ProjectInfo.scala
@@ -6,8 +6,9 @@ package sbt
 import java.io.File
 import FileUtilities._
 
-final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Project], parent: Option[Project]) extends NotNull
+final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Project], parent: Option[Project])(log: Logger) extends NotNull
 {
+	val logger = new FilterLogger(log)
 	val projectPath: Path =
 	{
 		val toRoot = parent.flatMap(p => Path.relativize(p.info.projectPath, projectDirectory))
diff --git a/src/main/scala/sbt/ProjectPaths.scala b/src/main/scala/sbt/ProjectPaths.scala
index 7a75faa40..2891571eb 100644
--- a/src/main/scala/sbt/ProjectPaths.scala
+++ b/src/main/scala/sbt/ProjectPaths.scala
@@ -26,9 +26,6 @@ trait ScalaPaths extends PackagePaths
 	/** A PathFinder that selects all test resources. */
 	def testResources: PathFinder
 	
-	def mainResourceClasspath: PathFinder
-	def testResourceClasspath: PathFinder
-	
 	def mainCompilePath: Path
 	def testCompilePath: Path
 	def mainAnalysisPath: Path
@@ -36,6 +33,8 @@ trait ScalaPaths extends PackagePaths
 	def mainDocPath: Path
 	def testDocPath: Path
 	def graphPath: Path
+	def mainResourcesOutputPath: Path
+	def testResourcesOutputPath: Path
 
 	/** A PathFinder that selects all the classes compiled from the main sources.*/
 	def mainClasses: PathFinder
@@ -66,6 +65,7 @@ trait BasicScalaPaths extends Project with ScalaPaths
 {
 	def mainResourcesPath: PathFinder
 	def testResourcesPath: PathFinder
+	def managedDependencyPath: Path
 	def managedDependencyRootPath: Path
 	def dependencyPath: Path
 
@@ -82,8 +82,6 @@ trait BasicScalaPaths extends Project with ScalaPaths
 	}
 	def testSources = sources(testSourceRoots)
 	
-	def mainResourceClasspath = mainResourcesPath
-	def testResourceClasspath = testResourcesPath
 	def mainResources = descendents(mainResourcesPath ##, "*")
 	def testResources = descendents(testResourcesPath ##, "*")
 	
@@ -100,7 +98,7 @@ trait BasicScalaPaths extends Project with ScalaPaths
 		info.bootPath +++ info.builderProjectOutputPath +++
 		info.pluginsOutputPath +++ info.pluginsManagedSourcePath +++ info.pluginsManagedDependencyPath
 
-	override def outputDirectories = outputRootPath :: managedDependencyRootPath :: Nil
+	override def outputDirectories = outputPath :: managedDependencyPath :: Nil
 }
 
 @deprecated trait BasicProjectPaths extends MavenStyleScalaPaths
@@ -123,6 +121,8 @@ trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
 	def graphDirectoryName = DefaultGraphDirectoryName
 	def mainAnalysisDirectoryName = DefaultMainAnalysisDirectoryName
 	def testAnalysisDirectoryName = DefaultTestAnalysisDirectoryName
+	def mainResourcesOutputDirectoryName = DefautMainResourcesOutputDirectoryName
+	def testResourcesOutputDirectoryName = DefautTestResourcesOutputDirectoryName
 	
 	def sourcePath = path(sourceDirectoryName)
 	
@@ -132,6 +132,7 @@ trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
 	def mainResourcesPath = mainSourcePath / resourcesDirectoryName
 	def mainDocPath = docPath / mainDirectoryName / apiDirectoryName
 	def mainCompilePath = outputPath / mainCompileDirectoryName
+	def mainResourcesOutputPath = outputPath / mainResourcesOutputDirectoryName
 	def mainAnalysisPath = outputPath / mainAnalysisDirectoryName
 	
 	def testSourcePath = sourcePath / testDirectoryName
@@ -140,6 +141,7 @@ trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
 	def testResourcesPath = testSourcePath / resourcesDirectoryName
 	def testDocPath = docPath / testDirectoryName / apiDirectoryName
 	def testCompilePath = outputPath / testCompileDirectoryName
+	def testResourcesOutputPath = outputPath / testResourcesOutputDirectoryName
 	def testAnalysisPath = outputPath / testAnalysisDirectoryName
 	
 	def docPath = outputPath / docDirectoryName
@@ -183,6 +185,8 @@ object BasicProjectPaths
 	val DefaultGraphDirectoryName = "graph"
 	val DefaultMainAnalysisDirectoryName = "analysis"
 	val DefaultTestAnalysisDirectoryName = "test-analysis"
+	val DefautMainResourcesOutputDirectoryName = "resources"
+	val DefautTestResourcesOutputDirectoryName = "test-resources"
 	
 	val DefaultMainDirectoryName = "main"
 	val DefaultScalaDirectoryName = "scala"
diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
index 01b319a89..13bb8e620 100644
--- a/src/main/scala/sbt/Resources.scala
+++ b/src/main/scala/sbt/Resources.scala
@@ -79,21 +79,21 @@ class Resources(val baseDirectory: File, additional: ClassLoader)
 			else
 			{
 				val buffered = new BufferedLogger(log)
+				buffered.setLevel(Level.Debug)
+				buffered.enableTrace(true)
 				def error(msg: String) =
 				{
-					buffered.playAll()
-					buffered.stop()
+					buffered.stopAll()
 					Left(msg)
 				}
-				
-				buffered.startRecording()
+				buffered.recordAll()
 				resultToEither(Project.loadProject(dir, Nil, None, additional, buffered)) match
 				{
 					case Left(msg) =>
 						reload match
 						{
 							case ReloadErrorExpected =>
-								buffered.stop()
+								buffered.clearAll()
 								previousProject.toRight("Initial project load failed.")
 							case s: ReloadSuccessExpected => error(s.prefixIfError + msg)
 							case NoReload /* shouldn't happen */=> error(msg)
@@ -103,7 +103,7 @@ class Resources(val baseDirectory: File, additional: ClassLoader)
 						{
 							case ReloadErrorExpected => error("Expected project load failure, but it succeeded.")
 							case _ =>
-								buffered.stop()
+								buffered.clearAll()
 								Right(p)
 						}
 				}
@@ -111,15 +111,13 @@ class Resources(val baseDirectory: File, additional: ClassLoader)
 		loadResult match
 		{
 			case Right(project) =>
-				project.log.enableTrace(log.traceEnabled)
-				project.log.setLevel(log.getLevel)
 				f(project) match
 				{
 					case ContinueResult(newF, newReload) => withProject(log, Some(project), newReload, dir)(newF)
 					case ValueResult(value) => Right(value)
-					case err: ErrorResult => Left(err.message)
+					case err: ErrorResult => error(err.message)
 				}
-			case Left(message) => Left(message)
+			case Left(message) => error(message)
 		}
 	}
 
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index c104b3c37..5fa96e7b3 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -143,6 +143,8 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			}
 		}
 		
+	def syncPathsTask(sources: PathFinder, destinationDirectory: Path): Task =
+		task { FileUtilities.syncPaths(sources, destinationDirectory, log) }
 	def syncTask(sourceDirectory: Path, destinationDirectory: Path): Task =
 		task { FileUtilities.sync(sourceDirectory, destinationDirectory, log) }
 	def copyTask(sources: PathFinder, destinationDirectory: Path): Task =
@@ -323,14 +325,8 @@ trait WebScalaProject extends ScalaProject
 				}
 			}}}}).left.toOption
 		}
-	def jettyRunTask(warPath: => Path, defaultContextPath: => String, port: Int, classpath: PathFinder, classpathName: String, scanDirectories: Seq[File], scanInterval: Int): Task =
-		task { JettyRun(classpath.get, classpathName, warPath, defaultContextPath, port, scanDirectories, scanInterval, log) }
-	def jettyRunTask(warPath: => Path, defaultContextPath: => String, classpath: PathFinder, classpathName: String, scanDirectories: Seq[File], scanInterval: Int): Task =
-		jettyRunTask(warPath, defaultContextPath, JettyRun.DefaultPort, classpath, classpathName, scanDirectories, scanInterval)
-	def jettyRunTask(warPath: => Path, defaultContextPath: => String, classpath: PathFinder, classpathName: String,
-		jettyConfigurationXML: scala.xml.NodeSeq, jettyConfigurationFiles: Seq[File]): Task =
-			task { JettyRun(classpath.get, classpathName, warPath, defaultContextPath, jettyConfigurationXML, jettyConfigurationFiles, log) }
-	def jettyStopTask = task { JettyRun.stop(); None }
+	def jettyRunTask(jettyRun: JettyRunner) = task { jettyRun() }
+	def jettyStopTask(jettyRun: JettyRunner) = task { jettyRun.stop(); None }
 }
 object ScalaProject
 {
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index 37ffff6b9..16d47f9de 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -7,10 +7,13 @@ import java.io.File
 import java.net.{URL, URLClassLoader}
 import scala.xml.NodeSeq
 
-object JettyRun extends ExitHook
+object JettyRunner
 {
 	val DefaultPort = 8080
-	
+	val DefaultScanInterval = 3
+}
+class JettyRunner(configuration: JettyConfiguration) extends ExitHook
+{
 	ExitHooks.register(this)
 	
 	def name = "jetty-shutdown"
@@ -19,49 +22,38 @@ object JettyRun extends ExitHook
 	private def started(s: Stoppable) { running = Some(s) }
 	def stop()
 	{
-		synchronized
+		running.foreach(_.stop())
+		running = None
+	}
+	def apply(): Option[String] =
+	{
+		import configuration._
+		def runJetty() =
 		{
-			running.foreach(_.stop())
-			running = None
+			val baseLoader = this.getClass.getClassLoader
+			val classpathURLs = jettyClasspath.get.map(_.asURL).toSeq
+			val loader: ClassLoader = new java.net.URLClassLoader(classpathURLs.toArray, baseLoader)
+			val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.sbtJar.toURI.toURL), loader, baseLoader)
+			val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
+			runner(configuration)
+		}
+		
+		if(running.isDefined)
+			Some("This instance of Jetty is already running.")
+		else
+		{
+			try
+			{
+				started(runJetty())
+				None
+			}
+			catch
+			{
+				case e: NoClassDefFoundError => runError(e, "Jetty and its dependencies must be on the " + classpathName + " classpath: ", log)
+				case e => runError(e, "Error running Jetty: ", log)
+			}
 		}
 	}
-	def apply(classpath: Iterable[Path], classpathName: String, war: Path, defaultContextPath: String, jettyConfigurationXML: NodeSeq,
-		jettyConfigurationFiles: Seq[File], log: Logger): Option[String] =
-			run(classpathName, new JettyRunConfiguration(war, defaultContextPath, DefaultPort, jettyConfigurationXML,
-				jettyConfigurationFiles, Nil, 0, toURLs(classpath)), log)
-	def apply(classpath: Iterable[Path], classpathName: String, war: Path, defaultContextPath: String, port: Int, scanDirectories: Seq[File],
-		scanPeriod: Int, log: Logger): Option[String] =
-			run(classpathName, new JettyRunConfiguration(war, defaultContextPath, port, NodeSeq.Empty, Nil, scanDirectories, scanPeriod, toURLs(classpath)), log)
-	private def toURLs(paths: Iterable[Path]) = paths.map(_.asURL).toSeq
-	private def run(classpathName: String, configuration: JettyRunConfiguration, log: Logger): Option[String] =
-		synchronized
-		{
-			import configuration._
-			def runJetty() =
-			{
-				val baseLoader = this.getClass.getClassLoader
-				val loader: ClassLoader = new java.net.URLClassLoader(classpathURLs.toArray, baseLoader)
-				val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.sbtJar.toURI.toURL), loader, baseLoader)
-				val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
-				runner(configuration, log)
-			}
-			
-			if(running.isDefined)
-				Some("Jetty is already running.")
-			else
-			{
-				try
-				{
-					started(runJetty())
-					None
-				}
-				catch
-				{
-					case e: NoClassDefFoundError => runError(e, "Jetty and its dependencies must be on the " + classpathName + " classpath: ", log)
-					case e => runError(e, "Error running Jetty: ", log)
-				}
-			}
-		}
 	private val implClassName = "sbt.LazyJettyRun"
 	
 	private def runError(e: Throwable, messageBase: String, log: Logger) =
@@ -77,11 +69,30 @@ private trait Stoppable
 }
 private trait JettyRun
 {
-	def apply(configuration: JettyRunConfiguration, log: Logger): Stoppable
+	def apply(configuration: JettyConfiguration): Stoppable
+}
+sealed trait JettyConfiguration extends NotNull
+{
+	def war: Path
+	def scanDirectories: Seq[File]
+	def scanInterval: Int
+	/** The classpath to get Jetty from. */
+	def jettyClasspath: PathFinder
+	/** The classpath containing the classes, jars, and resources for the web application. */
+	def classpath: PathFinder
+	def classpathName: String
+	def log: Logger
+}
+trait DefaultJettyConfiguration extends JettyConfiguration
+{
+	def contextPath: String
+	def port: Int
+}
+abstract class CustomJettyConfiguration extends JettyConfiguration
+{
+	def jettyConfigurationFiles: Seq[File] = Nil
+	def jettyConfigurationXML: NodeSeq = NodeSeq.Empty
 }
-private class JettyRunConfiguration(val war: Path, val defaultContextPath: String, val port: Int,
-	val jettyConfigurationXML: NodeSeq, val jettyConfigurationFiles: Seq[File],
-	val scanDirectories: Seq[File], val scanInterval: Int, val classpathURLs: Seq[URL]) extends NotNull
 
 /* This class starts Jetty.
 * NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
@@ -102,51 +113,51 @@ private object LazyJettyRun extends JettyRun
 	
 	val DefaultMaxIdleTime = 30000
 	
-	def apply(configuration: JettyRunConfiguration, log: Logger): Stoppable =
+	def apply(configuration: JettyConfiguration): Stoppable =
 	{
-		import configuration._
 		val oldLog = Log.getLog
-		Log.setLog(new JettyLogger(log))
+		Log.setLog(new JettyLogger(configuration.log))
 		val server = new Server
-		val useDefaults = jettyConfigurationXML.isEmpty && jettyConfigurationFiles.isEmpty
 		
 		val listener =
-			if(useDefaults)
+			configuration match
 			{
-				configureDefaultConnector(server, port)
-				def createLoader = new URLClassLoader(classpathURLs.toArray, this.getClass.getClassLoader)
-				val webapp = new WebAppContext(war.absolutePath, defaultContextPath)
-				webapp.setClassLoader(createLoader)
-				server.setHandler(webapp)
-				
-				Some(new Scanner.BulkListener {
-					def filesChanged(files: java.util.List[_]) {
-						reload(server, webapp.setClassLoader(createLoader), log)
-					}
-				})
-			}
-			else
-			{
-				for(x <- jettyConfigurationXML)
-					(new XmlConfiguration(x.toString)).configure(server)
-				for(file <- jettyConfigurationFiles)
-					(new XmlConfiguration(file.toURI.toURL)).configure(server)
-				None
+				case c: DefaultJettyConfiguration =>
+					import c._
+					configureDefaultConnector(server, port)
+					def classpathURLs = classpath.get.map(_.asURL).toSeq
+					def createLoader = new URLClassLoader(classpathURLs.toArray, this.getClass.getClassLoader)
+					val webapp = new WebAppContext(war.absolutePath, contextPath)
+					webapp.setClassLoader(createLoader)
+					server.setHandler(webapp)
+					
+					Some(new Scanner.BulkListener {
+						def filesChanged(files: java.util.List[_]) {
+							reload(server, webapp.setClassLoader(createLoader), log)
+						}
+					})
+				case c: CustomJettyConfiguration =>
+					for(x <- c.jettyConfigurationXML)
+						(new XmlConfiguration(x.toString)).configure(server)
+					for(file <- c.jettyConfigurationFiles)
+						(new XmlConfiguration(file.toURI.toURL)).configure(server)
+					None
 			}
 		
 		def configureScanner() =
 		{
+			val scanDirectories = configuration.scanDirectories
 			if(listener.isEmpty || scanDirectories.isEmpty)
 				None
 			else
 			{
-				log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
+				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
 				val scanner = new Scanner
 				val list = new java.util.ArrayList[File]
 				scanDirectories.foreach(x => list.add(x))
 				scanner.setScanDirs(list)
 				scanner.setRecursive(true)
-				scanner.setScanInterval(scanInterval)
+				scanner.setScanInterval(configuration.scanInterval)
 				scanner.setReportExistingFilesOnStartup(false)
 				scanner.addListener(listener.get)
 				scanner.start()
@@ -186,18 +197,15 @@ private object LazyJettyRun extends JettyRun
 	}
 	private def reload(server: Server, reconfigure: => Unit, log: Logger)
 	{
-		JettyRun.synchronized
-		{
-			log.info("Reloading web application...")
-			val handlers = wrapNull(server.getHandlers, server.getHandler)
-			log.debug("Stopping handlers: " + handlers.mkString(", "))
-			handlers.foreach(_.stop)
-			log.debug("Reconfiguring...")
-			reconfigure
-			log.debug("Restarting handlers: " + handlers.mkString(", "))
-			handlers.foreach(_.start)
-			log.info("Reload complete.")
-		}
+		log.info("Reloading web application...")
+		val handlers = wrapNull(server.getHandlers, server.getHandler)
+		log.debug("Stopping handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.stop)
+		log.debug("Reconfiguring...")
+		reconfigure
+		log.debug("Restarting handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.start)
+		log.info("Reload complete.")
 	}
 	private def wrapNull(a: Array[Handler], b: Handler) =
 		(a, b) match
diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
index ab8157a4a..325cabf15 100644
--- a/src/main/scala/sbt/impl/ProcessImpl.scala
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -105,9 +105,7 @@ private abstract class AbstractProcessBuilder extends ProcessBuilder with SinkPa
 	private[this] def runBuffered(log: Logger, connectInput: Boolean) =
 	{
 		val log2 = new BufferedLogger(log)
-		log2.startRecording()
-		try { run(log2, connectInput).exitValue() }
-		finally { log2.playAll(); log2.clearAll() }
+		log2.bufferAll {  run(log2, connectInput).exitValue() }
 	}
 	def !(io: ProcessIO) = run(io).exitValue()
 
diff --git a/src/main/scala/sbt/impl/RunTask.scala b/src/main/scala/sbt/impl/RunTask.scala
index 8b87e4143..5ce5a6da4 100644
--- a/src/main/scala/sbt/impl/RunTask.scala
+++ b/src/main/scala/sbt/impl/RunTask.scala
@@ -2,6 +2,7 @@
  * Copyright 2009  Mark Harrah
  */
  package sbt.impl
+ import sbt._
 
 import scala.collection.{immutable, mutable}
 import scala.collection.Map
@@ -44,11 +45,7 @@ private final class RunTask(root: Task, rootName: String, maximumTasks: Int) ext
 	// it ignores the root task so that the root task may be run with buffering disabled so that the output
 	// occurs without delay.
 	private def runTasksExceptRoot() =
-	{
-		withBuffered(_.startRecording())
-		try { ParallelRunner.run(expandedRoot, expandedTaskName, runIfNotRoot, maximumTasks, (t: Task) => t.manager.log) }
-		finally { withBuffered(_.stop()) }
-	}
+		ParallelRunner.run(expandedRoot, expandedTaskName, runIfNotRoot, maximumTasks, (t: Task) => t.manager.log)
 	private def withBuffered(f: BufferedLogger => Unit)
 	{
 		for(buffered <- bufferedLoggers)
@@ -69,38 +66,29 @@ private final class RunTask(root: Task, rootName: String, maximumTasks: Int) ext
 		val label = if(multiProject) (action.manager.name + " / " + actionName) else actionName
 		def banner(event: ControlEvent.Value, firstSeparator: String, secondSeparator: String) =
 			Control.trap(action.manager.log.control(event, firstSeparator + " " + label + " " + secondSeparator))
-		if(parallel)
+		val buffered = parallel && !isRoot(action)
+		if(buffered)
+			banner(ControlEvent.Start, "\n  ", "...")
+		def doRun() =
 		{
-			try { banner(ControlEvent.Start, "\n  ", "...") }
-			finally { flush(action) }
+			banner(ControlEvent.Header, "\n==", "==")
+			try { action.invoke }
+			catch { case e: Exception => action.manager.log.trace(e); Some(e.toString) }
+			finally { banner(ControlEvent.Finish, "==", "==") }
 		}
-		banner(ControlEvent.Header, "\n==", "==")
-		try { action.invoke }
-		catch { case e: Exception => action.manager.log.trace(e); Some(e.toString) }
-		finally
+		
+		if(buffered)
+			bufferLogging(action, doRun())
+		else
+			doRun()
+	}
+	private def bufferLogging[T](action: Task, f: => T) =
+		bufferedLogger(action.manager) match
 		{
-			banner(ControlEvent.Finish, "==", "==")
-			if(parallel)
-				flush(action)
+			case Some(buffered) => buffered.buffer { f }
+			case None => f
 		}
-	}
-	private def trapFinally(toTrap: => Unit)(runFinally: => Unit)
-	{
-		try { toTrap }
-		catch { case e: Exception => () }
-		finally { try { runFinally } catch { case e: Exception => () } }
-	}
-	private def flush(action: Task)
-	{
-		for(buffered <- bufferedLogger(action.manager))
-			Control.trap(flush(buffered))
-	}
-	private def flush(buffered: BufferedLogger)
-	{
-		buffered.play()
-		buffered.clear()
-	}
-
+	
 	/* Most of the following is for implicitly adding dependencies (see the expand method)*/
 	private val projectDependencyCache = identityMap[Project, Iterable[Project]]
 	private def dependencies(project: Project) = projectDependencyCache.getOrElseUpdate(project, project.topologicalSort.dropRight(1))

From 84e98aae1ac4a0b72a60af31f336948343ba006e Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 2 Aug 2009 02:05:32 +0000
Subject: [PATCH 069/268] Fixed broken test case

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@937 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/sbt-test/project/multi/changes/SingleAndTraitProject.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala b/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
index 46c2904cb..503b434d1 100644
--- a/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
+++ b/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
@@ -6,4 +6,4 @@ class TestProject(info: ProjectInfo) extends DefaultProject(info)
 
 trait NotAProject extends Project
 abstract class AnotherNonProject extends Project
-object YetAnotherNonProject extends DefaultProject(ProjectInfo(new java.io.File("."), Nil, None))
\ No newline at end of file
+object YetAnotherNonProject extends DefaultProject(ProjectInfo(new java.io.File("."), Nil, None)(new ConsoleLogger))
\ No newline at end of file

From a3f1c671a6920c72bd50b429cfba09160c1a1930 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 8 Aug 2009 22:13:10 +0000
Subject: [PATCH 070/268] JSP test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@940 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/sbt-test/web/jsp/project/build.properties |  2 ++
 src/sbt-test/web/jsp/project/build/JSP.scala  | 28 +++++++++++++++++++
 .../web/jsp/src/main/webapp/index.jsp         |  5 ++++
 src/sbt-test/web/jsp/test                     | 11 ++++++++
 4 files changed, 46 insertions(+)
 create mode 100644 src/sbt-test/web/jsp/project/build.properties
 create mode 100644 src/sbt-test/web/jsp/project/build/JSP.scala
 create mode 100644 src/sbt-test/web/jsp/src/main/webapp/index.jsp
 create mode 100644 src/sbt-test/web/jsp/test

diff --git a/src/sbt-test/web/jsp/project/build.properties b/src/sbt-test/web/jsp/project/build.properties
new file mode 100644
index 000000000..421dd95d3
--- /dev/null
+++ b/src/sbt-test/web/jsp/project/build.properties
@@ -0,0 +1,2 @@
+project.name=JSP Test
+project.version=a
\ No newline at end of file
diff --git a/src/sbt-test/web/jsp/project/build/JSP.scala b/src/sbt-test/web/jsp/project/build/JSP.scala
new file mode 100644
index 000000000..48aa9c5fd
--- /dev/null
+++ b/src/sbt-test/web/jsp/project/build/JSP.scala
@@ -0,0 +1,28 @@
+import sbt._
+
+class JSP(info: ProjectInfo) extends DefaultWebProject(info)
+{
+	val j6 = "org.mortbay.jetty" % "jetty" % "6.1.17" % "test->default"
+	val j = "org.mortbay.jetty" % "jsp-2.0" % "6.1.17" % "test->default"
+	
+	def indexURL = new java.net.URL("http://localhost:8080")
+	def indexFile = new java.io.File("index.html")
+	import Process._
+	lazy val getPage = execTask { indexURL #> indexFile }
+	lazy val checkPage = task { checkHelloWorld() } dependsOn getPage
+	
+	private def checkHelloWorld() =
+	{
+		try
+		{
+			FileUtilities.readString(indexFile, log) match
+			{
+				case Right(value) =>
+					if(value.contains("Hello World!")) None
+					else Some("index.html did not contain 'Hello World!' :\n" +value)
+				case Left(msg) => Some(msg)
+			}
+		}
+		finally { jettyInstance.stop() }
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/web/jsp/src/main/webapp/index.jsp b/src/sbt-test/web/jsp/src/main/webapp/index.jsp
new file mode 100644
index 000000000..2a7d1f317
--- /dev/null
+++ b/src/sbt-test/web/jsp/src/main/webapp/index.jsp
@@ -0,0 +1,5 @@
+<html>
+	<body>
+		<% out.println(" Hello World!"); %>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/sbt-test/web/jsp/test b/src/sbt-test/web/jsp/test
new file mode 100644
index 000000000..f18db92d3
--- /dev/null
+++ b/src/sbt-test/web/jsp/test
@@ -0,0 +1,11 @@
+> update
+[success]
+
+> jetty-run
+[success]
+
+> check-page
+[success]
+
+> jetty-stop
+[success]
\ No newline at end of file

From d798cb88b8e98e8a51c2242b170a993bb4e4cfcd Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 8 Aug 2009 22:16:25 +0000
Subject: [PATCH 071/268]  * Updates for 2.8 nightly from Aug. 6  * javap, sh,
 exec actions  * Test summary

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@941 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/DefaultProject.scala     |  5 +-
 src/main/scala/sbt/ScalaProject.scala       | 54 ++++++++++++++++-----
 src/main/scala/sbt/TestReportListener.scala | 29 +++++++++--
 src/main/scala/sbt/impl/ProcessImpl.scala   | 22 +++++++--
 src/main/scala/sbt/wrap/Wrappers.scala      |  3 ++
 5 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index bba9655df..b7e9f6a77 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -292,6 +292,9 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	lazy val testFailed = testFailedAction
 	lazy val testOnly = testOnlyAction
 	
+	lazy val javap = javapTask(runClasspath, mainCompileConditional, mainCompilePath)
+	lazy val testJavap = javapTask(testClasspath, testCompileConditional, testCompilePath)
+	
 	def jarsOfProjectDependencies = Path.lazyPathFinder {
 		topologicalSort.dropRight(1) flatMap { p =>
 			p match
@@ -318,7 +321,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	protected def prepareWebappAction =
 		prepareWebappTask(webappResources, temporaryWarPath, webappClasspath, mainDependencies.scalaJars) dependsOn(compile, copyResources)
 	
-	private lazy val jettyInstance = new JettyRunner(jettyConfiguration)
+	lazy val jettyInstance = new JettyRunner(jettyConfiguration)
 	
 	def jettyConfiguration =
 		new DefaultJettyConfiguration
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 5fa96e7b3..b3112db6d 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -8,7 +8,7 @@ import java.io.File
 import java.util.jar.{Attributes, Manifest}
 import scala.collection.mutable.ListBuffer
 
-trait SimpleScalaProject extends Project
+trait SimpleScalaProject extends ExecProject
 {
 	def errorTask(message: String) = task{ Some(message) }
 	
@@ -53,19 +53,8 @@ trait SimpleScalaProject extends Project
 				pathClean orElse restored
 			}
 		}
-	def execTask(buildCommand: => ProcessBuilder): Task =
-		task
-		{
-			val command = buildCommand
-			log.debug("Executing command " + command)
-			val exitValue = command.run(log).exitValue() // don't buffer output
-			if(exitValue == 0)
-				None
-			else
-				Some("Nonzero exit value: " + exitValue)
-		}
 }
-trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProject
+trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProject with Exec
 {
 	import ScalaProject._
 	
@@ -124,6 +113,17 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		val Private = Value("private")
 	}
 
+	def javapTask(classpath: PathFinder, conditional: CompileConditional, outputPath: Path) =
+	 task { args =>
+		val cp = classpath +++ Path.fromFile(FileUtilities.scalaLibraryJar) +++ Path.fromFile(FileUtilities.scalaCompilerJar)
+		execOut { Process("javap" :: "-classpath" :: Path.makeString(cp.get) :: args.toList) }
+	} completeWith(classNames(conditional, outputPath))
+	private def classNames(conditional: CompileConditional, outputPath: Path) =
+	{
+		val classes = conditional.analysis.allProducts.flatMap(Path.relativize(outputPath, _))
+		classes.map(_.relativePath.replace(java.io.File.separatorChar, '.').toList.dropRight(".class".length).mkString).toSeq
+	}
+	
 	def consoleTask(classpath : PathFinder): Task = 
 		consoleTask(classpath, Run)
 	def consoleTask(classpath : PathFinder, runner: ScalaRun): Task =
@@ -363,4 +363,32 @@ trait MultiTaskProject extends Project
 			run(includeFunction)
 		} completeWith allTests
 	
+}
+trait ExecProject extends Project
+{
+	def execOut(p: => ProcessBuilder) =
+		task
+		{
+			val exitValue = (p !)
+			if(exitValue == 0)
+				None
+			else
+				Some("Nonzero exit value: " + exitValue)
+		}
+	def execTask(buildCommand: => ProcessBuilder): Task =
+		task
+		{
+			val command = buildCommand
+			log.debug("Executing command " + command)
+			val exitValue = command.run(log).exitValue() // don't buffer output
+			if(exitValue == 0)
+				None
+			else
+				Some("Nonzero exit value: " + exitValue)
+		}
+}
+trait Exec extends SimpleScalaProject
+{
+	lazy val sh = task { args =>  execOut { Process("sh" :: "-c" :: args.mkString(" ") :: Nil) } }
+	lazy val exec = task { args => execOut { Process(args) } }
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/TestReportListener.scala b/src/main/scala/sbt/TestReportListener.scala
index 09e2a97d0..2f664937c 100644
--- a/src/main/scala/sbt/TestReportListener.scala
+++ b/src/main/scala/sbt/TestReportListener.scala
@@ -22,8 +22,6 @@ trait TestsListener extends TestReportListener
   def doInit
 	/** called once, at end. */
   def doComplete(finalResult: Result.Value)
-	/** called once, at end, if the test framework throws an exception. */
-  @deprecated def doComplete(t: Throwable)
 }
 
 abstract class WriterReportListener(val log: Logger) extends TestsListener
@@ -281,7 +279,7 @@ class SpecsOutput(val log: Logger) extends EventOutput[SpecsEvent]
 	}
 }
 
-class LogTestReportListener(val log: Logger) extends TestReportListener
+class LogTestReportListener(val log: Logger) extends TestsListener
 {
 	lazy val scalaCheckOutput: EventOutput[ScalaCheckEvent] = createScalaCheckOutput
 	lazy val scalaTestOutput: EventOutput[ScalaTestEvent] = createScalaTestOutput
@@ -295,6 +293,7 @@ class LogTestReportListener(val log: Logger) extends TestReportListener
 	def testEvent(event: TestEvent)
 	{
 		log.debug("in testEvent:" + event)
+		count(event)
 		event match
 		{
 			case sce: ScalaCheckEvent => scalaCheckOutput.output(sce)
@@ -313,4 +312,28 @@ class LogTestReportListener(val log: Logger) extends TestReportListener
 	{
 		log.debug("in endGroup:" + result)
 	}
+	protected def count(event: TestEvent): Unit =
+	{
+		for(result <- event.result)
+		{
+			totalTests += 1
+			result match
+			{
+				case Result.Error => errors += 1
+				case Result.Failed => failed += 1
+				case Result.Passed => passed += 1
+			}
+		}
+	}
+	protected var totalTests, errors, passed, failed = 0
+	def doInit
+	{
+		totalTests = 0
+		errors = 0
+		passed = 0
+		failed = 0
+	}
+		/** called once, at end. */
+	def doComplete(finalResult: Result.Value): Unit =
+		log.info(<x>Run: {totalTests.toString}, Passed: {passed.toString}, Errors: {errors.toString}, Failed: {failed.toString}</x>.text)
 }
diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
index 325cabf15..af7c7dd90 100644
--- a/src/main/scala/sbt/impl/ProcessImpl.scala
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -9,7 +9,6 @@ import java.io.{FilterInputStream, FilterOutputStream, PipedInputStream, PipedOu
 import java.io.{File, FileInputStream, FileOutputStream}
 import java.net.URL
 
-import scala.concurrent.ops.future
 import scala.concurrent.SyncVar
 
 /** Runs provided code in a new Thread and returns the Thread instance. */
@@ -24,6 +23,23 @@ private object Spawn
 		thread
 	}
 }
+private object Future
+{
+	def apply[T](f: => T): () => T =
+	{
+		val result = new SyncVar[Either[Throwable, T]]
+		def run: Unit =
+			try { result.set(Right(f)) }
+			catch { case e: Exception => result.set(Left(e)) }
+		Spawn(run)
+		() =>
+			result.get match
+			{
+				case Right(value) => value
+				case Left(exception) => throw exception
+			}
+	}
+}
 
 private object BasicIO
 {
@@ -156,7 +172,7 @@ private abstract class CompoundProcess extends BasicProcess
 		val thread = Spawn(code.set(runAndExitValue()))
 		
 		(
-			future { thread.join(); code.get },
+			Future { thread.join(); code.get },
 			() => thread.interrupt()
 		)
 	}
@@ -312,7 +328,7 @@ private[sbt] class DummyProcessBuilder(override val toString: String, exitValue
 * The implementation of `exitValue` waits until these threads die before returning. */
 private class DummyProcess(action: => Int) extends Process
 {
-	private[this] val exitCode = scala.concurrent.ops.future(action)
+	private[this] val exitCode = Future(action)
 	override def exitValue() = exitCode()
 	override def destroy() {}
 }
diff --git a/src/main/scala/sbt/wrap/Wrappers.scala b/src/main/scala/sbt/wrap/Wrappers.scala
index e78ca2207..d5cfd4b93 100644
--- a/src/main/scala/sbt/wrap/Wrappers.scala
+++ b/src/main/scala/sbt/wrap/Wrappers.scala
@@ -80,6 +80,7 @@ private[sbt] sealed abstract class Map[K,V] extends Iterable[(K,V)]
 {
 	def apply(key: K): V
 	def get(key: K): Option[V]
+	def containsKey(key: K): Boolean
 	final def getOrElse[V2 >: V](key: K, default: => V2): V2 =
 		get(key) match
 		{
@@ -98,6 +99,7 @@ private[sbt] sealed abstract class MapWrapper[K,V](val underlying: JMap[K,V]) ex
 		else
 			Some(value)
 	}
+	final def containsKey(key: K) = underlying.containsKey(key)
 	final def toList = Wrappers.toList(underlying)
 	final def values = toList.map(_._2)
 }
@@ -116,5 +118,6 @@ private[sbt] sealed class MutableMapWrapper[K,V](wrapped: JMap[K,V]) extends Map
 	final def update(key: K, value: V) { underlying.put(key, value) }
 	final def +=(pair: (K, V) ) { update(pair._1, pair._2) }
 	final def -=(key: K) { underlying.remove(key) }
+	final def remove(key: K) = underlying.remove(key)
 	final def readOnly: Map[K,V] = this
 }
\ No newline at end of file

From 749934f64a0a7ec322a633a4028f9f1062eeec08 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 9 Aug 2009 02:03:24 +0000
Subject: [PATCH 072/268]  * Moved topologicalSort in Dag trait to companion
 object  * Subprojects can be excluded from dependencies so that their actions
 aren't executed when a parent's actions are

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@944 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala |  2 +-
 src/main/scala/sbt/Dag.scala               | 21 ++++++++++++---------
 src/main/scala/sbt/Main.scala              | 12 ++++++------
 src/main/scala/sbt/Project.scala           | 12 ++----------
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 03a1d3073..ea4d8e00c 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -520,7 +520,7 @@ trait ReflectiveProject extends ReflectiveModules with ReflectiveTasks with Refl
 /** This Project subclass is used to contain other projects as dependencies.*/
 class ParentProject(val info: ProjectInfo) extends BasicDependencyProject
 {
-	def dependencies = info.dependencies ++ subProjects.values.toList
+	def dependencies: Iterable[Project] = info.dependencies ++ subProjects.values.toList
 	/** The directories to which a project writes are listed here and is used
 	* to check a project and its dependencies for collisions.*/
 	override def outputDirectories = managedDependencyPath :: outputPath :: Nil
diff --git a/src/main/scala/sbt/Dag.scala b/src/main/scala/sbt/Dag.scala
index 8a18491e6..8a33b60c7 100644
--- a/src/main/scala/sbt/Dag.scala
+++ b/src/main/scala/sbt/Dag.scala
@@ -1,28 +1,31 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008 David MacIver
+ * Copyright 2008, 2009 David MacIver, Mark Harrah
  */
 package sbt;
 
-import scala.collection.mutable;
-
 trait Dag[Node <: Dag[Node]]{
 	self : Node =>
 
 	def dependencies : Iterable[Node]
+	def topologicalSort = Dag.topologicalSort(self)(_.dependencies)
+}
+object Dag
+{
+	import scala.collection.mutable;
 
-	def topologicalSort = {
-		val discovered = new mutable.HashSet[Node];
-		val finished = new wrap.MutableSetWrapper(new java.util.LinkedHashSet[Node])
+	def topologicalSort[T](root: T)(dependencies: T => Iterable[T]) = {
+		val discovered = new mutable.HashSet[T];
+		val finished = new wrap.MutableSetWrapper(new java.util.LinkedHashSet[T])
 
-		def visit(dag : Node){
+		def visit(dag : T){
 			if (!discovered(dag)) {
 				discovered(dag) = true; 
-				dag.dependencies.foreach(visit);
+				dependencies(dag).foreach(visit);
 				finished += dag;
 			}
 		}
 
-		visit(self);
+		visit(root);
 	
 		finished.toList;
 	}
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index aa8f13091..7f58b8e16 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -72,7 +72,7 @@ object Main
 				import success.project
 				val doNext: RunCompleteAction =
 					// in interactive mode, fill all undefined properties
-					if(args.length > 0 || fillUndefinedProjectProperties(project.topologicalSort.toList.reverse))
+					if(args.length > 0 || fillUndefinedProjectProperties(project.projectClosure.toList.reverse))
 						startProject(project, args, startTime)
 					else
 						new Exit(NormalExitCode)
@@ -191,7 +191,7 @@ object Main
 	**/
 	private def interactive(baseProject: Project): RunCompleteAction =
 	{
-		val projectNames = baseProject.topologicalSort.map(_.name)
+		val projectNames = baseProject.projectClosure.map(_.name)
 		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
 		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), prefixes)
 		val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log)
@@ -235,7 +235,7 @@ object Main
 					else if(trimmed.startsWith(ProjectAction + " "))
 					{
 						val projectName = trimmed.substring(ProjectAction.length + 1)
-						baseProject.topologicalSort.find(_.name == projectName) match
+						baseProject.projectClosure.find(_.name == projectName) match
 						{
 							case Some(newProject) =>
 							{
@@ -255,7 +255,7 @@ object Main
 						if(trimmed == HelpAction)
 							displayInteractiveHelp()
 						else if(trimmed == ShowProjectsAction)
-							baseProject.topologicalSort.foreach(listProject)
+							baseProject.projectClosure.foreach(listProject)
 						else if(trimmed.startsWith(SetAction + " "))
 							setProperty(currentProject, trimmed.substring(SetAction.length + 1))
 						else if(trimmed.startsWith(GetAction + " "))
@@ -414,7 +414,7 @@ object Main
 	private def toggleTrace(project: Project)
 	{
 		val newValue = !project.log.traceEnabled
-		project.topologicalSort.foreach(_.log.enableTrace(newValue))
+		project.projectClosure.foreach(_.log.enableTrace(newValue))
 		printTraceEnabled(project)
 	}
 	private def printTraceEnabled(project: Project)
@@ -424,7 +424,7 @@ object Main
 	/** Sets the logging level on the given project.*/
 	private def setLevel(project: Project, level: Level.Value)
 	{
-		project.topologicalSort.foreach(_.log.setLevel(level))
+		project.projectClosure.foreach(_.log.setLevel(level))
 		Console.println("Set log level to " + project.log.getLevel)
 	}
 	/** Prints the elapsed time to the given project's log using the given
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 62587ccd3..76f999125 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -82,15 +82,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* specified for the project and are different from those specified in the project constructor. The
 	* main use within sbt is in ParentProject.*/
 	def subProjects: Map[String, Project] = immutable.Map.empty
-	/** The name of this project and the names of all subprojects/dependencies, transitively.*/
-	def projectNames: Iterable[String] =
-	{
-		val names = new mutable.HashSet[String]
-		names ++= subProjects.keys
-		for(dependentProject <- topologicalSort)
-			names ++= dependentProject.tasks.keys
-		names.toList
-	}
+	def projectClosure: List[Project] = Dag.topologicalSort(this)(p => p.dependencies ++ p.subProjects.values.toList)
 	
 	def call(name: String, parameters: Array[String]): Option[String] =
 	{
@@ -424,7 +416,7 @@ object Project
 	* output directories. */
 	private def checkOutputDirectoriesImpl(project: Project): LoadResult =
 	{
-		val projects = project.topologicalSort
+		val projects = project.projectClosure
 		import scala.collection.mutable.{HashMap, HashSet, Set}
 		val outputDirectories = new HashMap[Path, Set[Project]]
 		for(p <- projects; path <- p.outputDirectories)

From b79de8d7881ce83953f4ef10b44c4b5f0a551b10 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 13 Aug 2009 01:47:09 +0000
Subject: [PATCH 073/268] Build against 2.8.0 static snapshot

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@950 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build/CrossCompileProject.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
index 1c1e6b52e..00d47e318 100644
--- a/project/build/CrossCompileProject.scala
+++ b/project/build/CrossCompileProject.scala
@@ -15,7 +15,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private val version2_7_3 = "2.7.3"
 	private val version2_7_4 = "2.7.4"
 	private val version2_7_5 = "2.7.5"
-	private val version2_8_0 = "2.8.0-SNAPSHOT"
+	private val version2_8_0 = "2.8.0.r18462-b20090811081019"
 	private val base = "base"
 
 	/* The configurations for the versions of Scala.*/

From fb2aabadd77c4da43acb6cb349f2a36baf988ae3 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 13 Aug 2009 02:50:00 +0000
Subject: [PATCH 074/268]  * Improved Ivy-related code to not load unnecessary
 default settings  * Moved repository order to be local, user repositories,
 Maven Central, and then Scala Tools

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@951 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala   | 251 ++++--------------
 src/main/scala/sbt/ManagedInterface.scala     |  16 +-
 src/main/scala/sbt/impl/ConvertResolver.scala | 100 +++++++
 src/main/scala/sbt/impl/ManagedImpl.scala     |  76 ++++++
 4 files changed, 237 insertions(+), 206 deletions(-)
 create mode 100644 src/main/scala/sbt/impl/ConvertResolver.scala
 create mode 100644 src/main/scala/sbt/impl/ManagedImpl.scala

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index d5fee4473..9c8fa52cb 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -23,14 +23,12 @@ import core.resolve.ResolveOptions
 import core.retrieve.RetrieveOptions
 import core.settings.IvySettings
 import plugins.matcher.{ExactPatternMatcher, PatternMatcher}
-import plugins.parser.ModuleDescriptorParser
 import plugins.parser.m2.{PomModuleDescriptorParser,PomModuleDescriptorWriter}
 import plugins.parser.xml.XmlModuleDescriptorParser
 import plugins.repository.{BasicResource, Resource}
 import plugins.repository.url.URLResource
-import plugins.resolver.{ChainResolver, DependencyResolver, IBiblioResolver}
-import plugins.resolver.{AbstractPatternsBasedResolver, AbstractSshBasedResolver, FileSystemResolver, SFTPResolver, SshResolver, URLResolver}
-import util.{Message, MessageLogger}
+import plugins.resolver.ChainResolver
+import util.Message
 
 final class IvyScala(val scalaVersion: String, val configurations: Iterable[Configuration], val checkExplicit: Boolean, val filterImplicit: Boolean) extends NotNull
 final class IvyPaths(val projectDirectory: Path, val managedLibDirectory: Path, val cacheDirectory: Option[Path]) extends NotNull
@@ -60,21 +58,25 @@ object ManageDependencies
 	private def withIvyValue[T](config: IvyConfiguration)(doWithIvy: (Ivy, ModuleDescriptor, String) => Either[String, T]) =
 	{
 		import config._
+		log.debug("\nwithIvyValue...\n")
 		val logger = new IvyLogger(log)
+		val originalLogger = Message.getDefaultLogger
 		Message.setDefaultLogger(logger)
-		val ivy = Ivy.newInstance()
-		ivy.getLoggerEngine.pushLogger(logger)
+		log.debug("\nSet default logger...\n")
+		val settings = new IvySettings
+		settings.setBaseDir(paths.projectDirectory.asFile)
+		log.debug("\nCreated settings...\n")
 		
 		/** Parses the given Maven pom 'pomFile'.*/
 		def readPom(pomFile: File) =
 			Control.trap("Could not read pom: ", log)
-				{ Right((PomModuleDescriptorParser.getInstance.parseDescriptor(ivy.getSettings, toURL(pomFile), flags.validate)), "compile") }
+				{ Right((PomModuleDescriptorParser.getInstance.parseDescriptor(settings, toURL(pomFile), flags.validate)), "compile") }
 		/** Parses the given Ivy file 'ivyFile'.*/
 		def readIvyFile(ivyFile: File) =
 			Control.trap("Could not read Ivy file: ", log)
 			{
 				val url = toURL(ivyFile)
-				val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
+				val parser = new CustomXmlParser.CustomParser(settings)
 				parser.setValidate(flags.validate)
 				parser.setSource(url)
 				parser.parse()
@@ -87,7 +89,7 @@ object ManageDependencies
 		def parseDependencies(xml: String, moduleID: DefaultModuleDescriptor, defaultConfiguration: String): Either[String, CustomXmlParser.CustomParser] =
 			Control.trap("Could not read dependencies: ", log)
 			{
-				val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
+				val parser = new CustomXmlParser.CustomParser(settings)
 				parser.setMd(moduleID)
 				parser.setDefaultConf(defaultConfiguration)
 				parser.setValidate(flags.validate)
@@ -98,34 +100,27 @@ object ManageDependencies
 				Right(parser)
 			}
 		/** Configures Ivy using the specified Ivy configuration file.  This method is used when the manager is explicitly requested to be MavenManager or
-		* IvyManager.  If a file is not specified, Ivy is configured with defaults and scala-tools releases is added as a repository.*/
+		* IvyManager.  If a file is not specified, Ivy is configured with defaults.*/
 		def configure(configFile: Option[Path])
 		{
 			configFile match
 			{
-				case Some(path) => ivy.configure(path.asFile)
-				case None =>
-					configureDefaults()
-					scalaTools()
-			}
-		}
-		/** Adds the scala-tools.org releases maven repository to the list of resolvers if configured to do so in IvyFlags.*/
-		def scalaTools()
-		{
-			if(flags.addScalaTools)
-			{
-				log.debug("Added Scala Tools Releases repository.")
-				addResolvers(ivy.getSettings, ScalaToolsReleases :: Nil, log)
+				case Some(path) => settings.load(path.asFile)
+				case None => configureDefaults(defaultResolvers)
 			}
 		}
+		def defaultResolvers: Seq[Resolver] = withDefaultResolvers(Nil)
+		def withDefaultResolvers(user: Seq[Resolver]): Seq[Resolver] =
+			Seq(Resolver.defaultLocal) ++
+			user ++
+			Seq(DefaultMavenRepository) ++
+			(if(flags.addScalaTools) Seq(ScalaToolsReleases) else Nil)
+		
 		/** Configures Ivy using defaults.  This is done when no ivy-settings.xml exists. */
-		def configureDefaults()
+		def configureDefaults(resolvers: Seq[Resolver])
 		{
-			ivy.configureDefault
-			val settings = ivy.getSettings
-			for(dir <- paths.cacheDirectory) settings.setDefaultCache(dir.asFile)
-			settings.setBaseDir(paths.projectDirectory.asFile)
-			configureCache(settings)
+			configureCache(settings, paths.cacheDirectory)
+			setResolvers(settings, resolvers, log)
 		}
 		/** Called to configure Ivy when the configured dependency manager is SbtManager and inline configuration is specified or if the manager
 		* is AutodetectManager.  It will configure Ivy with an 'ivy-settings.xml' file if there is one, or configure the defaults and add scala-tools as
@@ -135,12 +130,9 @@ object ManageDependencies
 			log.debug("Autodetecting configuration.")
 			val defaultIvyConfigFile = defaultIvyConfiguration(paths.projectDirectory).asFile
 			if(defaultIvyConfigFile.canRead)
-				ivy.configure(defaultIvyConfigFile)
+				settings.load(defaultIvyConfigFile)
 			else
-			{
-				configureDefaults()
-				scalaTools()
-			}
+				configureDefaults(defaultResolvers)
 		}
 		/** Called to determine dependencies when the dependency manager is SbtManager and no inline dependencies (Scala or XML) are defined
 		* or if the manager is AutodetectManager.  It will try to read from pom.xml first and then ivy.xml if pom.xml is not found.  If neither is found,
@@ -200,9 +192,7 @@ object ManageDependencies
 					else
 					{
 						log.debug("Using inline repositories.")
-						configureDefaults()
-						val extra = if(flags.addScalaTools) resolvers ++ List(ScalaToolsReleases) else resolvers // user resolvers come before scala-tools
-						addResolvers(ivy.getSettings, extra, log)
+						configureDefaults(withDefaultResolvers(resolvers))
 					}
 					if(autodetect)
 						autodetectDependencies(toID(module))
@@ -265,6 +255,8 @@ object ManageDependencies
 		
 		this.synchronized // Ivy is not thread-safe.  In particular, it uses a static DocumentBuilder, which is not thread-safe
 		{
+			val ivy = Ivy.newInstance(settings)
+			ivy.getLoggerEngine.pushLogger(logger)
 			ivy.pushContext()
 			try
 			{
@@ -273,7 +265,11 @@ object ManageDependencies
 					doWithIvy(ivy, md, conf)
 				}
 			}
-			finally { ivy.popContext() }
+			finally
+			{
+				ivy.popContext()
+				Message.setDefaultLogger(originalLogger)
+			}
 		}
 	}
 	private def addExtraNamespaces(md: DefaultModuleDescriptor): Unit =
@@ -317,16 +313,14 @@ object ManageDependencies
 		excludeScalaJar(ScalaArtifacts.LibraryID)
 		excludeScalaJar(ScalaArtifacts.CompilerID)
 	}
-	private def configureCache(settings: IvySettings)
+	private def configureCache(settings: IvySettings, dir: Option[Path])
 	{
-		settings.getDefaultRepositoryCacheManager match
-		{
-			case manager: DefaultRepositoryCacheManager =>
-				manager.setUseOrigin(true)
-				manager.setChangingMatcher(PatternMatcher.REGEXP);
-				manager.setChangingPattern(".*-SNAPSHOT");
-			case _ => ()
-		}
+		val cacheDir = dir.map(_.asFile).getOrElse(settings.getDefaultRepositoryCacheBasedir())
+		val manager = new DefaultRepositoryCacheManager("default-cache", settings, cacheDir)
+		manager.setUseOrigin(true)
+		manager.setChangingMatcher(PatternMatcher.REGEXP);
+		manager.setChangingPattern(".*-SNAPSHOT");
+		settings.setDefaultRepositoryCacheManager(manager)
 	}
 	/** Creates an ExcludeRule that excludes artifacts with the given module organization and name for
 	* the given configurations. */
@@ -528,17 +522,18 @@ object ManageDependencies
 		moduleID.check()
 	}
 	/** Sets the resolvers for 'settings' to 'resolvers'.  This is done by creating a new chain and making it the default. */
-	private def addResolvers(settings: IvySettings, resolvers: Seq[Resolver], log: Logger)
+	private def setResolvers(settings: IvySettings, resolvers: Seq[Resolver], log: Logger)
 	{
 		val newDefault = new ChainResolver
-		newDefault.setName("redefined-public")
-		newDefault.add(settings.getDefaultResolver) // put local, shared, and public(Maven Central) repositories before user repositories
+		newDefault.setName("sbt-chain")
+		newDefault.setReturnFirst(true)
+		newDefault.setCheckmodified(true)
 		resolvers.foreach(r => newDefault.add(ConvertResolver(r)))
 		settings.addResolver(newDefault)
 		settings.setDefaultResolver(newDefault.getName)
 		if(log.atLevel(Level.Debug))
 		{
-			log.debug("Using extra repositories:")
+			log.debug("Using repositories:")
 			resolvers.foreach(r => log.debug("\t" + r.toString))
 		}
 	}
@@ -596,157 +591,3 @@ object ManageDependencies
 			case _ => error("Unknown ModuleDescriptor type.")
 		}
 }
-
-private object ConvertResolver
-{
-	/** Converts the given sbt resolver into an Ivy resolver..*/
-	def apply(r: Resolver) =
-	{
-		r match
-		{
-			case repo: MavenRepository =>
-			{
-				val resolver = new IBiblioResolver
-				initializeMavenStyle(resolver, repo.name, repo.root)
-				resolver
-			}
-			case JavaNet1Repository =>
-			{
-				// Thanks to Matthias Pfau for posting how to use the Maven 1 repository on java.net with Ivy:
-				// http://www.nabble.com/Using-gradle-Ivy-with-special-maven-repositories-td23775489.html
-				val resolver = new IBiblioResolver { override def convertM2IdForResourceSearch(mrid: ModuleRevisionId) = mrid }
-				initializeMavenStyle(resolver, JavaNet1Repository.name, "http://download.java.net/maven/1/")
-				resolver.setPattern("[organisation]/[ext]s/[module]-[revision](-[classifier]).[ext]")
-				resolver
-			}
-			case repo: SshRepository =>
-			{
-				val resolver = new SshResolver
-				initializeSSHResolver(resolver, repo)
-				repo.publishPermissions.foreach(perm => resolver.setPublishPermissions(perm))
-				resolver
-			}
-			case repo: SftpRepository =>
-			{
-				val resolver = new SFTPResolver
-				initializeSSHResolver(resolver, repo)
-				resolver
-			}
-			case repo: FileRepository =>
-			{
-				val resolver = new FileSystemResolver
-				resolver.setName(repo.name)
-				initializePatterns(resolver, repo.patterns)
-				import repo.configuration.{isLocal, isTransactional}
-				resolver.setLocal(isLocal)
-				isTransactional.foreach(value => resolver.setTransactional(value.toString))
-				resolver
-			}
-			case repo: URLRepository =>
-			{
-				val resolver = new URLResolver
-				resolver.setName(repo.name)
-				initializePatterns(resolver, repo.patterns)
-				resolver
-			}
-		}
-	}
-	private def initializeMavenStyle(resolver: IBiblioResolver, name: String, root: String)
-	{
-		resolver.setName(name)
-		resolver.setM2compatible(true)
-		resolver.setRoot(root)
-	}
-	private def initializeSSHResolver(resolver: AbstractSshBasedResolver, repo: SshBasedRepository)
-	{
-		resolver.setName(repo.name)
-		resolver.setPassfile(null)
-		initializePatterns(resolver, repo.patterns)
-		initializeConnection(resolver, repo.connection)
-	}
-	private def initializeConnection(resolver: AbstractSshBasedResolver, connection: RepositoryHelpers.SshConnection)
-	{
-		import resolver._
-		import connection._
-		hostname.foreach(setHost)
-		port.foreach(setPort)
-		authentication foreach
-			{
-				case RepositoryHelpers.PasswordAuthentication(user, password) =>
-					setUser(user)
-					setUserPassword(password)
-				case RepositoryHelpers.KeyFileAuthentication(file, password) =>
-					setKeyFile(file)
-					setKeyFilePassword(password)
-			}
-	}
-	private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: RepositoryHelpers.Patterns)
-	{
-		resolver.setM2compatible(patterns.isMavenCompatible)
-		patterns.ivyPatterns.foreach(resolver.addIvyPattern)
-		patterns.artifactPatterns.foreach(resolver.addArtifactPattern)
-	}
-}
-
-private object DefaultConfigurationMapping extends PomModuleDescriptorWriter.ConfigurationScopeMapping(new java.util.HashMap)
-{
-	override def getScope(confs: Array[String]) =
-	{
-		Configurations.defaultMavenConfigurations.find(conf => confs.contains(conf.name)) match
-		{
-			case Some(conf) => conf.name
-			case None =>
-				if(confs.isEmpty || confs(0) == Configurations.Default.name)
-					null
-				else
-					confs(0)
-		}
-	}
-	override def isOptional(confs: Array[String]) = confs.isEmpty || (confs.length == 1 && confs(0) == Configurations.Optional.name)
-}
-
-/** Interface between Ivy logging and sbt logging. */
-private final class IvyLogger(log: Logger) extends MessageLogger
-{
-	private var progressEnabled = false
-	
-	def log(msg: String, level: Int)
-	{
-		import Message.{MSG_DEBUG, MSG_VERBOSE, MSG_INFO, MSG_WARN, MSG_ERR}
-		level match
-		{
-			case MSG_DEBUG | MSG_VERBOSE => debug(msg)
-			case MSG_INFO => info(msg)
-			case MSG_WARN => warn(msg)
-			case MSG_ERR => error(msg)
-		}
-	}
-	def rawlog(msg: String, level: Int)
-	{
-		log(msg, level)
-	}
-	import Level.{Debug, Info, Warn, Error}
-	def debug(msg: String) = logImpl(msg, Debug)
-	def verbose(msg: String) = debug(msg)
-	def deprecated(msg: String) = warn(msg)
-	def info(msg: String) = logImpl(msg, Info)
-	def rawinfo(msg: String) = info(msg)
-	def warn(msg: String) = logImpl(msg, Warn)
-	def error(msg: String) = logImpl(msg, Error)
-	
-	private def logImpl(msg: String, level: Level.Value) = log.log(level, msg)
-	
-	private def emptyList = java.util.Collections.emptyList[T forSome { type T}]
-	def getProblems = emptyList
-	def getWarns = emptyList
-	def getErrors = emptyList
-
-	def clearProblems = ()
-	def sumupProblems = ()
-	def progress = ()
-	def endProgress = ()
-
-	def endProgress(msg: String) = info(msg)
-	def isShowProgress = false
-	def setShowProgress(progress: Boolean) {}
-}
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 19ccb58ec..c1e4e0611 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -173,7 +173,7 @@ final case class SftpRepository(name: String, connection: SshConnection, pattern
 import Resolver._
 object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot)
 object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot)
-object DefaultMavenRepository extends MavenRepository("Maven2 Repository", IBiblioResolver.DEFAULT_M2_ROOT)
+object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT)
 object JavaNet1Repository extends Resolver
 {
 	def name = "java.net Maven1 Repository"
@@ -275,6 +275,20 @@ object Resolver
 
 	def defaultPatterns = mavenStylePatterns
 	def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
+	def localBasePattern = "[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
+	
+	def userRoot = System.getProperty("user.home")
+	def userMavenRoot = userRoot + "/.m2/repository/"
+	def userIvyRoot = userRoot + "/.ivy2/"
+	
+	def defaultLocal = defaultUserFileRepository("local")
+	def defaultShared = defaultUserFileRepository("shared")
+	def defaultUserFileRepository(id: String) = file(id, new File(userIvyRoot, id))(defaultIvyPatterns)
+	def defaultIvyPatterns =
+	{
+		val pList = List(localBasePattern)
+		Patterns(pList, pList, false)
+	}
 }
 
 object Configurations
diff --git a/src/main/scala/sbt/impl/ConvertResolver.scala b/src/main/scala/sbt/impl/ConvertResolver.scala
new file mode 100644
index 000000000..4bfe0b014
--- /dev/null
+++ b/src/main/scala/sbt/impl/ConvertResolver.scala
@@ -0,0 +1,100 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import org.apache.ivy.{core,plugins}
+import core.module.id.ModuleRevisionId
+import plugins.resolver.{ChainResolver, DependencyResolver, IBiblioResolver}
+import plugins.resolver.{AbstractPatternsBasedResolver, AbstractSshBasedResolver, FileSystemResolver, SFTPResolver, SshResolver, URLResolver}
+
+private object ConvertResolver
+{
+	/** Converts the given sbt resolver into an Ivy resolver..*/
+	def apply(r: Resolver) =
+	{
+		r match
+		{
+			case repo: MavenRepository =>
+			{
+				val resolver = new IBiblioResolver
+				initializeMavenStyle(resolver, repo.name, repo.root)
+				resolver
+			}
+			case JavaNet1Repository =>
+			{
+				// Thanks to Matthias Pfau for posting how to use the Maven 1 repository on java.net with Ivy:
+				// http://www.nabble.com/Using-gradle-Ivy-with-special-maven-repositories-td23775489.html
+				val resolver = new IBiblioResolver { override def convertM2IdForResourceSearch(mrid: ModuleRevisionId) = mrid }
+				initializeMavenStyle(resolver, JavaNet1Repository.name, "http://download.java.net/maven/1/")
+				resolver.setPattern("[organisation]/[ext]s/[module]-[revision](-[classifier]).[ext]")
+				resolver
+			}
+			case repo: SshRepository =>
+			{
+				val resolver = new SshResolver
+				initializeSSHResolver(resolver, repo)
+				repo.publishPermissions.foreach(perm => resolver.setPublishPermissions(perm))
+				resolver
+			}
+			case repo: SftpRepository =>
+			{
+				val resolver = new SFTPResolver
+				initializeSSHResolver(resolver, repo)
+				resolver
+			}
+			case repo: FileRepository =>
+			{
+				val resolver = new FileSystemResolver
+				resolver.setName(repo.name)
+				initializePatterns(resolver, repo.patterns)
+				import repo.configuration.{isLocal, isTransactional}
+				resolver.setLocal(isLocal)
+				isTransactional.foreach(value => resolver.setTransactional(value.toString))
+				resolver
+			}
+			case repo: URLRepository =>
+			{
+				val resolver = new URLResolver
+				resolver.setName(repo.name)
+				initializePatterns(resolver, repo.patterns)
+				resolver
+			}
+		}
+	}
+	private def initializeMavenStyle(resolver: IBiblioResolver, name: String, root: String)
+	{
+		resolver.setName(name)
+		resolver.setM2compatible(true)
+		resolver.setRoot(root)
+	}
+	private def initializeSSHResolver(resolver: AbstractSshBasedResolver, repo: SshBasedRepository)
+	{
+		resolver.setName(repo.name)
+		resolver.setPassfile(null)
+		initializePatterns(resolver, repo.patterns)
+		initializeConnection(resolver, repo.connection)
+	}
+	private def initializeConnection(resolver: AbstractSshBasedResolver, connection: RepositoryHelpers.SshConnection)
+	{
+		import resolver._
+		import connection._
+		hostname.foreach(setHost)
+		port.foreach(setPort)
+		authentication foreach
+			{
+				case RepositoryHelpers.PasswordAuthentication(user, password) =>
+					setUser(user)
+					setUserPassword(password)
+				case RepositoryHelpers.KeyFileAuthentication(file, password) =>
+					setKeyFile(file)
+					setKeyFilePassword(password)
+			}
+	}
+	private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: RepositoryHelpers.Patterns)
+	{
+		resolver.setM2compatible(patterns.isMavenCompatible)
+		patterns.ivyPatterns.foreach(resolver.addIvyPattern)
+		patterns.artifactPatterns.foreach(resolver.addArtifactPattern)
+	}
+}
diff --git a/src/main/scala/sbt/impl/ManagedImpl.scala b/src/main/scala/sbt/impl/ManagedImpl.scala
new file mode 100644
index 000000000..0e9431713
--- /dev/null
+++ b/src/main/scala/sbt/impl/ManagedImpl.scala
@@ -0,0 +1,76 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2008, 2009 Mark Harrah
+ */
+package sbt
+
+import org.apache.ivy.{plugins, util}
+import plugins.parser.m2.PomModuleDescriptorWriter
+import util.{Message, MessageLogger}
+
+private object DefaultConfigurationMapping extends PomModuleDescriptorWriter.ConfigurationScopeMapping(new java.util.HashMap)
+{
+	override def getScope(confs: Array[String]) =
+	{
+		Configurations.defaultMavenConfigurations.find(conf => confs.contains(conf.name)) match
+		{
+			case Some(conf) => conf.name
+			case None =>
+				if(confs.isEmpty || confs(0) == Configurations.Default.name)
+					null
+				else
+					confs(0)
+		}
+	}
+	override def isOptional(confs: Array[String]) = confs.isEmpty || (confs.length == 1 && confs(0) == Configurations.Optional.name)
+}
+
+/** Interface between Ivy logging and sbt logging. */
+private final class IvyLogger(log: Logger) extends MessageLogger
+{
+	private var progressEnabled = false
+	
+	def log(msg: String, level: Int)
+	{
+		import Message.{MSG_DEBUG, MSG_VERBOSE, MSG_INFO, MSG_WARN, MSG_ERR}
+		level match
+		{
+			case MSG_DEBUG | MSG_VERBOSE => debug(msg)
+			case MSG_INFO => info(msg)
+			case MSG_WARN => warn(msg)
+			case MSG_ERR => error(msg)
+		}
+	}
+	def rawlog(msg: String, level: Int)
+	{
+		log(msg, level)
+	}
+	import Level.{Debug, Info, Warn, Error}
+	def debug(msg: String) = logImpl(msg, Debug)
+	def verbose(msg: String) = debug(msg)
+	def deprecated(msg: String) = warn(msg)
+	def info(msg: String) =
+	{
+		if(msg contains ":: loading settings :: url =")
+			Thread.dumpStack
+		logImpl(msg, Info)
+	}
+	def rawinfo(msg: String) = info(msg)
+	def warn(msg: String) = logImpl(msg, Warn)
+	def error(msg: String) = logImpl(msg, Error)
+	
+	private def logImpl(msg: String, level: Level.Value) = log.log(level, msg)
+	
+	private def emptyList = java.util.Collections.emptyList[T forSome { type T}]
+	def getProblems = emptyList
+	def getWarns = emptyList
+	def getErrors = emptyList
+
+	def clearProblems = ()
+	def sumupProblems = ()
+	def progress = ()
+	def endProgress = ()
+
+	def endProgress(msg: String) = info(msg)
+	def isShowProgress = false
+	def setShowProgress(progress: Boolean) {}
+}

From 97f252aaaf1ed78325770ac6847473f23706df4f Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 13 Aug 2009 03:33:21 +0000
Subject: [PATCH 075/268] Tiny speedup to boot when update required

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@953 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/Update.scala | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/boot/src/main/scala/Update.scala b/boot/src/main/scala/Update.scala
index 91c4754bc..b63d782ef 100644
--- a/boot/src/main/scala/Update.scala
+++ b/boot/src/main/scala/Update.scala
@@ -5,7 +5,7 @@ package sbt.boot
 
 import java.io.{File, FileWriter, PrintWriter, Writer}
 
-import org.apache.ivy.{core, plugins, util}
+import org.apache.ivy.{core, plugins, util, Ivy}
 import core.LogOptions
 import core.cache.DefaultRepositoryCacheManager
 import core.event.EventManager
@@ -64,6 +64,14 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 	}
 	/** Runs update for the specified target (updates either the scala or sbt jars for building the project) */
 	private def update(target: UpdateTarget.Value)
+	{
+		val settings = new IvySettings
+		val ivy = Ivy.newInstance(settings)
+		ivy.pushContext()
+		try { update(target, settings) }
+		finally { ivy.popContext() }
+	}
+	private def update(target: UpdateTarget.Value, settings: IvySettings)
 	{
 		import Configuration.Visibility.PUBLIC
 		// the actual module id here is not that important
@@ -76,25 +84,24 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 			case UpdateScala =>
 				addDependency(moduleID, ScalaOrg, CompilerModuleName, scalaVersion, "default")
 				addDependency(moduleID, ScalaOrg, LibraryModuleName, scalaVersion, "default")
-				update(moduleID, target, false)
+				update(settings, moduleID, target, false)
 			case UpdateSbt =>
 				addDependency(moduleID, SbtOrg, SbtModuleName, sbtVersion, scalaVersion)
-				try { update(moduleID, target, false) }
+				try { update(settings, moduleID, target, false) }
 				catch
 				{
 					 // unfortunately, there is not a more specific exception thrown when a configuration does not exist,
 					 // so we always retry after cleaning the ivy file for this version of sbt on in case it is a newer version
 					 // of Scala than when this version of sbt was initially published
 					case e: RuntimeException =>
-						update(moduleID, target, true)
+						update(settings, moduleID, target, true)
 				}
 		}
 	}
 	/** Runs the resolve and retrieve for the given moduleID, which has had its dependencies added already. */
-	private def update(moduleID: DefaultModuleDescriptor,  target: UpdateTarget.Value, cleanExisting: Boolean)
+	private def update(settings: IvySettings, moduleID: DefaultModuleDescriptor,  target: UpdateTarget.Value, cleanExisting: Boolean)
 	{
 		val eventManager = new EventManager
-		val settings = new IvySettings
 		addResolvers(settings, scalaVersion, target)
 		settings.setDefaultConflictManager(settings.getConflictManager(ConflictManagerName))
 		settings.setBaseDir(bootDirectory)

From 951bcc9a6548e3586b111134914db924d852b351 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 19 Aug 2009 14:21:38 +0000
Subject: [PATCH 076/268]  * Added InstallProject+DefaultInstallProject with
 'install' task.  It installs dependencies retrieved from the resolver
 assigned to 'resolveFrom' to the resolver given by 'publishTo'.  * Added
 simple runTask(mainClass: String) method

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@959 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala  | 26 +++++++++++++++++++--
 src/main/scala/sbt/DefaultProject.scala     |  2 ++
 src/main/scala/sbt/ManageDependencies.scala | 19 +++++++++++++++
 src/main/scala/sbt/Project.scala            |  2 +-
 src/main/scala/sbt/ScalaProject.scala       |  8 +++----
 src/main/scala/sbt/impl/ManagedImpl.scala   |  7 +-----
 6 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index ea4d8e00c..299e21631 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -78,7 +78,7 @@ trait ManagedProject extends ClasspathProject
 	final case class CacheDirectory(dir: Path) extends ManagedOption
 	final case class CheckScalaVersion(configs: Iterable[Configuration], checkExplicit: Boolean, filterImplicit: Boolean) extends ManagedOption
 	
-	private def withConfigurations(outputPattern: String, managedDependencyPath: Path, options: Seq[ManagedOption])
+	protected def withConfigurations(outputPattern: String, managedDependencyPath: Path, options: Seq[ManagedOption])
 		(doWith: (IvyConfiguration, UpdateConfiguration) => Option[String]) =
 	{
 		var synchronize = false
@@ -117,7 +117,7 @@ trait ManagedProject extends ClasspathProject
 		if(v.isEmpty) None
 		else Some(v)
 	}
-	private def withIvyTask(doTask: => Option[String]) =
+	protected def withIvyTask(doTask: => Option[String]) =
 		task
 		{
 			try { doTask }
@@ -422,6 +422,28 @@ object BasicManagedProject
 		"Deletes the cache of artifacts downloaded for automatically managed dependencies."
 }
 
+class DefaultInstallProject(val info: ProjectInfo) extends InstallProject with MavenStyleScalaPaths with BasicDependencyProject
+{
+	def fullUnmanagedClasspath(config: Configuration) = unmanagedClasspath
+	def dependencies = info.dependencies
+}
+trait InstallProject extends BasicManagedProject
+{
+	def installOptions: Seq[ManagedOption] = updateOptions
+	override def filterScalaJars = false
+	override def checkExplicitScalaDependencies = false
+	lazy val install = installTask(updateOptions)
+	def installTask(options: => Seq[ManagedOption]) =
+		withIvyTask
+		{
+			withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) =>
+				val toResolver = reflectiveRepositories.get("publish-to").getOrElse(error("No repository to publish to was specified"))
+				val fromResolver = reflectiveRepositories.get("retrieve-from").getOrElse(error("No repository to retrieve from was specified"))
+				ManageDependencies.install(ivyConf, fromResolver.name, toResolver.name, true, true)
+			}
+		}
+}
+
 trait BasicDependencyPaths extends ManagedProject
 {
 	import BasicDependencyPaths._
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index b7e9f6a77..0161eff5b 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -229,6 +229,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		}
 	}
 	
+	protected def runTask(mainClass: String): MethodTask = task { args => runTask(Some(mainClass), runClasspath, args) dependsOn(compile, copyResources) }
+	
 	protected def compileAction = task { doCompile(mainCompileConditional) } describedAs MainCompileDescription
 	protected def testCompileAction = task { doCompile(testCompileConditional) } dependsOn compile describedAs TestCompileDescription
 	protected def cleanAction = cleanTask(outputPath, cleanOptions) describedAs CleanDescription
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 9c8fa52cb..d7bfb4f4f 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -14,6 +14,7 @@ import org.apache.ivy.{core, plugins, util, Ivy}
 import core.LogOptions
 import core.cache.DefaultRepositoryCacheManager
 import core.deliver.DeliverOptions
+import core.install.InstallOptions
 import core.module.descriptor.{DefaultArtifact, DefaultDependencyArtifactDescriptor, MDArtifact}
 import core.module.descriptor.{DefaultDependencyDescriptor, DefaultModuleDescriptor, DependencyDescriptor, ModuleDescriptor}
 import core.module.descriptor.{DefaultExcludeRule, ExcludeRule}
@@ -396,6 +397,24 @@ object ManageDependencies
 	private def addConfigurations(configurations: Iterable[String], to: { def setConfs(c: Array[String]): AnyRef }): Unit =
 		to.setConfs(configurations.toList.toArray)
 	
+	def install(ivyConfig: IvyConfiguration, from: String, to: String, validate: Boolean, overwrite: Boolean) =
+	{
+		def doInstall(ivy: Ivy, md: ModuleDescriptor, default: String) =
+			Control.trapUnit("Could not install: ", ivyConfig.log)
+			{
+				for(dependency <- md.getDependencies)
+				{
+					ivyConfig.log.info("Installing " + dependency)
+					val options = new InstallOptions
+					options.setOverwrite(overwrite)
+					options.setValidate(validate)
+					options.setTransitive(dependency.isTransitive)
+					ivy.install(dependency.getDependencyRevisionId, from, to, options)
+				}
+				None
+			}
+		withIvy(ivyConfig)(doInstall)
+	}
 	def deliver(ivyConfig: IvyConfiguration, updateConfig: UpdateConfiguration, status: String, deliverIvyPattern: String, extraDependencies: Iterable[ModuleID], configurations: Option[Iterable[Configuration]]) =
 	{
 		def doDeliver(ivy: Ivy, md: ModuleDescriptor, default: String) =
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 76f999125..d1b6dcaad 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -375,7 +375,7 @@ object Project
 		if(builderProjectPath.asFile.isDirectory)
 		{
 			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
-			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(FileUtilities.toFile(url))); case _ => Nil }
+			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(FileUtilities.toFile(url))); case _ => Array[Path]() }
 			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None)(buildLog), pluginProjectPath, additionalPaths, buildLog)
 			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
 				builderProject.projectDefinition.right.map {
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index b3112db6d..30a246ef8 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -113,14 +113,14 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		val Private = Value("private")
 	}
 
-	def javapTask(classpath: PathFinder, conditional: CompileConditional, outputPath: Path) =
+	def javapTask(classpath: PathFinder, conditional: CompileConditional, compilePath: Path) =
 	 task { args =>
 		val cp = classpath +++ Path.fromFile(FileUtilities.scalaLibraryJar) +++ Path.fromFile(FileUtilities.scalaCompilerJar)
 		execOut { Process("javap" :: "-classpath" :: Path.makeString(cp.get) :: args.toList) }
-	} completeWith(classNames(conditional, outputPath))
-	private def classNames(conditional: CompileConditional, outputPath: Path) =
+	} completeWith(classNames(conditional, compilePath))
+	private def classNames(conditional: CompileConditional, compilePath: Path) =
 	{
-		val classes = conditional.analysis.allProducts.flatMap(Path.relativize(outputPath, _))
+		val classes = conditional.analysis.allProducts.flatMap(Path.relativize(compilePath, _))
 		classes.map(_.relativePath.replace(java.io.File.separatorChar, '.').toList.dropRight(".class".length).mkString).toSeq
 	}
 	
diff --git a/src/main/scala/sbt/impl/ManagedImpl.scala b/src/main/scala/sbt/impl/ManagedImpl.scala
index 0e9431713..e1f13b892 100644
--- a/src/main/scala/sbt/impl/ManagedImpl.scala
+++ b/src/main/scala/sbt/impl/ManagedImpl.scala
@@ -48,12 +48,7 @@ private final class IvyLogger(log: Logger) extends MessageLogger
 	def debug(msg: String) = logImpl(msg, Debug)
 	def verbose(msg: String) = debug(msg)
 	def deprecated(msg: String) = warn(msg)
-	def info(msg: String) =
-	{
-		if(msg contains ":: loading settings :: url =")
-			Thread.dumpStack
-		logImpl(msg, Info)
-	}
+	def info(msg: String) = logImpl(msg, Info)
 	def rawinfo(msg: String) = info(msg)
 	def warn(msg: String) = logImpl(msg, Warn)
 	def error(msg: String) = logImpl(msg, Error)

From ddb1d4b84b0ee6af6c881990c406b23e0a330125 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 19 Aug 2009 17:33:29 +0000
Subject: [PATCH 077/268] Vesa's patch for configuring process output

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@961 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Fork.scala             | 40 ++++++++++++++---------
 src/main/scala/sbt/Run.scala              |  9 +++--
 src/main/scala/sbt/impl/ProcessImpl.scala |  4 +--
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/src/main/scala/sbt/Fork.scala b/src/main/scala/sbt/Fork.scala
index 278a77843..a095126c0 100644
--- a/src/main/scala/sbt/Fork.scala
+++ b/src/main/scala/sbt/Fork.scala
@@ -1,13 +1,14 @@
 /* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
+ * Copyright 2009  Mark Harrah, Vesa Vilhonen
  */
 package sbt
 
-import java.io.File
+import java.io.{File,OutputStream}
 
 abstract class ForkJava extends NotNull
 {
 	def javaHome: Option[File] = None
+	def outputStrategy: Option[OutputStrategy] = None
 }
 abstract class ForkScala extends ForkJava
 {
@@ -18,16 +19,23 @@ trait ForkScalaRun extends ForkScala
 	def workingDirectory: Option[File] = None
 	def runJVMOptions: Seq[String] = Nil
 }
+
 trait ForkScalaCompiler extends ForkScala
 {
 	def compileJVMOptions: Seq[String] = Nil
 }
 
+sealed abstract class OutputStrategy extends NotNull
+case object StdoutOutput extends OutputStrategy
+case class BufferedOutput(logger: Logger) extends OutputStrategy
+case class CustomOutput(output: OutputStream) extends OutputStrategy
+
 import java.lang.{ProcessBuilder => JProcessBuilder}
 object Fork
 {
 	private val ScalacMainClass = "scala.tools.nsc.Main"
 	private val ScalaMainClass = "scala.tools.nsc.MainGenericRunner"
+  
 	val java = new ForkJava("java")
 	val javac = new ForkJava("javac")
 	val scala = new ForkScala(ScalaMainClass)
@@ -38,35 +46,35 @@ object Fork
 		val home = javaHome.getOrElse(new File(System.getProperty("java.home")))
 		new File(new File(home, "bin"), name)
 	}
+	
 	final class ForkJava(commandName: String) extends NotNull
 	{
 		def apply(javaHome: Option[File], options: Seq[String], log: Logger): Int =
-			apply(javaHome, options, None, log)
-		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: File, log: Logger): Int =
-			apply(javaHome, options, Some(workingDirectory), log)
-		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], log: Logger): Int =
-			apply(javaHome, options, workingDirectory, Map.empty, log)
-		/** env is additional environment variables*/
-		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], env: Map[String, String], log: Logger): Int =
+			apply(javaHome, options, None, Map.empty, BufferedOutput(log))
+		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], env: Map[String, String], outputStrategy: OutputStrategy): Int =
 		{
 			val executable = javaCommand(javaHome, commandName).getAbsolutePath
 			val command = (executable :: options.toList).toArray
-			log.debug("Forking java process: " + command.mkString(" ") + workingDirectory.map("\n\tin " + _.getAbsolutePath).getOrElse(""))
 			val builder = new JProcessBuilder(command : _*)
 			workingDirectory.foreach(wd => builder.directory(wd))
 			val environment = builder.environment
 			for( (key, value) <- env )
 				environment.put(key, value)
-			Process(builder) ! log
+			outputStrategy match {
+				case StdoutOutput => Process(builder) !
+				case BufferedOutput(logger) => Process(builder) ! logger
+				case CustomOutput(output) => (Process(builder) #> output).run.exitValue()
+			}
 		}
 	}
+	
 	final class ForkScala(mainClassName: String) extends NotNull
 	{
 		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], log: Logger): Int =
-			apply(javaHome, jvmOptions, scalaJars, arguments, None, log)
-		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], workingDirectory: File, log: Logger): Int =
-			apply(javaHome, jvmOptions, scalaJars, arguments, Some(workingDirectory), log)
+			apply(javaHome, jvmOptions, scalaJars, arguments, None, BufferedOutput(log))
 		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], workingDirectory: Option[File], log: Logger): Int =
+			apply(javaHome, jvmOptions, scalaJars, arguments, workingDirectory, BufferedOutput(log))
+		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], workingDirectory: Option[File], outputStrategy: OutputStrategy): Int =
 		{
 			val scalaClasspath =
 				if(scalaJars.isEmpty)
@@ -76,7 +84,7 @@ object Fork
 			val scalaClasspathString = "-Xbootclasspath/a:" + scalaClasspath.map(_.getAbsolutePath).mkString(File.pathSeparator)
 			val mainClass = if(mainClassName.isEmpty) Nil else mainClassName :: Nil
 			val options = jvmOptions ++ (scalaClasspathString :: mainClass ::: arguments.toList)
-			Fork.java(javaHome, options, workingDirectory, log)
+			Fork.java(javaHome, options, workingDirectory, Map.empty, outputStrategy)
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 370efb667..c2af54046 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
+ * Copyright 2008, 2009  Mark Harrah, Vesa Vilhonen
  */
 package sbt
 
@@ -27,7 +27,10 @@ class ForkRun(config: ForkScalaRun) extends ScalaRun
 	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger): Option[String] =
 	{
 		val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList
-		val exitCode = Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, log)
+		val exitCode = config.outputStrategy match {
+			case Some(strategy) => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, strategy)
+			case None => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, log)
+		}
 		processExitCode(exitCode, "runner")
 	}
 	private def classpathOption(classpath: Iterable[Path]) = "-cp" :: Path.makeString(classpath) :: Nil
@@ -167,4 +170,4 @@ object Run extends ScalaRun
 			interpreter.interpret("import current._")
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/sbt/impl/ProcessImpl.scala b/src/main/scala/sbt/impl/ProcessImpl.scala
index af7c7dd90..993c9068f 100644
--- a/src/main/scala/sbt/impl/ProcessImpl.scala
+++ b/src/main/scala/sbt/impl/ProcessImpl.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
+ * Copyright 2009  Mark Harrah, Vesa Vilhonen
  */
 package sbt
 
@@ -412,4 +412,4 @@ object Uncloseable
 	def apply(out: OutputStream): OutputStream = new FilterOutputStream(out) { override def close() {} }
 	def protect(in: InputStream): InputStream = if(in eq System.in) Uncloseable(in) else in
 	def protect(out: OutputStream): OutputStream = if( (out eq System.out) || (out eq System.err)) Uncloseable(out) else out
-}
\ No newline at end of file
+}

From 89ccb9ec3fb42f6325e378e99e98ebbd877115bd Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 22 Aug 2009 17:07:33 +0000
Subject: [PATCH 078/268] Fix for issue 39, where sources were not relative in
 src package Fix for type inference issue in latest Scala 2.8.0-SNAPSHOT

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@962 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ProjectPaths.scala |  4 ++--
 src/main/scala/sbt/ScalaProject.scala | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/sbt/ProjectPaths.scala b/src/main/scala/sbt/ProjectPaths.scala
index 2891571eb..855ba85cd 100644
--- a/src/main/scala/sbt/ProjectPaths.scala
+++ b/src/main/scala/sbt/ProjectPaths.scala
@@ -156,8 +156,8 @@ trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
 		testResourcesPath ::
 		Nil
 		
-	def mainSourceRoots = mainJavaSourcePath +++ mainScalaSourcePath
-	def testSourceRoots = testJavaSourcePath +++ testScalaSourcePath
+	def mainSourceRoots = (mainJavaSourcePath##) +++ (mainScalaSourcePath##)
+	def testSourceRoots = (testJavaSourcePath##) +++ (testScalaSourcePath##)
 }
 
 trait BasicPackagePaths extends ScalaPaths with PackagePaths
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 30a246ef8..a6e42e9b2 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -256,12 +256,17 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			val setup, cleanup = new ListBuffer[() => Option[String]]
 			val testListeners = new ListBuffer[TestReportListener]
 			
-			options.foreach {
-				case TestFilter(include) => testFilters += include
-				case ExcludeTests(exclude) => excludeTestsSet ++= exclude
-				case TestListeners(listeners) => testListeners ++= listeners
-				case TestSetup(setupFunction) => setup += setupFunction
-				case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
+			for(option <- options)
+			{
+				option match
+				{
+					case TestFilter(include) => testFilters += include
+					case ExcludeTests(exclude) => excludeTestsSet ++= exclude
+					case TestListeners(listeners) => testListeners ++= listeners
+					case TestSetup(setupFunction) => setup += setupFunction
+					case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
+				}
+				() // 2.8.0-SNAPSHOT bug in type inference
 			}
 			
 			if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))

From 4687ecbf2c10eb53bb163a74825943859c6aab7e Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 24 Aug 2009 01:23:41 +0000
Subject: [PATCH 079/268]  * Add logging for Scala dependency
 filtering/checking.  * Fix tab completion for javap  * Fix archive generation
 code

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@967 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala  |  2 +-
 src/main/scala/sbt/FileUtilities.scala      |  2 +-
 src/main/scala/sbt/ManageDependencies.scala | 17 ++++++++++++-----
 src/main/scala/sbt/Project.scala            |  6 +++---
 src/main/scala/sbt/ScalaProject.scala       |  4 ++--
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 299e21631..b512e70d1 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -254,7 +254,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 				Configurations.removeDuplicates(Configurations.defaultMavenConfigurations ++ reflective ++ extra)
 		}
 		else
-			reflective ++ extraDefaultConfigurations
+			reflective ++ extra
 	}
 	def extraDefaultConfigurations: List[Configuration] = Nil
 	def useIntegrationTestConfiguration = false
diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index 6bb4ff04c..4174d9ab6 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -148,12 +148,12 @@ object FileUtilities
 				nextEntry.setTime(sourceFile.lastModified)
 				output.putNextEntry(nextEntry)
 				transferAndClose(new FileInputStream(sourceFile), output, log)
+				output.closeEntry()
 			}
 			else
 				log.warn("\tSource " + source + " does not exist.")
 		}
 		sources.foreach(add)
-		output.closeEntry()
 		None
 	}
 	
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index d7bfb4f4f..e136e64b7 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -235,7 +235,10 @@ object ManageDependencies
 					val (module, conf) = moduleAndConf
 					val explicitCheck =
 						if(check.checkExplicit)
+						{
+							log.debug("Checking explicit Scala dependencies")
 							checkDependencies(module, check.scalaVersion, check.configurations)
+						}
 						else
 							None
 					explicitCheck match
@@ -243,15 +246,18 @@ object ManageDependencies
 						case None =>
 							if(check.filterImplicit)
 							{
+								log.debug("Filtering transitive Scala dependencies")
 								val asDefault = toDefaultModuleDescriptor(module)
-								excludeScalaJars(asDefault, check.configurations)
+								excludeScalaJars(asDefault, check.configurations, config.log)
 								Right( (asDefault, conf) )
 							}
 							else
 								Right(moduleAndConf)
 						case Some(err) => Left(err)
 					}
-				case None => Right(moduleAndConf)
+				case None =>
+					log.debug("Not checking Scala dependencies")
+					Right(moduleAndConf)
 			}
 		
 		this.synchronized // Ivy is not thread-safe.  In particular, it uses a static DocumentBuilder, which is not thread-safe
@@ -294,7 +300,7 @@ object ManageDependencies
 	/** Adds exclusions for the scala library and compiler jars so that they are not downloaded.  This is
 	* done because normally these jars are already on the classpath and cannot/should not be overridden.  The version
 	* of Scala to use is done by setting scala.version in the project definition. */
-	private def excludeScalaJars(module: DefaultModuleDescriptor, configurations: Iterable[Configuration])
+	private def excludeScalaJars(module: DefaultModuleDescriptor, configurations: Iterable[Configuration], log: Logger)
 	{
 		val configurationNames =
 		{
@@ -310,7 +316,7 @@ object ManageDependencies
 			}
 		}
 		def excludeScalaJar(name: String): Unit =
-			module.addExcludeRule(excludeRule(ScalaArtifacts.Organization, name, configurationNames))
+			module.addExcludeRule(excludeRule(ScalaArtifacts.Organization, name, configurationNames, log))
 		excludeScalaJar(ScalaArtifacts.LibraryID)
 		excludeScalaJar(ScalaArtifacts.CompilerID)
 	}
@@ -325,9 +331,10 @@ object ManageDependencies
 	}
 	/** Creates an ExcludeRule that excludes artifacts with the given module organization and name for
 	* the given configurations. */
-	private def excludeRule(organization: String, name: String, configurationNames: Iterable[String]): ExcludeRule =
+	private def excludeRule(organization: String, name: String, configurationNames: Iterable[String], log: Logger): ExcludeRule =
 	{
 		val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*")
+		log.debug("Excluding " + artifact + " in " + configurationNames.mkString(", "))
 		val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, Collections.emptyMap[AnyRef,AnyRef])
 		configurationNames.foreach(rule.addConfiguration)
 		rule
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index d1b6dcaad..19e88d85a 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -214,10 +214,10 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* version of Scala being used to build the project.  ScalaVersion.current and ScalaVersion.cross should be used
 	* to read the version of Scala building the project.  This should only be used to change the version of Scala used
 	* for normal development (not cross-building)*/
-	final val scalaVersion = propertyOptional[String]("")
-	final val sbtVersion = propertyOptional[String]("")
+	final val scalaVersion = propertyOptional[String]("", true)
+	final val sbtVersion = propertyOptional[String]("", true)
 	final val projectInitialize = propertyOptional[Boolean](false)
-	final val projectScratch = propertyOptional[Boolean](false)
+	final val projectScratch = propertyOptional[Boolean](false, true)
 
 	/** If this project is cross-building, returns `base` with an additional path component containing the scala version.
 	* Otherwise, this returns `base`.
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index a6e42e9b2..c894637c1 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -120,8 +120,8 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	} completeWith(classNames(conditional, compilePath))
 	private def classNames(conditional: CompileConditional, compilePath: Path) =
 	{
-		val classes = conditional.analysis.allProducts.flatMap(Path.relativize(compilePath, _))
-		classes.map(_.relativePath.replace(java.io.File.separatorChar, '.').toList.dropRight(".class".length).mkString).toSeq
+		val classes = conditional.analysis.allProducts.flatMap(path => Path.relativize(compilePath.asFile, path.asFile))
+		classes.map(_.replace(java.io.File.separatorChar, '.').toList.dropRight(".class".length).mkString).toSeq
 	}
 	
 	def consoleTask(classpath : PathFinder): Task = 

From fff58af73e9d0cf0058c86c07404633c8f2712f7 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 24 Aug 2009 23:37:28 +0000
Subject: [PATCH 080/268] Test for issue #41, thanks to gereedy

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@968 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../parent-publish/project/build.properties          |  2 ++
 .../parent-publish/project/build/Parent.scala        | 12 ++++++++++++
 .../dependency-management/parent-publish/test        |  2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 src/sbt-test/dependency-management/parent-publish/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala
 create mode 100644 src/sbt-test/dependency-management/parent-publish/test

diff --git a/src/sbt-test/dependency-management/parent-publish/project/build.properties b/src/sbt-test/dependency-management/parent-publish/project/build.properties
new file mode 100644
index 000000000..199af5bc0
--- /dev/null
+++ b/src/sbt-test/dependency-management/parent-publish/project/build.properties
@@ -0,0 +1,2 @@
+project.version=1.0
+project.name=Parent Test
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala b/src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala
new file mode 100644
index 000000000..a84707859
--- /dev/null
+++ b/src/sbt-test/dependency-management/parent-publish/project/build/Parent.scala
@@ -0,0 +1,12 @@
+import sbt._
+
+class FlowmodelProject(info: ProjectInfo) extends ParentProject(info)
+{
+  lazy val core = project("core", "Flowmodel core")
+  lazy val reporters = project("reporters", "Extra reporters", new Reporters(_))
+
+  class Reporters(info: ProjectInfo) extends ParentProject(info)
+  {
+    lazy val jfreechart = project("jfreechart", "JFreeChart reporters", core)
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/parent-publish/test b/src/sbt-test/dependency-management/parent-publish/test
new file mode 100644
index 000000000..8c3241f84
--- /dev/null
+++ b/src/sbt-test/dependency-management/parent-publish/test
@@ -0,0 +1,2 @@
+> publish-local
+[success]
\ No newline at end of file

From fb4617722695c4b5c8d026e7c181a7b62366824b Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 29 Aug 2009 20:26:43 +0000
Subject: [PATCH 081/268] Enable building against the latest 2.8 nightly
 snapshot

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@970 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build/CrossCompileProject.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
index 00d47e318..744b7de62 100644
--- a/project/build/CrossCompileProject.scala
+++ b/project/build/CrossCompileProject.scala
@@ -15,7 +15,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private val version2_7_3 = "2.7.3"
 	private val version2_7_4 = "2.7.4"
 	private val version2_7_5 = "2.7.5"
-	private val version2_8_0 = "2.8.0.r18462-b20090811081019"
+	private val version2_8_0 = "2.8.0-SNAPSHOT"//"2.8.0.r18462-b20090811081019"
 	private val base = "base"
 
 	/* The configurations for the versions of Scala.*/
@@ -28,7 +28,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	// the list of all configurations cross-compile supports
 	private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_8_0 :: Nil
 	// the list of configurations to actually build against
-	private val buildConfigurations = allConfigurations//conf_2_7_2 :: conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil//allConfigurations not currently used because of issues with 2.8.0
+	private val buildConfigurations = allConfigurations//conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil
 	// the configuration to use for normal development (when cross-building is not done)
 	private def developmentVersion = buildConfigurations.first
 	

From e56df17a0444cc0136bab10e245569a31c8b6339 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 29 Aug 2009 20:38:08 +0000
Subject: [PATCH 082/268] Update for latest 2.8 nightly

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@971 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/classfile/Parser.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/classfile/Parser.scala b/src/main/scala/sbt/classfile/Parser.scala
index 9e44b51db..c2c4cb52a 100644
--- a/src/main/scala/sbt/classfile/Parser.scala
+++ b/src/main/scala/sbt/classfile/Parser.scala
@@ -114,7 +114,7 @@ private[sbt] object Parser
 			}
 		}
     }
-    private def array[T](size: Int)(f: => T) = Array.fromFunction(i => f)(size)
+    private def array[T](size: Int)(f: => T)(implicit mf: scala.reflect.Manifest[T]) = Array.fromFunction(i => f)(size)
 	private def parseConstantPool(in: DataInputStream) =
 	{
 		val constantPoolSize = in.readUnsignedShort()

From ef5d6870a17147bef04b97a77a83d0dbbff522c4 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 30 Aug 2009 01:28:12 +0000
Subject: [PATCH 083/268] Fix error "source not found" exposed by fix for bug
 #39

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@975 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Format.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Format.scala b/src/main/scala/sbt/Format.scala
index 5e2f70425..fa7cceb5d 100644
--- a/src/main/scala/sbt/Format.scala
+++ b/src/main/scala/sbt/Format.scala
@@ -19,7 +19,7 @@ object Format
 {
 	def path(basePath: Path): Format[Path] = new Format[Path]
 	{
-		def toString(path: Path) = path.relativePath
+		def toString(path: Path) = Path.relativize(basePath.asFile, path.asFile).getOrElse(error("Path " + path + " not in " + basePath))
 		def fromString(s: String) = Path.fromString(basePath, s)
 	}
 	implicit val file: Format[File] = new Format[File]

From c19276d7bd43a7905b72f17b7f5acfb7d0c412b0 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 30 Aug 2009 01:46:30 +0000
Subject: [PATCH 084/268] Make public the variant of cat that accepts Seq

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@976 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Process.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index 9341699dc..daf35524a 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -22,7 +22,7 @@ object Process
 	def apply(name: String, exitValue: => Int): ProcessBuilder = new DummyProcessBuilder(name, exitValue)
 	
 	def cat(file: SourcePartialBuilder, files: SourcePartialBuilder*): ProcessBuilder = cat(file :: files.toList)
-	private[this] def cat(files: Seq[SourcePartialBuilder]): ProcessBuilder =
+	def cat(files: Seq[SourcePartialBuilder]): ProcessBuilder =
 	{
 		require(!files.isEmpty)
 		files.map(_.cat).reduceLeft(_ #&& _)

From 42489b04a10e6157fbf3cd53990f75ccd9db589f Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 31 Aug 2009 16:52:31 +0000
Subject: [PATCH 085/268] Forked run should use unbuffered logger by default

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@977 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Fork.scala | 10 ++++++----
 src/main/scala/sbt/Run.scala  |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/sbt/Fork.scala b/src/main/scala/sbt/Fork.scala
index a095126c0..8669d8f49 100644
--- a/src/main/scala/sbt/Fork.scala
+++ b/src/main/scala/sbt/Fork.scala
@@ -28,6 +28,7 @@ trait ForkScalaCompiler extends ForkScala
 sealed abstract class OutputStrategy extends NotNull
 case object StdoutOutput extends OutputStrategy
 case class BufferedOutput(logger: Logger) extends OutputStrategy
+case class LoggedOutput(logger: Logger) extends OutputStrategy
 case class CustomOutput(output: OutputStream) extends OutputStrategy
 
 import java.lang.{ProcessBuilder => JProcessBuilder}
@@ -35,18 +36,18 @@ object Fork
 {
 	private val ScalacMainClass = "scala.tools.nsc.Main"
 	private val ScalaMainClass = "scala.tools.nsc.MainGenericRunner"
-  
+
 	val java = new ForkJava("java")
 	val javac = new ForkJava("javac")
 	val scala = new ForkScala(ScalaMainClass)
 	val scalac = new ForkScala(ScalacMainClass)
-	
+
 	private def javaCommand(javaHome: Option[File], name: String): File =
 	{
 		val home = javaHome.getOrElse(new File(System.getProperty("java.home")))
 		new File(new File(home, "bin"), name)
 	}
-	
+
 	final class ForkJava(commandName: String) extends NotNull
 	{
 		def apply(javaHome: Option[File], options: Seq[String], log: Logger): Int =
@@ -63,11 +64,12 @@ object Fork
 			outputStrategy match {
 				case StdoutOutput => Process(builder) !
 				case BufferedOutput(logger) => Process(builder) ! logger
+				case LoggedOutput(logger) => Process(builder).run(logger).exitValue()
 				case CustomOutput(output) => (Process(builder) #> output).run.exitValue()
 			}
 		}
 	}
-	
+
 	final class ForkScala(mainClassName: String) extends NotNull
 	{
 		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], log: Logger): Int =
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index c2af54046..7bfd9cc12 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -29,7 +29,7 @@ class ForkRun(config: ForkScalaRun) extends ScalaRun
 		val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList
 		val exitCode = config.outputStrategy match {
 			case Some(strategy) => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, strategy)
-			case None => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, log)
+			case None => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, LoggedOutput(log))
 		}
 		processExitCode(exitCode, "runner")
 	}
@@ -117,7 +117,7 @@ object Run extends ScalaRun
 		else
 			Some(command.usageMsg)
 	}
-	
+
 	/** Starts a Scala interpreter session with 'project' bound to the value 'current' in the console
 	* and the following two lines executed:
 	*   import sbt._
@@ -139,7 +139,7 @@ object Run extends ScalaRun
 			}
 		}}
 	}
-	/** A custom InterpreterLoop with the purpose of creating an interpreter with Project 'project' bound to the value 'current', 
+	/** A custom InterpreterLoop with the purpose of creating an interpreter with Project 'project' bound to the value 'current',
 	* and the following two lines interpreted:
 	*   import sbt._
 	*   import current._.
@@ -156,7 +156,7 @@ object Run extends ScalaRun
 			val loader = project.getClass.getClassLoader.asInstanceOf[URLClassLoader]
 			compilerSettings.classpath.value = loader.getURLs.flatMap(ClasspathUtilities.asFile).map(_.getAbsolutePath).mkString(File.pathSeparator)
 			project.log.debug("  Compiler classpath: " + compilerSettings.classpath.value)
-			
+
 			in = InteractiveReader.createDefault()
 			interpreter = new Interpreter(settings)
 			{

From cec00793041214723192193426b5c5c6c0c8547a Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 31 Aug 2009 17:46:15 +0000
Subject: [PATCH 086/268] Implicit conversion from Seq[File] and Seq[URL] to
 Seq[SourcePartialBuilder]

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@978 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Process.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index daf35524a..f4db37ccc 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -18,9 +18,10 @@ object Process
 	implicit def apply(file: File): FilePartialBuilder = new FileBuilder(file)
 	implicit def apply(url: URL): URLPartialBuilder = new URLBuilder(url)
 	implicit def apply(command: scala.xml.Elem): ProcessBuilder = apply(command.text.trim)
+	implicit def applySeq[T](builders: Seq[T])(implicit convert: T => SourcePartialBuilder): Seq[SourcePartialBuilder] = builders.map(convert)
 	def apply(value: Boolean): ProcessBuilder = apply(value.toString, if(value) 0 else 1)
 	def apply(name: String, exitValue: => Int): ProcessBuilder = new DummyProcessBuilder(name, exitValue)
-	
+
 	def cat(file: SourcePartialBuilder, files: SourcePartialBuilder*): ProcessBuilder = cat(file :: files.toList)
 	def cat(files: Seq[SourcePartialBuilder]): ProcessBuilder =
 	{

From e68142427b4b6fa7f5c9e7abcdd66bcf264e289c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 1 Sep 2009 14:10:09 +0000
Subject: [PATCH 087/268] Break triggered execution if Project.terminateWatch
 is true for pressed keys.  Default is to terminate on enter only now.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@979 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Main.scala    | 5 +++--
 src/main/scala/sbt/Project.scala | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 7f58b8e16..536e2db64 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -585,12 +585,13 @@ object Main
 	private def compileContinuously(project: Project) = executeContinuously(project, "test-compile")
 	private def executeContinuously(project: Project, action: String)
 	{
+		def shouldTerminate: Boolean = (System.in.available > 0) && project.terminateWatch(System.in.read()) || shouldTerminate
 		if(checkAction(project, action))
 		{
-			SourceModificationWatch.watchUntil(project, ContinuousCompilePollDelaySeconds)(System.in.available() > 0)
+			SourceModificationWatch.watchUntil(project, ContinuousCompilePollDelaySeconds)(shouldTerminate)
 			{
 				handleAction(project, action)
-				Console.println("Waiting for source changes... (press any key to interrupt)")
+				Console.println("Waiting for source changes... (press enter to interrupt)")
 			}
 			while (System.in.available() > 0) System.in.read()
 		}
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 19e88d85a..d6f62f46a 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -240,6 +240,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	/** A `PathFinder` that determines the files watched when an action is run with a preceeding ~ when this is the current
 	* project.  This project does not need to include the watched paths for projects that this project depends on.*/
 	def watchPaths: PathFinder = Path.emptyPathFinder
+	def terminateWatch(key: Int): Boolean = key == 10
 	
 	protected final override def parentEnvironment = info.parent
 	

From ed3dbe92d9d9fe156da24993b097c47ba4992c7a Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 8 Sep 2009 13:52:40 +0000
Subject: [PATCH 088/268] Tests for extra attributes with Ivy

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@985 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../extra/changes/UseColor.scala              |  9 ++++++++
 .../dependency-management/extra/changes/blue  |  1 +
 .../extra/changes/build.properties            |  3 +++
 .../dependency-management/extra/changes/color |  1 +
 .../dependency-management/extra/changes/red   |  1 +
 .../extra/project/build.properties            |  3 +++
 .../extra/project/build/DefineColor.scala     |  6 ++++++
 src/sbt-test/dependency-management/extra/test | 21 +++++++++++++++++++
 8 files changed, 45 insertions(+)
 create mode 100644 src/sbt-test/dependency-management/extra/changes/UseColor.scala
 create mode 100644 src/sbt-test/dependency-management/extra/changes/blue
 create mode 100644 src/sbt-test/dependency-management/extra/changes/build.properties
 create mode 100644 src/sbt-test/dependency-management/extra/changes/color
 create mode 100644 src/sbt-test/dependency-management/extra/changes/red
 create mode 100644 src/sbt-test/dependency-management/extra/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
 create mode 100644 src/sbt-test/dependency-management/extra/test

diff --git a/src/sbt-test/dependency-management/extra/changes/UseColor.scala b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
new file mode 100644
index 000000000..8c8a7b7c1
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
@@ -0,0 +1,9 @@
+import sbt._
+
+class UseColor(info: ProjectInfo) extends DefaultProject(info)
+{
+	def color = FileUtilities.readString("color".asFile, log).right.getOrElse(error("No color specified"))
+	override def libraryDependencies = Set(
+		"org.scala-tools.sbt" % "test-ivy-extra" %"1.0" extra("e:color" -> color)
+	)
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/changes/blue b/src/sbt-test/dependency-management/extra/changes/blue
new file mode 100644
index 000000000..f5ac3db8c
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/changes/blue
@@ -0,0 +1 @@
+blue
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/changes/build.properties b/src/sbt-test/dependency-management/extra/changes/build.properties
new file mode 100644
index 000000000..e0c0892fb
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/changes/build.properties
@@ -0,0 +1,3 @@
+project.name=UseColor
+project.version=1.0
+project.organization=org.scala-tools.sbt
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/changes/color b/src/sbt-test/dependency-management/extra/changes/color
new file mode 100644
index 000000000..46f29e8eb
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/changes/color
@@ -0,0 +1 @@
+red
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/changes/red b/src/sbt-test/dependency-management/extra/changes/red
new file mode 100644
index 000000000..46f29e8eb
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/changes/red
@@ -0,0 +1 @@
+red
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/project/build.properties b/src/sbt-test/dependency-management/extra/project/build.properties
new file mode 100644
index 000000000..c566cd577
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/project/build.properties
@@ -0,0 +1,3 @@
+project.name=test-ivy-extra
+project.version=1.0
+project.organization=org.scala-tools.sbt
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
new file mode 100644
index 000000000..94d17bfbb
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class DefineColor(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def projectID = super.projectID extra("e:color" -> "red")
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/test b/src/sbt-test/dependency-management/extra/test
new file mode 100644
index 000000000..fe40c91b6
--- /dev/null
+++ b/src/sbt-test/dependency-management/extra/test
@@ -0,0 +1,21 @@
+> publish-local
+[success]
+
+$ delete project/build/
+[success]
+$ copy-file changes/UseColor.scala project/build/UseColor.scala
+[success]
+$ copy-file changes/blue color
+[success]
+$ copy-file changes/build.properties project/build.properties
+[success]
+$ reload
+[success]
+
+> update
+[failure]
+
+$ copy-file changes/red color
+[success]
+> update
+[success]
\ No newline at end of file

From eaabe0b85f524e64d6c7cfa960631c660ef9d09b Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 8 Sep 2009 14:01:41 +0000
Subject: [PATCH 089/268] Added support for extra attributes with Ivy.  Use
 extra(key -> value) on ModuleIDs and Artifacts.  To define for a project's
 ID:   override def projectID = super.projectID extra(key -> value) To specify
 in a dependency:   val dep = normalID extra(key -> value)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@986 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala  | 19 ++++++++++++----
 src/main/scala/sbt/ManageDependencies.scala | 19 ++++++++++------
 src/main/scala/sbt/ManagedInterface.scala   | 24 +++++++++++++++------
 3 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index b512e70d1..793951d69 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -279,13 +279,14 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	/** The options provided to the 'update' action.  This is by default the options in 'baseUpdateOptions'.
 	* If 'manager' has any dependencies, resolvers, or inline Ivy XML (which by default happens when inline
 	* dependency management is used), it is passed as the dependency manager.*/
-	def updateOptions: Seq[ManagedOption] =
+	def updateOptions: Seq[ManagedOption] = baseUpdateOptions ++ managerOption
+	def managerOption: Seq[ManagedOption] =
 	{
 		val m = manager
 		if(m.dependencies.isEmpty && m.resolvers.isEmpty && ivyXML.isEmpty && m.artifacts.isEmpty && m.configurations.isEmpty)
-			baseUpdateOptions
+			Nil
 		else
-			LibraryManager(m) :: baseUpdateOptions
+			LibraryManager(m) :: Nil
 	}
 	def deliverOptions: Seq[ManagedOption] = updateOptions.filter { case _: CheckScalaVersion => false; case _ => true }
 	def publishOptions: Seq[ManagedOption] = deliverOptions
@@ -347,11 +348,20 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	protected def deliverProjectDependencies: Iterable[ModuleID] =
 	{
 		val interDependencies = new scala.collection.mutable.ListBuffer[ModuleID]
-		dependencies.foreach(dep => dep match { case mp: ManagedProject => interDependencies += mp.projectID; case _ => () })
+		dependencies.foreach(dep => dep match { case mp: ManagedProject => interDependencies += projectModuleID(mp); case _ => () })
 		if(filterScalaJars)
 			interDependencies ++= deliverScalaDependencies
 		interDependencies.readOnly
 	}
+	protected def projectModuleID(mp: ManagedProject) =
+	{
+		val base = mp.projectID
+		val as = mp.artifacts.toSeq.toArray
+		if(as.size == 1)
+			base artifacts(as : _*)
+		else
+			base artifacts(as.filter(_.`type` != "pom") : _*)
+	}
 	protected def deliverScalaDependencies: Iterable[ModuleID] = Nil
 	protected def makePomAction = makePomTask(pomPath, deliverProjectDependencies, None, updateOptions)
 	protected def deliverLocalAction = deliverTask(publishLocalConfiguration, deliverOptions)
@@ -542,6 +552,7 @@ trait ReflectiveProject extends ReflectiveModules with ReflectiveTasks with Refl
 /** This Project subclass is used to contain other projects as dependencies.*/
 class ParentProject(val info: ProjectInfo) extends BasicDependencyProject
 {
+	override def managerOption: Seq[ManagedOption] = LibraryManager(new AutoDetectManager(projectID, false)) :: Nil
 	def dependencies: Iterable[Project] = info.dependencies ++ subProjects.values.toList
 	/** The directories to which a project writes are listed here and is used
 	* to check a project and its dependencies for collisions.*/
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index e136e64b7..adb70191c 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -138,7 +138,7 @@ object ManageDependencies
 		/** Called to determine dependencies when the dependency manager is SbtManager and no inline dependencies (Scala or XML) are defined
 		* or if the manager is AutodetectManager.  It will try to read from pom.xml first and then ivy.xml if pom.xml is not found.  If neither is found,
 		* Ivy is configured with defaults unless IvyFlags.errorIfNoConfiguration is true, in which case an error is generated.*/
-		def autodetectDependencies(module: ModuleRevisionId) =
+		def autodetectDependencies(module: ModuleRevisionId, defaultArtifact: Boolean) =
 		{
 			log.debug("Autodetecting dependencies.")
 			val defaultPOMFile = defaultPOM(paths.projectDirectory).asFile
@@ -157,7 +157,8 @@ object ManageDependencies
 					log.warn("No readable dependency configuration found, using defaults.")
 					val moduleID = DefaultModuleDescriptor.newDefaultInstance(module)
 					addMainArtifact(moduleID)
-					addDefaultArtifact(defaultConf, moduleID)
+					if(defaultArtifact)
+						addDefaultArtifact(defaultConf, moduleID)
 					Right((moduleID, defaultConf))
 				}
 			}
@@ -183,7 +184,7 @@ object ManageDependencies
 				{
 					log.debug("No dependency manager explicitly specified.")
 					autodetectConfiguration()
-					autodetectDependencies(toID(adm.module))
+					autodetectDependencies(toID(adm.module), adm.defaultArtifact)
 				}
 				case sm: SbtManager =>
 				{
@@ -196,7 +197,7 @@ object ManageDependencies
 						configureDefaults(withDefaultResolvers(resolvers))
 					}
 					if(autodetect)
-						autodetectDependencies(toID(module))
+						autodetectDependencies(toID(module), true)
 					else
 					{
 						val moduleID =
@@ -280,7 +281,7 @@ object ManageDependencies
 		}
 	}
 	private def addExtraNamespaces(md: DefaultModuleDescriptor): Unit =
-		md.getExtraAttributesNamespaces.asInstanceOf[java.util.Map[String,String]].put("m", "m")
+		md.getExtraAttributesNamespaces.asInstanceOf[java.util.Map[String,String]].put("e", "http://ant.apache.org/ivy/extra")
 	/** Checks the immediate dependencies of module for dependencies on scala jars and verifies that the version on the
 	* dependencies matches scalaVersion. */
 	private def checkDependencies(module: ModuleDescriptor, scalaVersion: String, configurations: Iterable[Configuration]): Option[String] =
@@ -538,7 +539,11 @@ object ManageDependencies
 		}
 	}
 	private def extra(artifact: Artifact) =
-		artifact.classifier.map(c => wrap.Wrappers.javaMap("m:classifier" -> c)).getOrElse(null)
+	{
+		val ea = artifact.classifier match { case Some(c) => artifact.extra("e:classifier" -> c); case None => artifact }
+		javaMap(artifact.extraAttributes)
+	}
+	private def javaMap(map: Map[String,String]) = if(map.isEmpty) null else wrap.Wrappers.javaMap(map.toSeq : _*)
 	private def toURL(file: File) = file.toURI.toURL
 	/** Adds the ivy.xml main artifact. */
 	private def addMainArtifact(moduleID: DefaultModuleDescriptor)
@@ -574,7 +579,7 @@ object ManageDependencies
 	private def toID(m: ModuleID) =
 	{
 		import m._
-		ModuleRevisionId.newInstance(organization, name, revision)
+		ModuleRevisionId.newInstance(organization, name, revision, javaMap(extraAttributes))
 	}
 	private def toIvyArtifact(moduleID: ModuleDescriptor, a: Artifact, configurations: Iterable[String]): MDArtifact =
 	{
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index c1e4e0611..f9f0e725b 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -12,7 +12,10 @@ import org.apache.ivy.util.url.CredentialsStore
 sealed abstract class Manager extends NotNull
 /** This explicitly requests auto detection as a dependency manager.  It will first check for a 'pom.xml' file and if that does not exist, an 'ivy.xml' file.
 * Ivy is configured using the detected file or uses defaults.*/
-final class AutoDetectManager(val module: ModuleID) extends Manager
+final class AutoDetectManager(val module: ModuleID, val defaultArtifact: Boolean) extends Manager
+{
+	def this(module: ModuleID) = this(module, true)
+}
 /** This explicitly requests that the Maven pom 'pom' be used to determine dependencies.  An Ivy configuration file to use may be specified in
 * 'configuration', since Ivy currently cannot extract Maven repositories from a pom file. Otherwise, defaults are used.*/
 final class MavenManager(val configuration: Option[Path], val pom: Path) extends Manager
@@ -52,16 +55,17 @@ final class SimpleManager private[sbt] (val dependenciesXML: NodeSeq, val autode
 			explicitConfigurations
 }
 
-final case class ModuleID(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact]) extends NotNull
+final case class ModuleID(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact], extraAttributes: Map[String,String]) extends NotNull
 {
 	override def toString = organization + ":" + name + ":" + revision
 	// () required for chaining
 	def notTransitive() = intransitive()
-	def intransitive() = ModuleID(organization, name, revision, configurations, isChanging, false, explicitArtifacts)
-	def changing() = ModuleID(organization, name, revision, configurations, true, isTransitive, explicitArtifacts)
+	def intransitive() = ModuleID(organization, name, revision, configurations, isChanging, false, explicitArtifacts, extraAttributes)
+	def changing() = ModuleID(organization, name, revision, configurations, true, isTransitive, explicitArtifacts, extraAttributes)
 	def from(url: String) = artifacts(Artifact(name, new URL(url)))
 	def classifier(c: String) = artifacts(Artifact(name, c))
-	def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts)
+	def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts, extraAttributes)
+	def extra(attributes: (String,String)*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, extraAttributes ++ attributes)
 }
 object ModuleID
 {
@@ -70,6 +74,8 @@ object ModuleID
 		ModuleID(organization, name, revision, configurations, false, true)
 	def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean): ModuleID =
 		ModuleID(organization, name, revision, configurations, isChanging, isTransitive, Nil)
+	def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact]): ModuleID =
+		ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, Map.empty)
 }
 sealed trait Resolver extends NotNull
 {
@@ -334,13 +340,19 @@ final case class Configuration(name: String, description: String, isPublic: Bool
 	override def toString = name
 }
 
-final case class Artifact(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL]) extends NotNull
+final case class Artifact(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL], extraAttributes: Map[String,String]) extends NotNull
+{
+	def extra(attributes: (String,String)*) = Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes ++ attributes)
+}
 object Artifact
 {
 	def apply(name: String): Artifact = Artifact(name, defaultType, defaultExtension, None, Nil, None)
+	def apply(name: String, extra: Map[String,String]): Artifact = Artifact(name, defaultType, defaultExtension, None, Nil, None, extra)
 	def apply(name: String, classifier: String): Artifact = Artifact(name, defaultType, defaultExtension, Some(classifier), Nil, None)
 	def apply(name: String, `type`: String, extension: String): Artifact = Artifact(name, `type`, extension, None, Nil, None)
 	def apply(name: String, url: URL): Artifact =Artifact(name, extract(url, defaultType), extract(url, defaultExtension), None, Nil, Some(url))
+	def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL]): Artifact =
+		Artifact(name, `type`, extension, classifier, configurations, url, Map.empty)
 	val defaultExtension = "jar"
 	val defaultType = "jar"
 	private[this] def extract(url: URL, default: String) =

From 3cea48116fe49bdfa38e53935dfacb529f808574 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 8 Sep 2009 23:07:02 +0000
Subject: [PATCH 090/268] Fix issue with parent project defining non-existing
 jar artifact

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@987 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala  | 49 +++++++--------
 src/main/scala/sbt/DefaultProject.scala     | 66 ++++++++++-----------
 src/main/scala/sbt/ManageDependencies.scala | 24 ++++----
 src/main/scala/sbt/ManagedInterface.scala   | 29 +++++----
 4 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 793951d69..969f84b77 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -10,7 +10,7 @@ trait ClasspathProject extends Project
 {
 	/** The local classpath for this project.*/
 	def projectClasspath(config: Configuration): PathFinder
-	
+
 	/** Returns the classpath of this project and the classpaths of all dependencies for the
 	* given configuration.  Specifically, this concatentates projectClasspath(config) for all
 	* projects of type ClasspathProject in topologicalSort. */
@@ -77,7 +77,7 @@ trait ManagedProject extends ClasspathProject
 	/** An update option that overrides the default Ivy cache location. */
 	final case class CacheDirectory(dir: Path) extends ManagedOption
 	final case class CheckScalaVersion(configs: Iterable[Configuration], checkExplicit: Boolean, filterImplicit: Boolean) extends ManagedOption
-	
+
 	protected def withConfigurations(outputPattern: String, managedDependencyPath: Path, options: Seq[ManagedOption])
 		(doWith: (IvyConfiguration, UpdateConfiguration) => Option[String]) =
 	{
@@ -132,7 +132,7 @@ trait ManagedProject extends ClasspathProject
 		updateTask(outputPattern, managedDependencyPath, options)
 	def updateTask(outputPattern: String, managedDependencyPath: Path, options: => Seq[ManagedOption]) =
 		withIvyTask(withConfigurations(outputPattern, managedDependencyPath, options)(ManageDependencies.update))
-		
+
 	def publishTask(publishConfiguration: => PublishConfiguration, options: => Seq[ManagedOption]) =
 		withIvyTask
 		{
@@ -154,23 +154,23 @@ trait ManagedProject extends ClasspathProject
 	def makePomTask(output: => Path, extraDependencies: => Iterable[ModuleID], configurations: => Option[Iterable[Configuration]], options: => Seq[ManagedOption]) =
 		withIvyTask(withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) =>
 			ManageDependencies.makePom(ivyConf, extraDependencies, configurations, output.asFile) })
-		
+
 	def cleanCacheTask(managedDependencyPath: Path, options: => Seq[ManagedOption]) =
 		withIvyTask(withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) => ManageDependencies.cleanCache(ivyConf) })
-		
+
 	def cleanLibTask(managedDependencyPath: Path) = task { FileUtilities.clean(managedDependencyPath.get, log) }
 
 	/** This is the public ID of the project (used for publishing, for example) */
 	def moduleID: String = normalizedName + appendable(crossScalaVersionString)
 	/** This is the full public ID of the project (used for publishing, for example) */
-	def projectID: ModuleID = ModuleID(organization, moduleID, version.toString)
+	def projectID: ModuleID = ModuleID(organization, moduleID, version.toString).artifacts(artifacts.toSeq : _*)
 
 	/** This is the default name for artifacts (such as jars) without any version string.*/
 	def artifactID = moduleID
 	/** This is the default name for artifacts (such as jars) including the version string.*/
 	def artifactBaseName = artifactID + "-" + version.toString
 	def artifacts: Iterable[Artifact]
-	
+
 	def managedDependencyPath: Path
 	/** The managed classpath for the given configuration.  This can be overridden to add jars from other configurations
 	* so that the Ivy 'extends' mechanism is not required.  That way, the jars are only copied to one configuration.*/
@@ -179,7 +179,7 @@ trait ManagedProject extends ClasspathProject
 	final def configurationClasspath(config: Configuration): PathFinder = descendents(configurationPath(config), "*.jar")
 	/** The base path to which dependencies in configuration 'config' are downloaded.*/
 	def configurationPath(config: Configuration): Path = managedDependencyPath / config.toString
-	
+
 	import StringUtilities.nonEmpty
 	implicit def toGroupID(groupID: String): GroupID =
 	{
@@ -196,7 +196,7 @@ trait ManagedProject extends ClasspathProject
 		require(m.configurations.isEmpty, "Configurations already specified for module " + m)
 		new ModuleIDConfigurable(m)
 	}
-	
+
 	/** Creates a new configuration with the given name.*/
 	def config(name: String) = new Configuration(name)
 }
@@ -232,8 +232,8 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	/** The dependency manager that represents inline declarations.  The default manager packages the information
 	* from 'ivyXML', 'projectID', 'repositories', and 'libraryDependencies' and does not typically need to be
 	* be overridden. */
-	def manager = new SimpleManager(ivyXML, true, projectID, repositories.toSeq, ivyConfigurations, defaultConfiguration, artifacts, libraryDependencies.toList: _*)
-	
+	def manager = new SimpleManager(ivyXML, true, projectID, repositories.toSeq, ivyConfigurations, defaultConfiguration, libraryDependencies.toList: _*)
+
 	/** The pattern for Ivy to use when retrieving dependencies into the local project.  Classpath management
 	* depends on the first directory being [conf] and the extension being [ext].*/
 	def outputPattern = "[conf]/[artifact](-[revision]).[ext]"
@@ -261,7 +261,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	def defaultConfiguration: Option[Configuration] = Some(Configurations.DefaultConfiguration(useDefaultConfigurations))
 	def useMavenConfigurations = true // TODO: deprecate after going through a minor version series to verify that this works ok
 	def useDefaultConfigurations = useMavenConfigurations
-	def managedStyle: ManagedType = 
+	def managedStyle: ManagedType =
 		info.parent match
 		{
 			case Some(m: BasicManagedProject) => m.managedStyle
@@ -283,7 +283,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	def managerOption: Seq[ManagedOption] =
 	{
 		val m = manager
-		if(m.dependencies.isEmpty && m.resolvers.isEmpty && ivyXML.isEmpty && m.artifacts.isEmpty && m.configurations.isEmpty)
+		if(m.dependencies.isEmpty && m.resolvers.isEmpty && ivyXML.isEmpty && m.module.explicitArtifacts.isEmpty && m.configurations.isEmpty)
 			Nil
 		else
 			LibraryManager(m) :: Nil
@@ -340,28 +340,19 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 			case _ => baseClasspath
 		}
 	}
-	
+
 	protected def updateAction = updateTask(outputPattern, managedDependencyPath, updateOptions) describedAs UpdateDescription
 	protected def cleanLibAction = cleanLibTask(managedDependencyPath) describedAs CleanLibDescription
 	protected def cleanCacheAction = cleanCacheTask(managedDependencyPath, updateOptions) describedAs CleanCacheDescription
-	
+
 	protected def deliverProjectDependencies: Iterable[ModuleID] =
 	{
 		val interDependencies = new scala.collection.mutable.ListBuffer[ModuleID]
-		dependencies.foreach(dep => dep match { case mp: ManagedProject => interDependencies += projectModuleID(mp); case _ => () })
+		dependencies.foreach(dep => dep match { case mp: ManagedProject => interDependencies += mp.projectID; case _ => () })
 		if(filterScalaJars)
 			interDependencies ++= deliverScalaDependencies
 		interDependencies.readOnly
 	}
-	protected def projectModuleID(mp: ManagedProject) =
-	{
-		val base = mp.projectID
-		val as = mp.artifacts.toSeq.toArray
-		if(as.size == 1)
-			base artifacts(as : _*)
-		else
-			base artifacts(as.filter(_.`type` != "pom") : _*)
-	}
 	protected def deliverScalaDependencies: Iterable[ModuleID] = Nil
 	protected def makePomAction = makePomTask(pomPath, deliverProjectDependencies, None, updateOptions)
 	protected def deliverLocalAction = deliverTask(publishLocalConfiguration, deliverOptions)
@@ -389,7 +380,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		def this(resolver: Resolver, status: String, publishIvy: Boolean) = this(resolver.name, status, publishIvy)
 		def this(resolverName: String, status: String) = this(resolverName, status, true)
 		def this(resolver: Resolver, status: String) = this(resolver.name, status)
-		
+
 		protected def deliveredPathPattern = outputPath / "[artifact]-[revision].[ext]"
 		def deliveredPattern = deliveredPathPattern.relativePath
 		def srcArtifactPatterns: Iterable[String] =
@@ -404,12 +395,12 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		/**  The configurations to include in the publish/deliver action: specify none for all public configurations. */
 		def configurations: Option[Iterable[Configuration]] = None
 	}
-	
+
 	def packageToPublishActions: Seq[ManagedTask] = Nil
-	
+
 	private[this] def depMap[T](f: BasicManagedProject => T) =
 		topologicalSort.dropRight(1).flatMap { case m: BasicManagedProject => f(m) :: Nil; case _ => Nil }
-	
+
 	lazy val update = updateAction
 	lazy val makePom = makePomAction dependsOn(packageToPublishActions : _*)
 	lazy val cleanLib = cleanLibAction
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 0161eff5b..b579d3a17 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -45,7 +45,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 
 	val mainCompileConditional = new CompileConditional(mainCompileConfiguration)
 	val testCompileConditional = new CompileConditional(testCompileConfiguration)
-	
+
 	def compileOrder = CompileOrder.Mixed
 
 	/** The main artifact produced by this project. To redefine the main artifact, override `defaultMainArtifact`
@@ -54,9 +54,9 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	/** Defines the default main Artifact assigned to `mainArtifact`.  By default, this is a jar file with name given
 	* by `artifactID`.*/
 	protected def defaultMainArtifact = Artifact(artifactID, "jar", "jar")
-	
+
 	import Project._
-	
+
 	/** The options provided to the 'compile' action to pass to the Scala compiler.*/
 	def compileOptions: Seq[CompileOption] = Deprecation :: Nil
 	/** The options provided to the 'compile' action to pass to the Java compiler. */
@@ -65,7 +65,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def testCompileOptions: Seq[CompileOption] = compileOptions
 	/** The options provided to the 'test-compile' action to pass to the Java compiler. */
 	def testJavaCompileOptions: Seq[JavaCompileOption] = javaCompileOptions
-	
+
 	/** The options provided to the 'doc' and 'docTest' actions.*/
 	def documentOptions: Seq[ScaladocOption] =
 		LinkSource ::
@@ -82,11 +82,11 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		ClearAnalysis(mainCompileConditional.analysis) ::
 		ClearAnalysis(testCompileConditional.analysis) ::
 		historyPath.map(history => Preserve(history)).toList
-		
+
 	def packageOptions: Seq[PackageOption] =
 		manifestClassPath.map(cp => ManifestAttributes( (Attributes.Name.CLASS_PATH, cp) )).toList :::
 		getMainClass(false).map(MainClass(_)).toList
-	
+
 	private def succeededTestPath = testAnalysisPath / "succeeded-tests"
 	private def quickOptions(failedOnly: Boolean) =
 	{
@@ -94,7 +94,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		val analysis = testCompileConditional.analysis
 		TestFilter(new impl.TestQuickFilter(analysis, failedOnly, path, log))  :: TestListeners(new impl.TestStatusReporter(path, log) :: Nil) :: Nil
 	}
-	
+
 	protected def includeTest(test: String): Boolean = true
 
 	/** This is called to create the initial directories when a user makes a new project from
@@ -110,7 +110,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	import Configurations._
 	/** The managed configuration to use when determining the classpath for a Scala interpreter session.*/
 	def consoleConfiguration = Test
-	
+
 	/** A PathFinder that provides the classpath to pass to scaladoc.  It is the same as the compile classpath
 	* by default. */
 	def docClasspath = compileClasspath
@@ -154,7 +154,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	/** The unmanaged classpath for the test configuration.  By default, it includes the run classpath, which includes the base
 	* classpath returned by `mainUnmanagedClasspath`.*/
 	protected def testUnmanagedClasspath = testCompilePath +++ testResourcesOutputPath  +++ testDependencies.scalaCompiler +++ runUnmanagedClasspath
-	
+
 	/** @deprecated Use `mainDependencies.scalaJars`*/
 	@deprecated protected final def scalaJars: Iterable[File] = mainDependencies.scalaJars.get.map(_.asFile)
 	/** An analysis of the jar dependencies of the main Scala sources.  It is only valid after main source compilation.
@@ -170,10 +170,10 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def testFrameworks: Iterable[TestFramework] = ScalaCheckFramework :: SpecsFramework :: ScalaTestFramework :: Nil
 	/** The list of listeners for testing. */
 	def testListeners: Seq[TestReportListener] = new LogTestReportListener(log) :: Nil
-	
+
 	def mainLabel = "main"
 	def testLabel = "test"
-	
+
 	def mainCompileConfiguration: CompileConfiguration = new MainCompileConfig
 	def testCompileConfiguration: CompileConfiguration = new TestCompileConfig
 	abstract class BaseCompileConfig extends CompileConfiguration
@@ -209,7 +209,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def testDefinitionClassNames: Iterable[String] = testFrameworks.map(_.testSuperClassName)
 		def javaOptions = javaOptionsAsString(testJavaCompileOptions)
 	}
-	
+
 	/** Configures forking the compiler and runner.  Use ForkScalaCompiler, ForkScalaRun or mix together.*/
 	def fork: Option[ForkScala] = None
 	private def doCompile(conditional: CompileConditional) =
@@ -228,15 +228,15 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 			case _ => Run
 		}
 	}
-	
+
 	protected def runTask(mainClass: String): MethodTask = task { args => runTask(Some(mainClass), runClasspath, args) dependsOn(compile, copyResources) }
-	
+
 	protected def compileAction = task { doCompile(mainCompileConditional) } describedAs MainCompileDescription
 	protected def testCompileAction = task { doCompile(testCompileConditional) } dependsOn compile describedAs TestCompileDescription
 	protected def cleanAction = cleanTask(outputPath, cleanOptions) describedAs CleanDescription
 	protected def runAction = task { args => runTask(getMainClass(true), runClasspath, args, getRunner) dependsOn(compile, copyResources) } describedAs RunDescription
-	protected def consoleQuickAction = consoleTask(consoleClasspath, getRunner) describedAs ConsoleQuickDescription
-	protected def consoleAction = consoleTask(consoleClasspath, getRunner).dependsOn(testCompile, copyResources, copyTestResources) describedAs ConsoleDescription
+	protected def consoleQuickAction = consoleTask(consoleClasspath, Run) describedAs ConsoleQuickDescription
+	protected def consoleAction = consoleTask(consoleClasspath, Run).dependsOn(testCompile, copyResources, copyTestResources) describedAs ConsoleDescription
 	protected def docAction = scaladocTask(mainLabel, mainSources, mainDocPath, docClasspath, documentOptions).dependsOn(compile) describedAs DocDescription
 	protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription
 	protected def testAction = defaultTestTask(testOptions)
@@ -248,25 +248,25 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		testQuickMethod(testCompileConditional.analysis, testOptions)(options => defaultTestTask(quickOptions(failedOnly) ::: options.toList))
 	protected def defaultTestTask(testOptions: => Seq[TestOption]) =
 		testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription
-		
+
 	override def packageToPublishActions: Seq[ManagedTask] = `package` :: Nil
-	
+
 	protected def packageAction = packageTask(packagePaths, jarPath, packageOptions).dependsOn(compile) describedAs PackageDescription
 	protected def packageTestAction = packageTask(packageTestPaths, packageTestJar).dependsOn(testCompile) describedAs TestPackageDescription
 	protected def packageDocsAction = packageTask(mainDocPath ##, packageDocsJar, Recursive).dependsOn(doc) describedAs DocPackageDescription
 	protected def packageSrcAction = packageTask(packageSourcePaths, packageSrcJar) describedAs SourcePackageDescription
 	protected def packageTestSrcAction = packageTask(packageTestSourcePaths, packageTestSrcJar) describedAs TestSourcePackageDescription
 	protected def packageProjectAction = zipTask(packageProjectPaths, packageProjectZip) describedAs ProjectPackageDescription
-	
+
 	protected def docAllAction = (doc && docTest) describedAs DocAllDescription
 	protected def packageAllAction = task { None } dependsOn(`package`, packageTest, packageSrc, packageTestSrc, packageDocs) describedAs PackageAllDescription
 	protected def graphAction = graphTask(graphPath, mainCompileConditional.analysis).dependsOn(compile)
 	protected def incrementVersionAction = task { incrementVersionNumber(); None } describedAs IncrementVersionDescription
 	protected def releaseAction = (test && packageAll && incrementVersion) describedAs ReleaseDescription
-	
+
 	protected def copyResourcesAction = syncPathsTask(mainResources, mainResourcesOutputPath) describedAs CopyResourcesDescription
 	protected def copyTestResourcesAction = syncPathsTask(testResources, testResourcesOutputPath) describedAs CopyTestResourcesDescription
-	
+
 	lazy val compile = compileAction
 	lazy val testCompile = testCompileAction
 	lazy val clean = cleanAction
@@ -293,10 +293,10 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	lazy val testQuick = testQuickAction
 	lazy val testFailed = testFailedAction
 	lazy val testOnly = testOnlyAction
-	
+
 	lazy val javap = javapTask(runClasspath, mainCompileConditional, mainCompilePath)
 	lazy val testJavap = javapTask(testClasspath, testCompileConditional, testCompilePath)
-	
+
 	def jarsOfProjectDependencies = Path.lazyPathFinder {
 		topologicalSort.dropRight(1) flatMap { p =>
 			p match
@@ -318,13 +318,13 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 { p =>
 	import BasicWebScalaProject._
 	override def watchPaths = super.watchPaths +++ webappResources
-	
+
 	lazy val prepareWebapp = prepareWebappAction
 	protected def prepareWebappAction =
 		prepareWebappTask(webappResources, temporaryWarPath, webappClasspath, mainDependencies.scalaJars) dependsOn(compile, copyResources)
-	
+
 	lazy val jettyInstance = new JettyRunner(jettyConfiguration)
-	
+
 	def jettyConfiguration =
 		new DefaultJettyConfiguration
 		{
@@ -361,7 +361,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 		while (System.in.available() > 0) System.in.read()
 		None
 	}
-		
+
 	/** The directories that should be watched to determine if the web application needs to be reloaded..*/
 	def scanDirectories: Seq[Path] = jettyWebappPath :: Nil
 	/** The time in seconds between scans that check whether the web application should be reloaded.*/
@@ -372,11 +372,11 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	lazy val jettyRestart = jettyStop && jettyRun
 	lazy val jettyStop = jettyStopAction
 	protected def jettyStopAction = jettyStopTask(jettyInstance) describedAs(JettyStopDescription)
-	
+
 	/** The clean action for a web project is modified so that it first stops jetty if it is running,
 	* since the webapp directory will be removed by the clean.*/
 	override def cleanAction = super.cleanAction dependsOn jettyStop
-	
+
 	/** Redefine the `package` action to make a war file.*/
 	override protected def packageAction = packageTask(descendents(temporaryWarPath ##, "*"), warPath, Nil) dependsOn(prepareWebapp) describedAs PackageWarDescription
 
@@ -434,7 +434,7 @@ object BasicScalaProject
 		"Copies resources to the target directory where they can be included on classpaths."
 	val CopyTestResourcesDescription =
 		"Copies test resources to the target directory where they can be included on the test classpath."
-		
+
 	private def warnMultipleMainClasses(log: Logger) =
 	{
 		log.warn("No Main-Class attribute will be added automatically added:")
@@ -443,7 +443,7 @@ object BasicScalaProject
 	}
 	private def mapScalaModule(in: Iterable[_], id: String) =
 	{
-		ScalaVersion.current.toList.flatMap { scalaVersion => 
+		ScalaVersion.current.toList.flatMap { scalaVersion =>
 			in.map(jar => ModuleID(ScalaArtifacts.Organization, id, scalaVersion))
 		}
 	}
@@ -478,7 +478,7 @@ final class LibraryDependencies(project: Project, conditional: CompileConditiona
 
 	/** Returns an object that has all analyzed dependency information frozen at the time of this method call. */
 	def snapshot = new Dependencies
-	
+
 	private def rootProjectDirectory = project.rootProject.info.projectPath
 
 	final class Dependencies
@@ -504,5 +504,5 @@ private object LibraryDependencies
 	private def isScalaJar(file: File) = ClasspathUtilities.isArchive(file) &&  ScalaJarPrefixes.exists(isNamed(file))
 	private def isScalaLibraryJar(file: File) = isNamed(file)(ScalaLibraryPrefix)
 	private def isNamed(file: File)(name: String) = file.getName.startsWith(name)
-	
+
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index adb70191c..76b6d6264 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -47,11 +47,11 @@ object ManageDependencies
 	val DefaultIvyConfigFilename = "ivysettings.xml"
 	val DefaultIvyFilename = "ivy.xml"
 	val DefaultMavenFilename = "pom.xml"
-	
+
 	private def defaultIvyFile(project: Path) = project / DefaultIvyFilename
 	private def defaultIvyConfiguration(project: Path) = project / DefaultIvyConfigFilename
 	private def defaultPOM(project: Path) = project / DefaultMavenFilename
-	
+
 	/** Configures Ivy using the provided configuration 'config' and calls 'doWithIvy'.  This method takes care of setting up and cleaning up Ivy.*/
 	private def withIvy(config: IvyConfiguration)(doWithIvy: (Ivy, ModuleDescriptor, String) => Option[String]) =
 		withIvyValue(config)( (ivy, module, default) => doWithIvy(ivy, module, default).toLeft(()) ).left.toOption
@@ -67,7 +67,7 @@ object ManageDependencies
 		val settings = new IvySettings
 		settings.setBaseDir(paths.projectDirectory.asFile)
 		log.debug("\nCreated settings...\n")
-		
+
 		/** Parses the given Maven pom 'pomFile'.*/
 		def readPom(pomFile: File) =
 			Control.trap("Could not read pom: ", log)
@@ -116,7 +116,7 @@ object ManageDependencies
 			user ++
 			Seq(DefaultMavenRepository) ++
 			(if(flags.addScalaTools) Seq(ScalaToolsReleases) else Nil)
-		
+
 		/** Configures Ivy using defaults.  This is done when no ivy-settings.xml exists. */
 		def configureDefaults(resolvers: Seq[Resolver])
 		{
@@ -155,7 +155,9 @@ object ManageDependencies
 				{
 					val defaultConf = ModuleDescriptor.DEFAULT_CONFIGURATION
 					log.warn("No readable dependency configuration found, using defaults.")
-					val moduleID = DefaultModuleDescriptor.newDefaultInstance(module)
+					val moduleID = new DefaultModuleDescriptor(module, "release", null, false)
+					moduleID.setLastModified(System.currentTimeMillis)
+					moduleID.addConfiguration(toIvyConfiguration(Configurations.Default))
 					addMainArtifact(moduleID)
 					if(defaultArtifact)
 						addDefaultArtifact(defaultConf, moduleID)
@@ -211,7 +213,7 @@ object ManageDependencies
 						log.debug("Using inline dependencies specified in Scala" + (if(dependenciesXML.isEmpty) "." else " and XML."))
 						for(parser <- parseXMLDependencies(wrapped(module, dependenciesXML), moduleID, defaultConf.name).right) yield
 						{
-							addArtifacts(moduleID, artifacts)
+							addArtifacts(moduleID, module.explicitArtifacts)
 							addDependencies(moduleID, dependencies, parser)
 							addMainArtifact(moduleID)
 							(moduleID, parser.getDefaultConf)
@@ -260,7 +262,7 @@ object ManageDependencies
 					log.debug("Not checking Scala dependencies")
 					Right(moduleAndConf)
 			}
-		
+
 		this.synchronized // Ivy is not thread-safe.  In particular, it uses a static DocumentBuilder, which is not thread-safe
 		{
 			val ivy = Ivy.newInstance(settings)
@@ -346,7 +348,7 @@ object ManageDependencies
 		def doClean(ivy: Ivy, module: ModuleDescriptor, default: String) =
 			Control.trapUnit("Could not clean cache: ", config.log)
 				{ ivy.getSettings.getRepositoryCacheManagers.foreach(_.clean()); None }
-		
+
 		withIvy(config)(doClean)
 	}
 	/** Creates a Maven pom from the given Ivy configuration*/
@@ -404,7 +406,7 @@ object ManageDependencies
 	}
 	private def addConfigurations(configurations: Iterable[String], to: { def setConfs(c: Array[String]): AnyRef }): Unit =
 		to.setConfs(configurations.toList.toArray)
-	
+
 	def install(ivyConfig: IvyConfiguration, from: String, to: String, validate: Boolean, overwrite: Boolean) =
 	{
 		def doInstall(ivy: Ivy, md: ModuleDescriptor, default: String) =
@@ -434,7 +436,7 @@ object ManageDependencies
 					val revID = module.getModuleRevisionId
 					val options = DeliverOptions.newInstance(ivy.getSettings).setStatus(status)
 					options.setConfs(getConfigurations(module, configurations))
-					
+
 					ivy.deliver(revID, revID.getRevision, deliverIvyPattern, options)
 					None
 				}
@@ -482,7 +484,7 @@ object ManageDependencies
 				}
 			}
 		}
-		
+
 		withIvy(ivyConfig)(processModule)
 	}
 	private def resolve(ivy: Ivy, updateConfig: UpdateConfiguration, module: ModuleDescriptor) =
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index f9f0e725b..1880df9be 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -34,13 +34,12 @@ sealed trait SbtManager extends Manager
 	def dependenciesXML: NodeSeq
 	def configurations: Iterable[Configuration]
 	def defaultConfiguration: Option[Configuration]
-	def artifacts: Iterable[Artifact]
 }
 final class SimpleManager private[sbt] (val dependenciesXML: NodeSeq, val autodetectUnspecified: Boolean,
 	val module: ModuleID, val resolvers: Seq[Resolver], explicitConfigurations: Iterable[Configuration],
-	val defaultConfiguration: Option[Configuration], val artifacts: Iterable[Artifact], val dependencies: ModuleID*) extends SbtManager
+	val defaultConfiguration: Option[Configuration], val dependencies: ModuleID*) extends SbtManager
 {
-	def autodetect = dependencies.isEmpty && dependenciesXML.isEmpty && artifacts.isEmpty && explicitConfigurations.isEmpty && autodetectUnspecified
+	def autodetect = dependencies.isEmpty && dependenciesXML.isEmpty && module.explicitArtifacts.isEmpty && explicitConfigurations.isEmpty && autodetectUnspecified
 	def configurations =
 		if(explicitConfigurations.isEmpty && !autodetect)
 		{
@@ -121,7 +120,7 @@ sealed abstract class PatternsBasedRepository extends Resolver
 
 	/** The object representing the configured patterns for this repository. */
 	def patterns: Patterns
-	
+
 	/** Enables maven 2 compatibility for this repository. */
 	def mavenStyle() = copy(patterns.mavenStyle())
 	/** Adds the given patterns for resolving/publishing Ivy files.*/
@@ -149,10 +148,10 @@ sealed abstract class SshBasedRepository extends PatternsBasedRepository
 	type RepositoryType <: SshBasedRepository
 	protected def copy(connection: SshConnection): RepositoryType
 	private def copy(authentication: SshAuthentication): RepositoryType = copy(connection.copy(Some(authentication)))
-	
+
 	/** The object representing the configured ssh connection for this repository. */
 	def connection: SshConnection
-	
+
 	/** Configures this to use the specified user name and password when connecting to the remote repository. */
 	def as(user: String, password: String): RepositoryType = copy(new PasswordAuthentication(user, password))
 	/** Configures this to use the specified keyfile and password for the keyfile when connecting to the remote repository. */
@@ -256,7 +255,7 @@ object Resolver
 	}
 	private def baseRepository[T](baseURI: java.net.URI)(construct: Patterns => T)(implicit basePatterns: Patterns): T =
 		construct(resolvePatterns(baseURI.normalize, basePatterns))
-	
+
 	/** If `base` is None, `patterns` is returned unchanged.
 	* Otherwise, the ivy file and artifact patterns in `patterns` are resolved against the given base. */
 	private def resolvePatterns(base: Option[String], patterns: Patterns): Patterns =
@@ -274,7 +273,7 @@ object Resolver
 	}
 	/** Constructs a `URI` with the path component set to `path` and the other components set to null.*/
 	private def pathURI(path: String) = new URI(null, null, path, null)
-	
+
 	def defaultFileConfiguration = FileConfiguration(true, None)
 	def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true)
 	def ivyStylePatterns = Patterns(Nil, Nil, false)
@@ -282,11 +281,11 @@ object Resolver
 	def defaultPatterns = mavenStylePatterns
 	def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
 	def localBasePattern = "[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
-	
+
 	def userRoot = System.getProperty("user.home")
 	def userMavenRoot = userRoot + "/.m2/repository/"
 	def userIvyRoot = userRoot + "/.ivy2/"
-	
+
 	def defaultLocal = defaultUserFileRepository("local")
 	def defaultShared = defaultUserFileRepository("shared")
 	def defaultUserFileRepository(id: String) = file(id, new File(userIvyRoot, id))(defaultIvyPatterns)
@@ -301,7 +300,7 @@ object Configurations
 {
 	def config(name: String) = new Configuration(name)
 	def defaultMavenConfigurations = Compile :: Runtime :: Test :: Provided :: System :: Optional :: Sources :: Javadoc :: Nil
-	
+
 	lazy val Default = config("default")
 	lazy val Compile = config("compile")
 	lazy val IntegrationTest = config("it") hide
@@ -314,16 +313,16 @@ object Configurations
 	lazy val Optional = config("optional")
 
 	lazy val CompilerPlugin = config("plugin") hide
-	
+
 	private[sbt] val DefaultMavenConfiguration = defaultConfiguration(true)
 	private[sbt] val DefaultIvyConfiguration = defaultConfiguration(false)
 	private[sbt] def DefaultConfiguration(mavenStyle: Boolean) = if(mavenStyle) DefaultMavenConfiguration else DefaultIvyConfiguration
-	private[sbt] def defaultConfiguration(mavenStyle: Boolean) = 
+	private[sbt] def defaultConfiguration(mavenStyle: Boolean) =
 	{
 		val base = if(mavenStyle) Configurations.Compile else Configurations.Default
 		config(base.name + "->default(compile)")
 	}
-	
+
 	private[sbt] def removeDuplicates(configs: Iterable[Configuration]) = Set(scala.collection.mutable.Map(configs.map(config => (config.name, config)).toSeq: _*).values.toList: _*)
 }
 /** Represents an Ivy configuration. */
@@ -383,7 +382,7 @@ object Credentials
 			{
 				val properties = new scala.collection.mutable.HashMap[String, String]
 				def get(keys: List[String]) = keys.flatMap(properties.get).firstOption.toRight(keys.head + " not specified in credentials file: " + path)
-					
+
 					impl.MapUtilities.read(properties, path, log) orElse
 					{
 						List.separate( List(RealmKeys, HostKeys, UserKeys, PasswordKeys).map(get) ) match

From cf6181690c2c13cc6acc08ed97f801e0bbf1d002 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 9 Sep 2009 03:10:31 +0000
Subject: [PATCH 091/268] Fix issue 42 (projects should search parents for
 ivysettings.xml)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@988 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 76b6d6264..937818f45 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -49,7 +49,7 @@ object ManageDependencies
 	val DefaultMavenFilename = "pom.xml"
 
 	private def defaultIvyFile(project: Path) = project / DefaultIvyFilename
-	private def defaultIvyConfiguration(project: Path) = project / DefaultIvyConfigFilename
+	private def defaultIvyConfiguration(project: File) = new File(project, DefaultIvyConfigFilename)
 	private def defaultPOM(project: Path) = project / DefaultMavenFilename
 
 	/** Configures Ivy using the provided configuration 'config' and calls 'doWithIvy'.  This method takes care of setting up and cleaning up Ivy.*/
@@ -129,10 +129,19 @@ object ManageDependencies
 		def autodetectConfiguration()
 		{
 			log.debug("Autodetecting configuration.")
-			val defaultIvyConfigFile = defaultIvyConfiguration(paths.projectDirectory).asFile
-			if(defaultIvyConfigFile.canRead)
-				settings.load(defaultIvyConfigFile)
-			else
+			def autodetect(dir: File): Boolean =
+				(dir != null) &&
+				{
+					val defaultIvyConfigFile = defaultIvyConfiguration(dir)
+					if(defaultIvyConfigFile.canRead)
+					{
+						settings.load(defaultIvyConfigFile)
+						true
+					}
+					else
+						autodetect(dir.getParentFile)
+				}
+			if(!autodetect(paths.projectDirectory.asFile))
 				configureDefaults(defaultResolvers)
 		}
 		/** Called to determine dependencies when the dependency manager is SbtManager and no inline dependencies (Scala or XML) are defined

From 4d80a7e8dd57793435809f2205b497076dbbaf9c Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 9 Sep 2009 03:10:51 +0000
Subject: [PATCH 092/268] Test case for issue #42

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@989 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../changes/ivysettings.xml                   |  7 ++++++
 .../project/build.properties                  |  2 ++
 .../project/build/SettingsTest.scala          | 11 +++++++++
 .../parent-ivy-settings/test                  | 23 +++++++++++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml
 create mode 100644 src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala
 create mode 100644 src/sbt-test/dependency-management/parent-ivy-settings/test

diff --git a/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml b/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml
new file mode 100644
index 000000000..7afecf7af
--- /dev/null
+++ b/src/sbt-test/dependency-management/parent-ivy-settings/changes/ivysettings.xml
@@ -0,0 +1,7 @@
+<ivysettings>
+	<settings defaultResolver="lag"/>
+	<caches defaultCacheDir="${ivy.settings.dir}/target/cache"/>
+	<resolvers>
+		<ibiblio name="lag" m2compatible="true" root="http://www.lag.net/repo/"/>
+	</resolvers>
+</ivysettings> 
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties b/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties
new file mode 100644
index 000000000..ad36054d5
--- /dev/null
+++ b/src/sbt-test/dependency-management/parent-ivy-settings/project/build.properties
@@ -0,0 +1,2 @@
+project.version=1.0
+project.name=Settings Test
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala b/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala
new file mode 100644
index 000000000..11fa48fcb
--- /dev/null
+++ b/src/sbt-test/dependency-management/parent-ivy-settings/project/build/SettingsTest.scala
@@ -0,0 +1,11 @@
+import sbt._
+
+class SettingsTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	val child = project("sub", "Sub", new SubProject(_))
+
+	class SubProject(info: ProjectInfo) extends DefaultProject(info)
+	{
+		val configgy = "net.lag" % "configgy" % "1.1"
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/parent-ivy-settings/test b/src/sbt-test/dependency-management/parent-ivy-settings/test
new file mode 100644
index 000000000..86e43b4a1
--- /dev/null
+++ b/src/sbt-test/dependency-management/parent-ivy-settings/test
@@ -0,0 +1,23 @@
+> update
+[failure]
+> clean-lib
+[success]
+$ copy-file changes/ivysettings.xml sub/ivysettings.xml
+[success]
+
+> update
+[success]
+> clean-lib
+[success]
+
+$ delete sub/ivysettings.xml
+[success]
+> update
+[failure]
+> clean-lib
+[success]
+
+$ copy-file changes/ivysettings.xml ivysettings.xml
+[success]
+> update
+[success]
\ No newline at end of file

From a0becc9efbba2418ba494d5a2b932a0f99b8a395 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 14:09:12 +0000
Subject: [PATCH 093/268] Proper graph actions: graph-src and graph-pkg for
 source dependency graph and quasi-package dependency graph (based on source
 directories and source dependencies).

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@992 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/DefaultProject.scala |  6 ++-
 src/main/scala/sbt/DotGraph.scala       | 69 +++++++++++++++++--------
 src/main/scala/sbt/ProjectPaths.scala   |  5 +-
 src/main/scala/sbt/ScalaProject.scala   |  5 +-
 4 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index b579d3a17..474cf11ac 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -260,7 +260,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 
 	protected def docAllAction = (doc && docTest) describedAs DocAllDescription
 	protected def packageAllAction = task { None } dependsOn(`package`, packageTest, packageSrc, packageTestSrc, packageDocs) describedAs PackageAllDescription
-	protected def graphAction = graphTask(graphPath, mainCompileConditional.analysis).dependsOn(compile)
+	protected def graphSourcesAction = graphSourcesTask(graphSourcesPath, mainSourceRoots, mainCompileConditional.analysis).dependsOn(compile)
+	protected def graphPackagesAction = graphPackagesTask(graphPackagesPath, mainSourceRoots, mainCompileConditional.analysis).dependsOn(compile)
 	protected def incrementVersionAction = task { incrementVersionNumber(); None } describedAs IncrementVersionDescription
 	protected def releaseAction = (test && packageAll && incrementVersion) describedAs ReleaseDescription
 
@@ -284,7 +285,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	lazy val packageProject = packageProjectAction
 	lazy val docAll = docAllAction
 	lazy val packageAll = packageAllAction
-	lazy val graph = graphAction
+	lazy val graphSrc = graphSourcesAction
+	lazy val graphPkg = graphPackagesAction
 	lazy val incrementVersion = incrementVersionAction
 	lazy val release = releaseAction
 	lazy val copyResources = copyResourcesAction
diff --git a/src/main/scala/sbt/DotGraph.scala b/src/main/scala/sbt/DotGraph.scala
index 18168ced9..fcc1b3f9b 100644
--- a/src/main/scala/sbt/DotGraph.scala
+++ b/src/main/scala/sbt/DotGraph.scala
@@ -7,41 +7,68 @@ import java.io.{File, Writer}
 
 object DotGraph
 {
-	def apply(analysis: BasicCompileAnalysis, outputDirectory: Path, log: Logger) =
+	def sources(analysis: BasicCompileAnalysis, outputDirectory: Path, sourceRoots: Iterable[Path], log: Logger) =
+	{
+		val roots = sourceRoots.toList.map(_.asFile)
+		val toString = (x: File) => sourceToString(roots, x)
+		apply(analysis, outputDirectory, toString, toString, log)
+	}
+	def packages(analysis: BasicCompileAnalysis, outputDirectory: Path, sourceRoots: Iterable[Path], log: Logger) =
+	{
+		val roots = sourceRoots.toList.map(_.asFile)
+		val packageOnly = (path: String) =>
+		{
+			val last = path.lastIndexOf(File.separatorChar)
+			val packagePath = (if(last > 0) path.substring(0, last) else path).trim
+			if(packagePath.isEmpty) "" else packagePath.replace(File.separatorChar, '.')
+		}
+		val toString = packageOnly compose ((x: File) => sourceToString(roots, x))
+		apply(analysis, outputDirectory, toString, toString, log)
+	}
+	def apply(analysis: BasicCompileAnalysis, outputDirectory: Path, sourceToString: File => String, externalToString: File => String, log: Logger) =
 	{
 		val outputDir = outputDirectory.asFile
 		
 		def generateGraph[Key, Value](fileName: String, graphName: String, graph: Iterable[(Key, scala.collection.Set[Value])],
 			keyToString: Key => String, valueToString: Value => String) =
 		{
-			FileUtilities.write(new File(outputDir, fileName), log)
-			{
-				(writer: Writer) =>
+			import scala.collection.mutable.{HashMap, MultiMap, Set}
+			val mappedGraph = new HashMap[String, Set[String]] with MultiMap[String, String]
+			for( (key, values) <- graph; keyString = keyToString(key); value <- values)
+				mappedGraph.add(keyString, valueToString(value))
+
+			FileUtilities.write(new File(outputDir, fileName), log) { (writer: Writer) =>
+			
+				def writeLine(line: String) = FileUtilities.writeLine(writer, line)
+				writeLine("digraph " + graphName + " {")
+				for( (dependsOn, dependants) <- mappedGraph; dependant <- dependants)
 				{
-					def writeLine(line: String) = FileUtilities.writeLine(writer, line)
-					writeLine("digraph " + graphName + " {")
-					for( (dependsOn, dependants) <- graph; dependant <- dependants)
-						writeLine(valueToString(dependant) + " -> " + keyToString(dependsOn))
-					writeLine("}")
-					None
+					if(dependant != dependsOn && !dependsOn.isEmpty && !dependant.isEmpty)
+						writeLine("\"" + dependant + "\" -> \"" + dependsOn + "\"")
 				}
+				writeLine("}")
+				None
 			}
 		}
+		val srcToString = (p: Path) => sourceToString(p.asFile)
 		FileUtilities.createDirectory(outputDir, log) orElse
 		generateGraph(BasicAnalysis.DependenciesFileName, "dependencies", analysis.allDependencies,
-			sourceToString, sourceToString) orElse
+			srcToString, srcToString) orElse
 		generateGraph(BasicAnalysis.ExternalDependenciesFileName, "externalDependencies", analysis.allExternalDependencies,
-			fileToString, sourceToString)
+			externalToString, srcToString)
 	}
-	private def sourceToString(source: Path) = fileToString(source.asFile)
-	private def fileToString(file: File) =
+	def sourceToString(roots: List[File], source: File) =
 	{
-		val rawName = file.getName
-		val name =
-			if(rawName.endsWith(".scala"))
-				rawName.substring(0, rawName.length - ".scala".length)
-			else
-				rawName
-		"\"" + name + "\""
+		val rawName = relativized(roots, source).trim
+		if(rawName.endsWith(".scala"))
+			rawName.substring(0, rawName.length - ".scala".length)
+		else
+			rawName
+	}
+	private def relativized(roots: List[File], path: File): String =
+	{
+		val relativized = roots.flatMap(root => Path.relativize(root, path))
+		val shortest = (Int.MaxValue /: relativized)(_ min _.length)
+		relativized.find(_.length == shortest).getOrElse(path.getName)
 	}
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/ProjectPaths.scala b/src/main/scala/sbt/ProjectPaths.scala
index 855ba85cd..f08129761 100644
--- a/src/main/scala/sbt/ProjectPaths.scala
+++ b/src/main/scala/sbt/ProjectPaths.scala
@@ -32,7 +32,8 @@ trait ScalaPaths extends PackagePaths
 	def testAnalysisPath: Path
 	def mainDocPath: Path
 	def testDocPath: Path
-	def graphPath: Path
+	def graphSourcesPath: Path
+	def graphPackagesPath: Path
 	def mainResourcesOutputPath: Path
 	def testResourcesOutputPath: Path
 
@@ -146,6 +147,8 @@ trait MavenStyleScalaPaths extends BasicScalaPaths with BasicPackagePaths
 	
 	def docPath = outputPath / docDirectoryName
 	def graphPath = outputPath / graphDirectoryName
+	def graphPackagesPath = graphPath / "packages"
+	def graphSourcesPath = graphPath / "sources"
 		
 	/** These are the directories that are created when a user makes a new project from sbt.*/
 	protected def directoriesToCreate: List[Path] =
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index c894637c1..426bd439c 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -168,7 +168,10 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	}
 	private def toTask(testTask: NamedTestTask) = task(testTask.run()) named(testTask.name)
 
-	def graphTask(outputDirectory: Path, analysis: CompileAnalysis): Task = task { DotGraph(analysis, outputDirectory, log) }
+	def graphSourcesTask(outputDirectory: Path, roots: PathFinder, analysis: CompileAnalysis): Task =
+		task { DotGraph.sources(analysis, outputDirectory, roots.get, log) }
+	def graphPackagesTask(outputDirectory: Path, roots: PathFinder, analysis: CompileAnalysis): Task =
+		task { DotGraph.packages(analysis, outputDirectory, roots.get, log) }
 	def scaladocTask(label: String, sources: PathFinder, outputDirectory: Path, classpath: PathFinder, options: ScaladocOption*): Task =
 		scaladocTask(label, sources, outputDirectory, classpath, options)
 	def scaladocTask(label: String, sources: PathFinder, outputDirectory: Path, classpath: PathFinder, options: => Seq[ScaladocOption]): Task =

From ba0b563eac6fc53dd5ede64a23b3b691c0e5be99 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:07:16 +0000
Subject: [PATCH 094/268] Installer plugin: version bump and fix publish-local
 on parent

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@995 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 install/project/build.properties           | 4 ++--
 install/project/build/InstallProject.scala | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/install/project/build.properties b/install/project/build.properties
index a5d08b8a0..53491ed04 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -2,6 +2,6 @@
 #Sun Jul 26 22:17:46 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=extract
-sbt.version=0.5.2
-project.version=0.2
+sbt.version=0.5.3
+project.version=0.2.1
 scala.version=2.7.4
diff --git a/install/project/build/InstallProject.scala b/install/project/build/InstallProject.scala
index 0fca6c848..bdfbe97ef 100644
--- a/install/project/build/InstallProject.scala
+++ b/install/project/build/InstallProject.scala
@@ -6,7 +6,7 @@ import sbt._
 import java.io.File
 import java.nio.charset.Charset
 
-class InstallerProject(info: ProjectInfo) extends ParentProject(info)
+class InstallerProject(info: ProjectInfo) extends ParentProject(info) with NoPublish
 {
 	lazy val installExtractor: InstallExtractProject = project("extract", "Installer Extractor", new InstallExtractProject(_, installPlugin))
 	lazy val installPlugin: InstallPluginProject = project("plugin", "Installer Plugin", new InstallPluginProject(_, installExtractor), installExtractor)
@@ -24,12 +24,15 @@ protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtra
 	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
 	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
 }
-protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info)
+trait NoPublish extends BasicManagedProject
 {
 	override def publishLocalAction = publishAction
 	override def deliverAction = publishAction
 	override def deliverLocalAction = publishAction
 	override def publishAction = task {None}
+}
+protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info) with NoPublish
+{
 	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
 	private lazy val plugin = pluginProject
 	val mainClassName = "sbt.extract.Main"

From b5aaf31d040e3faee8ff76d3ccca9323092769ec Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:08:31 +0000
Subject: [PATCH 095/268] Scripted tests: version bump

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@996 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 scripted/project/build.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index accc374de..4134fa3ea 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -2,7 +2,7 @@
 #Sat Aug 01 10:32:20 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=test
-sbt.version=0.5.2
-project.version=0.5.3-p1
+sbt.version=0.5.3
+project.version=0.5.3
 scala.version=2.7.5
 project.initialize=false

From 040a4f6060570c191de01113ca6f3f6df51d5f62 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:10:49 +0000
Subject: [PATCH 096/268] Bump default version of sbt used in Boot

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@997 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/ProjectProperties.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/src/main/scala/ProjectProperties.scala b/boot/src/main/scala/ProjectProperties.scala
index 7d27141e7..b3bc81be4 100644
--- a/boot/src/main/scala/ProjectProperties.scala
+++ b/boot/src/main/scala/ProjectProperties.scala
@@ -9,7 +9,7 @@ Name:
 Organization []:
 Version [1.0]: 
 Scala version [2.7.5]: 
-sbt version [0.5.2]: 
+sbt version [0.5.3]: 
 */
 import java.io.File
 /** Constants related to reading/writing the build.properties file in a project.
@@ -48,7 +48,7 @@ private object ProjectProperties
 	/** The default version of the new user project when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultVersion = "1.0"
 	/** The default version of sbt when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultSbtVersion = "0.5.2"
+	val DefaultSbtVersion = "0.5.3"
 	/** The default version of Scala when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultScalaVersion = "2.7.5"
 

From b70521ac7abb89fa2a9af5c0ced49a368e81fdab Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:19:23 +0000
Subject: [PATCH 097/268] Version bumps and add 2.7.6 as a target

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@998 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties                | 6 +++---
 project/build/CrossCompileProject.scala | 9 ++++++---
 project/plugins/Plugins.scala           | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 70083d02e..8d0e09c16 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Mon Jul 27 15:17:30 EDT 2009
+#Fri Sep 11 12:53:52 EDT 2009
 project.organization=sbt
-project.name=Simple Build Tool Parent
+project.name=Simple Build Tool
 sbt.version=0.5.2
-project.version=0.5.3-SNAPSHOT
+project.version=0.5.3
 scala.version=2.7.2
diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
index 744b7de62..eb2e84a6a 100644
--- a/project/build/CrossCompileProject.scala
+++ b/project/build/CrossCompileProject.scala
@@ -15,6 +15,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private val version2_7_3 = "2.7.3"
 	private val version2_7_4 = "2.7.4"
 	private val version2_7_5 = "2.7.5"
+	private val version2_7_6 = "2.7.6"
 	private val version2_8_0 = "2.8.0-SNAPSHOT"//"2.8.0.r18462-b20090811081019"
 	private val base = "base"
 
@@ -23,12 +24,13 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private val conf_2_7_3 = config(version2_7_3)
 	private val conf_2_7_4 = config(version2_7_4)
 	private val conf_2_7_5 = config(version2_7_5)
+	private val conf_2_7_6 = config(version2_7_6)
 	private val conf_2_8_0 = config(version2_8_0)
 	private val conf_base = config(base)
 	// the list of all configurations cross-compile supports
-	private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_8_0 :: Nil
+	private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_7_6 :: conf_2_8_0 :: Nil
 	// the list of configurations to actually build against
-	private val buildConfigurations = allConfigurations//conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil
+	private val buildConfigurations = allConfigurations//conf_2_7_2 :: conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil
 	// the configuration to use for normal development (when cross-building is not done)
 	private def developmentVersion = buildConfigurations.first
 	
@@ -65,11 +67,12 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 			<dependency org="com.jcraft" name="jsch" rev="0.1.31" transitive="false" conf={depConf(conf_base)}/>
 			<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.14" transitive="true" conf={depConf(optional(conf_base))}/>
 
-			<!-- the dependencies that are different dependeding on the version of Scala -->
+			<!-- the dependencies that are different depending on the version of Scala -->
 			{ variableDependencies(conf_2_7_2, /*ScalaTest*/"0.9.3", /*Specs*/"1.4.0", false) }
 			{ variableDependencies(conf_2_7_3, /*ScalaTest*/"0.9.4", /*Specs*/"1.4.3", true) }
 			{ variableDependencies(conf_2_7_4, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
 			{ variableDependencies(conf_2_7_5, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
+			{ variableDependencies(conf_2_7_6, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
 			{ variableDependencies(conf_2_8_0, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
 		</dependencies>)
 
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 285ed4c00..0ef71c57f 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.5.2"
+	val scripted = "org.scala-tools.sbt" % "test" % "0.5.3"
 }

From 26103f19d40c6347adfe4b7fa0756d2b658d0746 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:20:08 +0000
Subject: [PATCH 098/268] 2.8 compatibility fix for graph generation

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@999 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/DotGraph.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/DotGraph.scala b/src/main/scala/sbt/DotGraph.scala
index fcc1b3f9b..85025dac5 100644
--- a/src/main/scala/sbt/DotGraph.scala
+++ b/src/main/scala/sbt/DotGraph.scala
@@ -32,10 +32,10 @@ object DotGraph
 		def generateGraph[Key, Value](fileName: String, graphName: String, graph: Iterable[(Key, scala.collection.Set[Value])],
 			keyToString: Key => String, valueToString: Value => String) =
 		{
-			import scala.collection.mutable.{HashMap, MultiMap, Set}
-			val mappedGraph = new HashMap[String, Set[String]] with MultiMap[String, String]
+			import scala.collection.mutable.{HashMap, HashSet}
+			val mappedGraph = new HashMap[String, HashSet[String]]
 			for( (key, values) <- graph; keyString = keyToString(key); value <- values)
-				mappedGraph.add(keyString, valueToString(value))
+				mappedGraph.getOrElseUpdate(keyString, new HashSet[String]) += valueToString(value)
 
 			FileUtilities.write(new File(outputDir, fileName), log) { (writer: Writer) =>
 			

From 299cef4a57abbea54e27317e947b0d9d17e8fee1 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:21:44 +0000
Subject: [PATCH 099/268] Restore overloaded Fork.java methods

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1000 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Fork.scala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Fork.scala b/src/main/scala/sbt/Fork.scala
index 8669d8f49..281258783 100644
--- a/src/main/scala/sbt/Fork.scala
+++ b/src/main/scala/sbt/Fork.scala
@@ -51,7 +51,13 @@ object Fork
 	final class ForkJava(commandName: String) extends NotNull
 	{
 		def apply(javaHome: Option[File], options: Seq[String], log: Logger): Int =
-			apply(javaHome, options, None, Map.empty, BufferedOutput(log))
+			apply(javaHome, options, BufferedOutput(log))
+		def apply(javaHome: Option[File], options: Seq[String], outputStrategy: OutputStrategy): Int =
+			apply(javaHome, options, None, outputStrategy)
+		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], log: Logger): Int =
+			apply(javaHome, options, workingDirectory, BufferedOutput(log))
+		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], outputStrategy: OutputStrategy): Int =
+			apply(javaHome, options, workingDirectory, Map.empty, outputStrategy)
 		def apply(javaHome: Option[File], options: Seq[String], workingDirectory: Option[File], env: Map[String, String], outputStrategy: OutputStrategy): Int =
 		{
 			val executable = javaCommand(javaHome, commandName).getAbsolutePath

From 2bba3487172e7c397bdaf67ae5ceec356a89240d Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:22:30 +0000
Subject: [PATCH 100/268] Compatibility fixes for specs 1.6

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1001 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/TestReportListener.scala   |  5 +++--
 .../scala/sbt/impl/TestFrameworkImpl.scala    | 20 ++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/sbt/TestReportListener.scala b/src/main/scala/sbt/TestReportListener.scala
index 2f664937c..e60be1ddc 100644
--- a/src/main/scala/sbt/TestReportListener.scala
+++ b/src/main/scala/sbt/TestReportListener.scala
@@ -168,7 +168,7 @@ final case class SpecificationReportEvent(successes: Int, failures: Int, errors:
 {
 	def result = if(errors > 0) Some(Result.Error) else if(failures > 0) Some(Result.Failed) else Some(Result.Passed)
 }
-final case class SystemReportEvent(description: String, verb: String, skippedSus:Option[Throwable], literateDescription: Option[Seq[String]], examples: Seq[ExampleReportEvent]) extends SpecsEvent { def result = None }
+final case class SystemReportEvent(description: String, verb: String, skipped: Seq[Throwable], literateDescription: Option[Seq[String]], examples: Seq[ExampleReportEvent]) extends SpecsEvent { def result = None }
 final case class ExampleReportEvent(description: String, errors: Seq[Throwable], failures: Seq[RuntimeException], skipped: Seq[RuntimeException], subExamples: Seq[ExampleReportEvent]) extends SpecsEvent { def result = None }
 
 trait EventOutput[E <: TestEvent]
@@ -240,7 +240,8 @@ class SpecsOutput(val log: Logger) extends EventOutput[SpecsEvent]
 	}
 	private def reportSystem(sus: SystemReportEvent, padding: String)
 	{
-		log.info(padding + sus.description + " " + sus.verb + sus.skippedSus.map(" (skipped: " + _.getMessage + ")").getOrElse(""))
+		val skipped = if(sus.skipped.isEmpty) "" else sus.skipped.map(_.getMessage).mkString(" (skipped: ", ", ", ")")
+		log.info(padding + sus.description + " " + sus.verb + skipped)
 		for(description <- sus.literateDescription)
 			log.info(padding + description.mkString)
 		reportExamples(sus.examples, padding)
diff --git a/src/main/scala/sbt/impl/TestFrameworkImpl.scala b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
index 2603eed3f..71599c574 100755
--- a/src/main/scala/sbt/impl/TestFrameworkImpl.scala
+++ b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
@@ -171,8 +171,17 @@ private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportLis
 				description.desc.map(_.text)  // LiterateDescription
 			}
 		}
-
-		SystemReportEvent(sus.description, sus.verb, sus.skippedSus, format, reportExamples(sus.examples))
+		// these are for 1.6 compatibility, which removed skippedSus (skipped still exists) and examples (moved to specification)
+		def skipped(sus: Sus) = classOf[Sus].getMethod("skipped").invoke(sus).asInstanceOf[Seq[Throwable]]
+		def examples(sus: Sus) =
+		{
+			try { sus.examples } // we compile against specs 1.4.x, which has examples directly on Sus  so this compiles
+			catch { case _: NoSuchMethodError =>  // It fails at runtime for specs 1.6 because examples is now on BaseSpecification
+				val spec = classOf[Sus].getMethod("specification").invoke(sus)
+				spec.getClass.getMethod("examples").invoke(spec).asInstanceOf[List[Example]]
+			}
+		}
+		SystemReportEvent(sus.description, sus.verb, skipped(sus), format, reportExamples(examples(sus)))
 	}
 	private def reportExamples(examples: Seq[Example]): Seq[ExampleReportEvent] =
 	{
@@ -181,6 +190,11 @@ private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportLis
 	}
 	private def reportExample(example: Example): ExampleReportEvent =
 	{
-		ExampleReportEvent(example.description, example.errors, example.failures, example.skipped, reportExamples(example.subExamples))
+		def examples(example: Example) =
+			try { example.subExamples } // we compile against specs 1.4.x, which has subExamples defined on Example, so this compiles
+			catch { case _ : NoSuchMethodError =>  // It fails at runtime for specs 1.6 because examples is the new method
+				classOf[Example].getMethod("examples").invoke(example).asInstanceOf[Seq[Example]]
+			}
+		ExampleReportEvent(example.description, example.errors, example.failures, example.skipped, reportExamples(examples(example)))
 	}
 }

From c51e8a2ff832ddd46396e6c0bea1b209fb86ba9f Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:26:41 +0000
Subject: [PATCH 101/268] Checks to ensure that Ivy attributes begin with 'e:'

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1002 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManagedInterface.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 1880df9be..83a4376ea 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -64,7 +64,7 @@ final case class ModuleID(organization: String, name: String, revision: String,
 	def from(url: String) = artifacts(Artifact(name, new URL(url)))
 	def classifier(c: String) = artifacts(Artifact(name, c))
 	def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts, extraAttributes)
-	def extra(attributes: (String,String)*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, extraAttributes ++ attributes)
+	def extra(attributes: (String,String)*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, extraAttributes ++ ModuleID.checkE(attributes))
 }
 object ModuleID
 {
@@ -75,6 +75,10 @@ object ModuleID
 		ModuleID(organization, name, revision, configurations, isChanging, isTransitive, Nil)
 	def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact]): ModuleID =
 		ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, Map.empty)
+
+	def checkE(attributes: Seq[(String, String)]) =
+		for ( (key, value) <- attributes) yield
+			if(key.startsWith("e:")) (key, value) else ("e:" + key, value)
 }
 sealed trait Resolver extends NotNull
 {

From edead65a2b3c6c6669f24c7b94efb804d71ce085 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 11 Sep 2009 19:32:59 +0000
Subject: [PATCH 102/268] bump to 0.5.4-SNAPSHOT

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1006 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 8d0e09c16..281874701 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -3,5 +3,5 @@
 project.organization=sbt
 project.name=Simple Build Tool
 sbt.version=0.5.2
-project.version=0.5.3
+project.version=0.5.4-SNAPSHOT
 scala.version=2.7.2

From 7cfcf44bf35b530d592db943ce0e3d7547843c4d Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 12 Sep 2009 14:30:49 +0000
Subject: [PATCH 103/268] Fix triggered execution

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1009 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Main.scala                    | 2 +-
 src/main/scala/sbt/Project.scala                 | 2 +-
 src/main/scala/sbt/SourceModificationWatch.scala | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 536e2db64..8a74e37bf 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -585,7 +585,7 @@ object Main
 	private def compileContinuously(project: Project) = executeContinuously(project, "test-compile")
 	private def executeContinuously(project: Project, action: String)
 	{
-		def shouldTerminate: Boolean = (System.in.available > 0) && project.terminateWatch(System.in.read()) || shouldTerminate
+		def shouldTerminate: Boolean = (System.in.available > 0) && (project.terminateWatch(System.in.read()) || shouldTerminate)
 		if(checkAction(project, action))
 		{
 			SourceModificationWatch.watchUntil(project, ContinuousCompilePollDelaySeconds)(shouldTerminate)
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index d6f62f46a..36e91752b 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -240,7 +240,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	/** A `PathFinder` that determines the files watched when an action is run with a preceeding ~ when this is the current
 	* project.  This project does not need to include the watched paths for projects that this project depends on.*/
 	def watchPaths: PathFinder = Path.emptyPathFinder
-	def terminateWatch(key: Int): Boolean = key == 10
+	def terminateWatch(key: Int): Boolean = key == 10 || key == 13
 	
 	protected final override def parentEnvironment = info.parent
 	
diff --git a/src/main/scala/sbt/SourceModificationWatch.scala b/src/main/scala/sbt/SourceModificationWatch.scala
index 9e737f70c..cc050efb2 100644
--- a/src/main/scala/sbt/SourceModificationWatch.scala
+++ b/src/main/scala/sbt/SourceModificationWatch.scala
@@ -7,8 +7,7 @@ object SourceModificationWatch
 {
 	def watchUntil(project: Project, pollDelaySec: Int)(terminationCondition: => Boolean)(onSourcesModified: => Unit)
 	{
-		def sourceFiles: Iterable[java.io.File] =
-			sourcesFinder.get.map(Path.relativize(project.info.projectPath, _)).filter(_.isDefined).map(_.get.asFile)
+		def sourceFiles: Iterable[java.io.File] = sourcesFinder.get.map(_.asFile)
 		def sourcesFinder: PathFinder = (Path.emptyPathFinder /: project.topologicalSort)(_ +++ _.watchPaths)
 		def loop(lastCallbackCallTime: Long, previousFileCount: Int)
 		{

From eb7b58597122e1342e2081a549f2bea060775005 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 12 Sep 2009 16:55:04 +0000
Subject: [PATCH 104/268] Automating release process.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1010 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties           |  6 +--
 project/build/LoaderProject.scala  |  3 +-
 project/build/ReleaseProject.scala | 78 ++++++++++++++++++++++++++++++
 project/build/SbtProject.scala     |  3 +-
 src/main/scala/sbt/Version.scala   |  1 +
 5 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 project/build/ReleaseProject.scala

diff --git a/project/build.properties b/project/build.properties
index 281874701..47dde4d08 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Fri Sep 11 12:53:52 EDT 2009
+#Sat Sep 12 11:18:05 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool
-sbt.version=0.5.2
-project.version=0.5.4-SNAPSHOT
+sbt.version=0.5.3
+project.version=0.5.4
 scala.version=2.7.2
diff --git a/project/build/LoaderProject.scala b/project/build/LoaderProject.scala
index 927d60fe5..fe9b947eb 100644
--- a/project/build/LoaderProject.scala
+++ b/project/build/LoaderProject.scala
@@ -14,7 +14,8 @@ protected/* removes the ambiguity as to which project is the entry point by maki
 	val proguardConfigurationPath: Path = outputPath / "proguard.pro"
 	lazy val outputJar: Path = rootProject.outputPath / (baseName + "-" + version + ".jar")
 	def rootProjectDirectory = rootProject.info.projectPath
-	
+
+	override lazy val release = task { None }
 	override def mainClass = Some(mainClassName)
 	override def defaultJarBaseName = baseName + "-" + version.toString
 	
diff --git a/project/build/ReleaseProject.scala b/project/build/ReleaseProject.scala
new file mode 100644
index 000000000..aa6fde743
--- /dev/null
+++ b/project/build/ReleaseProject.scala
@@ -0,0 +1,78 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
+import sbt._
+
+import java.io.File
+
+trait ReleaseProject extends ExecProject
+{ self: SbtProject =>
+	def info: ProjectInfo
+	lazy val releaseChecks = javaVersionCheck && projectVersionCheck
+	lazy val javaVersionCheck =
+		task
+		{
+			val javaVersion = System.getProperty("java.version")
+			if(!javaVersion.startsWith("1.5."))
+				Some("Java version must be 1.5.x (was " + javaVersion + ")")
+			else
+				None
+		}
+	lazy val projectVersionCheck =
+		task
+		{
+			def value(a: Option[Int]) = a.getOrElse(0)
+			def lessThan(a: Option[Int], b: Option[Int]) = value(a) < value(b)
+			version match
+			{
+				case BasicVersion(major, minor, micro, None) =>
+					Version.fromString(sbtVersion.value) match
+					{
+						case Right(BasicVersion(builderMajor, builderMinor, builderMicro, None))
+							if (builderMajor < major || ( builderMajor == major &&
+								lessThan(builderMinor, minor) || (builderMinor == minor &&
+								lessThan(builderMicro, micro ) ))) =>
+								None
+						case _ => Some("Invalid builder sbt version.  Must be a release version older than the project version.  (was: " + sbtVersion.value + ")")
+					}
+				case _ => Some("Invalid project version.  Should be of the form #.#.# (was: " + version + ")")
+			}
+		}
+
+	def svnURL = "https://simple-build-tool.googlecode.com/svn/"
+	def latestURL = svnURL + "artifacts/latest"
+	
+	def svnArtifactPath = Path.fromFile(info.projectPath.asFile.getParentFile) / "artifacts" / version.toString
+	def ivyLocalPath = Path.userHome / ".ivy2" / "local" / "sbt" / "simple-build-tool" / version.toString
+	def manualTasks =
+		("Upload launcher jar: " + boot.outputJar.absolutePath) ::
+		"Update and upload documentation" ::
+		"Update, build, check and commit Hello Lift example" ::
+		Nil
+	
+	lazy val copyDocs = main.copyTask ( (main.mainDocPath ##) ** "*", svnArtifactPath / "api") dependsOn(main.doc, releaseChecks)
+	lazy val copyIvysJars = main.copyTask( (ivyLocalPath ##) ** "*", svnArtifactPath) dependsOn(main.crossPublishLocal, releaseChecks)
+
+	lazy val release = manualTaskMessage dependsOn(releaseArtifacts, releaseChecks)
+	lazy val releaseArtifacts = nextVersion dependsOn(tag, latestLink, boot.proguard, releaseChecks)
+	lazy val manualTaskMessage = task { println("The following tasks must be done manually:\n\t" + manualTasks.mkString("\n\t")); None }
+	
+	import Process._
+	lazy val addArtifacts = execTask {<o> svn add {svnArtifactPath} </o>} dependsOn ( copyIvysJars, copyDocs, releaseChecks )
+	lazy val commitArtifacts = execTask {<o> svn commit -m "Jars, Ivys, and API Docs for {version.toString}" {svnArtifactPath} </o>} dependsOn(addArtifacts, releaseChecks)
+	lazy val tag = execTask {<o> svn copy -m "Tagging {version.toString}" {svnURL}/trunk/ {svnURL}/tags/{version.toString} </o>}
+	lazy val latestLink = (deleteLatestLink && makeLatestLink) dependsOn(commitArtifacts, releaseChecks)
+	lazy val makeLatestLink = execTask {<o> svn copy -m "Creating new latest link" {svnURL}/artifacts/{version.toString}/ {latestURL} </o>}
+	lazy val deleteLatestLink = execTask {<o> svn del -m "Deleting old latest link" {latestURL} </o>}
+
+	lazy val nextVersion = task { incrementVersionNumber(); None } dependsOn(releaseChecks)
+	def incrementVersionNumber(): Unit = 
+		for( v <- projectVersion)
+		{
+			val incremented = v.asInstanceOf[BasicVersion].incrementMicro // BasicVersion checked by releaseChecks
+			import incremented._
+			val newVersion = BasicVersion(major, minor, micro, Some("-SNAPSHOT"))
+			log.info("Changing version to " + newVersion)
+			projectVersion() = newVersion
+		}
+}
\ No newline at end of file
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 6a77f589a..eb9c7a80f 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -5,7 +5,7 @@ import sbt._
 
 import java.io.File
 
-class SbtProject(info: ProjectInfo) extends ParentProject(info)
+class SbtProject(info: ProjectInfo) extends ParentProject(info) with ReleaseProject
 {
 	// Launcher sub project.
 	lazy val boot = project("boot", "Simple Build Tool Loader", new LoaderProject(_))
@@ -33,4 +33,5 @@ protected class MainProject(val info: ProjectInfo) extends CrossCompileProject w
 	override def mainClass = Some("sbt.Main")
 	override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: "sbt.ProcessSpecification" :: Nil) :: super.testOptions.toList
 	override def scriptedDependencies = testCompile :: `package` :: Nil
+	override lazy val release = task { None }
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/Version.scala b/src/main/scala/sbt/Version.scala
index b14e8ae52..3ff4eb373 100644
--- a/src/main/scala/sbt/Version.scala
+++ b/src/main/scala/sbt/Version.scala
@@ -16,6 +16,7 @@ case class BasicVersion(major: Int, minor: Option[Int], micro: Option[Int], extr
 	def incrementMicro = BasicVersion(major, minor orElse Some(0), increment(micro), extra)
 	def incrementMinor = BasicVersion(major, increment(minor), micro, extra)
 	def incrementMajor = BasicVersion(major+1, minor, micro, extra)
+	def withExtra(newExtra: Option[String]) = BasicVersion(major, minor, micro, newExtra)
 	
 	override def toString = major +
 		minor.map(minorI => "." + minorI + micro.map(microI => "." + microI).getOrElse("")).getOrElse("") +

From 2a1c45575404498f466455b89af559f5fcf5fce4 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 12 Sep 2009 17:05:21 +0000
Subject: [PATCH 105/268] bump version for launcher

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1011 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/ProjectProperties.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/src/main/scala/ProjectProperties.scala b/boot/src/main/scala/ProjectProperties.scala
index b3bc81be4..ec1678798 100644
--- a/boot/src/main/scala/ProjectProperties.scala
+++ b/boot/src/main/scala/ProjectProperties.scala
@@ -9,7 +9,7 @@ Name:
 Organization []:
 Version [1.0]: 
 Scala version [2.7.5]: 
-sbt version [0.5.3]: 
+sbt version [0.5.4]: 
 */
 import java.io.File
 /** Constants related to reading/writing the build.properties file in a project.
@@ -48,7 +48,7 @@ private object ProjectProperties
 	/** The default version of the new user project when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultVersion = "1.0"
 	/** The default version of sbt when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultSbtVersion = "0.5.3"
+	val DefaultSbtVersion = "0.5.4"
 	/** The default version of Scala when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultScalaVersion = "2.7.5"
 

From 79ad641e36e6619753d8c26078f18ee9fca79917 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 12 Sep 2009 17:45:41 +0000
Subject: [PATCH 106/268] More release automation...

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1012 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build/ReleaseProject.scala | 43 +++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/project/build/ReleaseProject.scala b/project/build/ReleaseProject.scala
index aa6fde743..564702d2c 100644
--- a/project/build/ReleaseProject.scala
+++ b/project/build/ReleaseProject.scala
@@ -8,7 +8,13 @@ import java.io.File
 trait ReleaseProject extends ExecProject
 { self: SbtProject =>
 	def info: ProjectInfo
-	lazy val releaseChecks = javaVersionCheck && projectVersionCheck
+	lazy val releaseChecks = javaVersionCheck && projectVersionCheck && fullyCheckedOut
+	lazy val fullyCheckedOut =
+		task
+		{
+			if(svnArtifactsPath.exists) None
+			else Some("You need a fully checked out sbt repository with commit rights to do a release.")
+		}
 	lazy val javaVersionCheck =
 		task
 		{
@@ -41,38 +47,51 @@ trait ReleaseProject extends ExecProject
 
 	def svnURL = "https://simple-build-tool.googlecode.com/svn/"
 	def latestURL = svnURL + "artifacts/latest"
-	
-	def svnArtifactPath = Path.fromFile(info.projectPath.asFile.getParentFile) / "artifacts" / version.toString
+
+	def svnArtifactsPath = Path.fromFile(info.projectPath.asFile.getParentFile) / "artifacts"
+	def svnArtifactPath = svnArtifactsPath / version.toString
 	def ivyLocalPath = Path.userHome / ".ivy2" / "local" / "sbt" / "simple-build-tool" / version.toString
 	def manualTasks =
 		("Upload launcher jar: " + boot.outputJar.absolutePath) ::
 		"Update and upload documentation" ::
 		"Update, build, check and commit Hello Lift example" ::
 		Nil
-	
+
 	lazy val copyDocs = main.copyTask ( (main.mainDocPath ##) ** "*", svnArtifactPath / "api") dependsOn(main.doc, releaseChecks)
 	lazy val copyIvysJars = main.copyTask( (ivyLocalPath ##) ** "*", svnArtifactPath) dependsOn(main.crossPublishLocal, releaseChecks)
 
-	lazy val release = manualTaskMessage dependsOn(releaseArtifacts, releaseChecks)
+	lazy val release = manualTaskMessage dependsOn(commitDocs, releaseArtifacts, releaseChecks)
 	lazy val releaseArtifacts = nextVersion dependsOn(tag, latestLink, boot.proguard, releaseChecks)
 	lazy val manualTaskMessage = task { println("The following tasks must be done manually:\n\t" + manualTasks.mkString("\n\t")); None }
-	
-	import Process._
+
+	import sbt.ProcessXML._
 	lazy val addArtifacts = execTask {<o> svn add {svnArtifactPath} </o>} dependsOn ( copyIvysJars, copyDocs, releaseChecks )
 	lazy val commitArtifacts = execTask {<o> svn commit -m "Jars, Ivys, and API Docs for {version.toString}" {svnArtifactPath} </o>} dependsOn(addArtifacts, releaseChecks)
-	lazy val tag = execTask {<o> svn copy -m "Tagging {version.toString}" {svnURL}/trunk/ {svnURL}/tags/{version.toString} </o>}
+	lazy val tag = execTask {<o> svn copy -m "Tagging {version.toString}" {svnURL}/trunk/ {svnURL}/tags/{version.toString} </o>} dependsOn(releaseChecks)
 	lazy val latestLink = (deleteLatestLink && makeLatestLink) dependsOn(commitArtifacts, releaseChecks)
-	lazy val makeLatestLink = execTask {<o> svn copy -m "Creating new latest link" {svnURL}/artifacts/{version.toString}/ {latestURL} </o>}
-	lazy val deleteLatestLink = execTask {<o> svn del -m "Deleting old latest link" {latestURL} </o>}
+	lazy val makeLatestLink = execTask {<o> svn copy -m "Creating new latest link" {svnURL}/artifacts/{version.toString}/ {latestURL} </o>} dependsOn(releaseChecks)
+	lazy val deleteLatestLink = execTask {<o> svn del -m "Deleting old latest link" {latestURL} </o>} dependsOn(releaseChecks)
+	lazy val commitProperties = execTask {<o> svn commit -m "Bumping versions" project/build.properties  </o>} dependsOn(releaseChecks)
+	lazy val commitDocs = execTask {<o> svn commit -m "Updated documentation for {version.toString}" ../wiki/ </o>} dependsOn(releaseChecks)
 
-	lazy val nextVersion = task { incrementVersionNumber(); None } dependsOn(releaseChecks)
-	def incrementVersionNumber(): Unit = 
+	lazy val nextVersion =  (incrementVersions && commitProperties) dependsOn(releaseChecks)
+	lazy val incrementVersions = task { incrementVersionNumbers(); None }
+	def incrementVersionNumbers(): Unit = 
 		for( v <- projectVersion)
 		{
+			sbtVersion() = v.toString
 			val incremented = v.asInstanceOf[BasicVersion].incrementMicro // BasicVersion checked by releaseChecks
 			import incremented._
 			val newVersion = BasicVersion(major, minor, micro, Some("-SNAPSHOT"))
 			log.info("Changing version to " + newVersion)
 			projectVersion() = newVersion
+			saveEnvironment
 		}
+}
+
+package sbt {
+	object ProcessXML { 
+		implicit def elemToPB(command: scala.xml.Elem): ProcessBuilder =
+			impl.CommandParser.parse(command.text.trim).fold(error, Function.tupled(Process.apply))
+	}
 }
\ No newline at end of file

From 212a6864870272e92c43815241f9f4b1672e0a69 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 12 Sep 2009 20:23:30 +0000
Subject: [PATCH 107/268] Bumping versions

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1019 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 47dde4d08..f777cc7c7 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Sat Sep 12 11:18:05 EDT 2009
+#Sat Sep 12 16:23:28 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool
-sbt.version=0.5.3
-project.version=0.5.4
+sbt.version=0.5.4
+project.version=0.5.5--SNAPSHOT
 scala.version=2.7.2

From e56006ed548440f733cf45e5046746bcbad21bc1 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 12 Sep 2009 21:07:20 +0000
Subject: [PATCH 108/268] cleanup for 0.5.4

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1021 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 install/project/build.properties   | 2 +-
 project/build/ReleaseProject.scala | 1 -
 scripted/project/build.properties  | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/install/project/build.properties b/install/project/build.properties
index 53491ed04..08c52f681 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -2,6 +2,6 @@
 #Sun Jul 26 22:17:46 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=extract
-sbt.version=0.5.3
+sbt.version=0.5.4
 project.version=0.2.1
 scala.version=2.7.4
diff --git a/project/build/ReleaseProject.scala b/project/build/ReleaseProject.scala
index 564702d2c..2456d51af 100644
--- a/project/build/ReleaseProject.scala
+++ b/project/build/ReleaseProject.scala
@@ -53,7 +53,6 @@ trait ReleaseProject extends ExecProject
 	def ivyLocalPath = Path.userHome / ".ivy2" / "local" / "sbt" / "simple-build-tool" / version.toString
 	def manualTasks =
 		("Upload launcher jar: " + boot.outputJar.absolutePath) ::
-		"Update and upload documentation" ::
 		"Update, build, check and commit Hello Lift example" ::
 		Nil
 
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 4134fa3ea..f661a4686 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -2,7 +2,7 @@
 #Sat Aug 01 10:32:20 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=test
-sbt.version=0.5.3
-project.version=0.5.3
+sbt.version=0.5.4
+project.version=0.5.4
 scala.version=2.7.5
 project.initialize=false

From 5be1870f4ff82fe7d7143c66e0c272a2456d11ff Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 18 Sep 2009 18:23:35 +0000
Subject: [PATCH 109/268] Fix version incrementing and add times to
 cross-compile

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1026 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties                |  6 +++---
 project/build/CrossCompileProject.scala | 23 +++++++++++++----------
 project/build/ReleaseProject.scala      |  6 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index f777cc7c7..2010424ea 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Sat Sep 12 16:23:28 EDT 2009
+#Fri Sep 18 14:22:56 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool
-sbt.version=0.5.4
-project.version=0.5.5--SNAPSHOT
+sbt.version=0.5.5-SNAPSHOT
+project.version=0.5.5-SNAPSHOT
 scala.version=2.7.2
diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
index eb2e84a6a..6b8f4a40b 100644
--- a/project/build/CrossCompileProject.scala
+++ b/project/build/CrossCompileProject.scala
@@ -33,15 +33,15 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private val buildConfigurations = allConfigurations//conf_2_7_2 :: conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil
 	// the configuration to use for normal development (when cross-building is not done)
 	private def developmentVersion = buildConfigurations.first
-	
+
 	/* Methods to derive the configuration name from the base name 'v'.*/
 	private def optional(v: Configuration) = config("optional-" + v.toString)
 	private def scalac(v: Configuration) = config("scalac-" + v.toString)
 	private def sbt(v: Configuration) = config("sbt_" + v.toString)
 	private def depConf(v: Configuration) = v.toString + "->default"
-	
+
 	// =========== Cross-compilation across scala versions ===========
-	
+
 	// The dependencies that should go in each configuration are:
 	//   base                             Required dependencies that are the same across all scala versions.
 	//   <version>                  Required dependencies to use with Scala <version>
@@ -123,14 +123,14 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	}
 	private def scalaDependency(name: String, scalaVersion: Configuration) =
 		<dependency org="org.scala-lang" name={name} rev={scalaVersion.toString} conf={depConf(scalac(scalaVersion))}/>
-	
+
 	/** Creates a comment containing the version of Scala*/
 	private def scalaComment(scalaVersion: Configuration) = scala.xml.Comment("Scala " + scalaVersion)
 	/** Creates a dependency element for a test.  See 'testOrg' for a description of uniformTestOrg.*/
 
 	private def testDependency(name: String, version: String, uniformTestOrg: Boolean, baseConf: Configuration) =
 		<dependency org={testOrg(name, uniformTestOrg)} name={name} rev={version} transitive="false" conf={depConf(optional(baseConf))}/>
-		
+
 	/** Returns the organization for the given test library.  If uniform is true,
 	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name.*/
 	private def testOrg(name: String, uniform: Boolean) =
@@ -140,7 +140,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	/** Disable filtering Scala jars from dependency management, because we need them and are putting them
 	* in custom configurations and are using them in a separate process than sbt runs in.*/
 	override def filterScalaJars = false
-	
+
 	/** The lib directory is now only for building using the 'build' script.*/
 	override def unmanagedClasspath = path("ignore_lib_directory")
 	/** When cross-compiling, replace mainCompilePath with the classes directory for the version being compiled.*/
@@ -149,10 +149,10 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 			super.fullUnmanagedClasspath(config)
 		else
 			classesPath(config) +++ mainResourcesPath
-	
+
 	// include the optional-<version> dependencies as well as the ones common across all scala versions
 	def optionalClasspath(version: Configuration) = fullClasspath(optional(version)) +++ super.optionalClasspath
-	
+
 	private val CompilerMainClass = "scala.tools.nsc.Main"
 	// use a publish configuration that publishes the 'base' + all <version> configurations (base is required because
 	//   the <version> configurations extend it)
@@ -194,17 +194,20 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 			for(err <- setupResult) log.error(err)
 			// the classpath containing the scalac compiler
 			val compilerClasspath = concatPaths(fullClasspath(scalac(version)))
-			
+
 			// The libraries to compile sbt against
 			val classpath = fullClasspath(version) +++ optionalClasspath(version)
 			val sources: List[String] = pathListStrings(filteredSources)
 			val compilerOptions = List("-cp", concatPaths(classpath), "-d", classes.toString)
 			val compilerArguments: List[String] = compilerOptions ::: sources
-			
+
 			// the compiler classpath has to be appended to the boot classpath to work properly
 			val allArguments = "-Xmx512M" :: ("-Xbootclasspath/a:" + compilerClasspath) :: CompilerMainClass :: compilerArguments
 			log.debug("Running external compiler with command: java " + allArguments.mkString(" "))
+			val start = System.currentTimeMillis
 			val exitValue = Process("java", allArguments) ! log
+			val stop = System.currentTimeMillis
+			log.info("Compiled sbt with Scala " + version.name + " in " + ((stop-start)/1000.0) + " s")
 			if(exitValue == 0)
 				None
 			else
diff --git a/project/build/ReleaseProject.scala b/project/build/ReleaseProject.scala
index 2456d51af..c728ad69e 100644
--- a/project/build/ReleaseProject.scala
+++ b/project/build/ReleaseProject.scala
@@ -75,13 +75,13 @@ trait ReleaseProject extends ExecProject
 
 	lazy val nextVersion =  (incrementVersions && commitProperties) dependsOn(releaseChecks)
 	lazy val incrementVersions = task { incrementVersionNumbers(); None }
-	def incrementVersionNumbers(): Unit = 
+	def incrementVersionNumbers(): Unit =
 		for( v <- projectVersion)
 		{
 			sbtVersion() = v.toString
 			val incremented = v.asInstanceOf[BasicVersion].incrementMicro // BasicVersion checked by releaseChecks
 			import incremented._
-			val newVersion = BasicVersion(major, minor, micro, Some("-SNAPSHOT"))
+			val newVersion = BasicVersion(major, minor, micro, Some("SNAPSHOT"))
 			log.info("Changing version to " + newVersion)
 			projectVersion() = newVersion
 			saveEnvironment
@@ -89,7 +89,7 @@ trait ReleaseProject extends ExecProject
 }
 
 package sbt {
-	object ProcessXML { 
+	object ProcessXML {
 		implicit def elemToPB(command: scala.xml.Elem): ProcessBuilder =
 			impl.CommandParser.parse(command.text.trim).fold(error, Function.tupled(Process.apply))
 	}

From 76807cab07fa62028ac42aa00c3f606ba0c14c27 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 18 Sep 2009 18:27:05 +0000
Subject: [PATCH 110/268] wrong sbt.version

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1027 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 2010424ea..42d6f3a7f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -2,6 +2,6 @@
 #Fri Sep 18 14:22:56 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool
-sbt.version=0.5.5-SNAPSHOT
+sbt.version=0.5.4
 project.version=0.5.5-SNAPSHOT
 scala.version=2.7.2

From f5a18259c1a2f6816770267082e1313a14924eae Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 23 Sep 2009 23:33:01 +0000
Subject: [PATCH 111/268] Allow specific 2.8 snapshot version to be used for
 launcher

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1035 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/Update.scala | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/boot/src/main/scala/Update.scala b/boot/src/main/scala/Update.scala
index b63d782ef..e3fef08c5 100644
--- a/boot/src/main/scala/Update.scala
+++ b/boot/src/main/scala/Update.scala
@@ -47,7 +47,7 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 		bootDirectory.mkdirs
 		new PrintWriter(new FileWriter(logFile))
 	}
-	
+
 	/** The main entry point of this class for use by the Update module.  It runs Ivy */
 	private def update()
 	{
@@ -179,7 +179,7 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 				newDefault.add(sbtResolver(scalaVersion))
 			case UpdateScala =>
 				newDefault.add(mavenResolver("Scala-Tools Maven2 Repository", "http://scala-tools.org/repo-releases"))
-				newDefault.add(mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots"))
+				newDefault.add(scalaSnapshots(scalaVersion))
 		}
 		onDefaultRepositoryCacheManager(settings)(_.setUseOrigin(true))
 		settings.addResolver(newDefault)
@@ -211,6 +211,23 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 		resolver.setRoot(root)
 		resolver
 	}
+	private def scalaSnapshots(scalaVersion: String) =
+	{
+		val parts = """(\d+)\.(\d+)\.(\d+)-(.+)""".r.pattern.matcher(scalaVersion)
+		if(parts.matches && parts.group(4) != "SNAPSHOT")
+			snapshots( Seq(parts.group(1), parts.group(2), parts.group(3)).mkString(".") )
+		else
+			mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots")
+	}
+	private def snapshots(baseVersion: String) =
+	{
+		val resolver = new URLResolver
+		resolver.setName("Scala-Tools Maven2 Snapshots Repository")
+		val base = "http://scala-tools.org/repo-snapshots/"
+		resolver.setM2compatible(true)
+		resolver.addArtifactPattern(base + "[organisation]/[module]/" + baseVersion + "-SNAPSHOT/[artifact]-[revision](-[classifier]).[ext]")
+		resolver
+	}
 	/** Creates a resolver for Maven Central.*/
 	private def mavenMainResolver = defaultMavenResolver("Maven Central")
 	/** Creates a maven-style resolver with the default root.*/

From 391734b167e96047c40785f99b1a41e23c54b358 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Thu, 24 Sep 2009 17:38:42 +0000
Subject: [PATCH 112/268] Restrict length of process chain in
 ProcessSpecification so that too many open files error don't occur

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1038 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/test/scala/sbt/ProcessSpecification.scala | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/scala/sbt/ProcessSpecification.scala b/src/test/scala/sbt/ProcessSpecification.scala
index 15d979232..ed722128b 100644
--- a/src/test/scala/sbt/ProcessSpecification.scala
+++ b/src/test/scala/sbt/ProcessSpecification.scala
@@ -1,7 +1,7 @@
 package sbt
 
 import java.io.File
-import org.scalacheck.{Prop, Properties}
+import org.scalacheck.{Arbitrary, Gen, Prop, Properties}
 import Prop._
 
 import Process._
@@ -9,7 +9,9 @@ import Process._
 object ProcessSpecification extends Properties("Process I/O")
 {
 	private val log = new ConsoleLogger
-	
+
+	implicit val exitCodeArb: Arbitrary[Array[Byte]] = Arbitrary(Gen.choose(0, 10) flatMap { size => Gen.resize(size, Arbitrary.arbArray[Byte].arbitrary) })
+
 	specify("Correct exit code", (exitCode: Byte) => checkExit(exitCode))
 	specify("#&& correct", (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #&& _)(_ && _))
 	specify("#|| correct", (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #|| _)(_ || _))
@@ -29,7 +31,7 @@ object ProcessSpecification extends Properties("Process I/O")
 		}
 	}
 	private def toBoolean(exitCode: Int) = exitCode == 0
-	private def checkExit(code: Byte) = 
+	private def checkExit(code: Byte) =
 	{
 		val exitCode = unsigned(code)
 		(process("sbt.exit " + exitCode) !) == exitCode
@@ -82,7 +84,7 @@ object ProcessSpecification extends Properties("Process I/O")
 	private def process(command: String) =
 	{
 		val ignore = echo // just for the compile dependency so that this test is rerun when TestedProcess.scala changes, not used otherwise
-		
+
 		val thisClasspath = List(getSource[ScalaObject], getSource[sbt.Logger], getSource[sbt.SourceTag]).mkString(File.pathSeparator)
 		"java -cp " + thisClasspath + " " + command
 	}

From f16788803067d7d2e619c3f329217780b69a04d1 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 25 Sep 2009 02:07:27 +0000
Subject: [PATCH 113/268] Fix classifier support and corresponding test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1039 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala                     | 2 +-
 .../dependency-management/classifier/project/build/Test.scala   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 937818f45..8eb95dc79 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -552,7 +552,7 @@ object ManageDependencies
 	private def extra(artifact: Artifact) =
 	{
 		val ea = artifact.classifier match { case Some(c) => artifact.extra("e:classifier" -> c); case None => artifact }
-		javaMap(artifact.extraAttributes)
+		javaMap(ea.extraAttributes)
 	}
 	private def javaMap(map: Map[String,String]) = if(map.isEmpty) null else wrap.Wrappers.javaMap(map.toSeq : _*)
 	private def toURL(file: File) = file.toURI.toURL
diff --git a/src/sbt-test/dependency-management/classifier/project/build/Test.scala b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
index 5d7f24f5e..b658907e1 100644
--- a/src/sbt-test/dependency-management/classifier/project/build/Test.scala
+++ b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
@@ -2,5 +2,7 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
 	val testng = "org.testng" % "testng" % "5.7" classifier "jdk15"
 }
\ No newline at end of file

From c8f86f48fcfedad6ca6c45718c0b95f02efd11f4 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 25 Sep 2009 02:13:51 +0000
Subject: [PATCH 114/268] Support for uniquely referencing a nightly Scala
 version in launcher

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1040 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/Update.scala | 35 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/boot/src/main/scala/Update.scala b/boot/src/main/scala/Update.scala
index e3fef08c5..6dab2d711 100644
--- a/boot/src/main/scala/Update.scala
+++ b/boot/src/main/scala/Update.scala
@@ -211,23 +211,6 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 		resolver.setRoot(root)
 		resolver
 	}
-	private def scalaSnapshots(scalaVersion: String) =
-	{
-		val parts = """(\d+)\.(\d+)\.(\d+)-(.+)""".r.pattern.matcher(scalaVersion)
-		if(parts.matches && parts.group(4) != "SNAPSHOT")
-			snapshots( Seq(parts.group(1), parts.group(2), parts.group(3)).mkString(".") )
-		else
-			mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots")
-	}
-	private def snapshots(baseVersion: String) =
-	{
-		val resolver = new URLResolver
-		resolver.setName("Scala-Tools Maven2 Snapshots Repository")
-		val base = "http://scala-tools.org/repo-snapshots/"
-		resolver.setM2compatible(true)
-		resolver.addArtifactPattern(base + "[organisation]/[module]/" + baseVersion + "-SNAPSHOT/[artifact]-[revision](-[classifier]).[ext]")
-		resolver
-	}
 	/** Creates a resolver for Maven Central.*/
 	private def mavenMainResolver = defaultMavenResolver("Maven Central")
 	/** Creates a maven-style resolver with the default root.*/
@@ -238,6 +221,24 @@ private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion
 		resolver.setM2compatible(true)
 		resolver
 	}
+	private val SnapshotPattern = """(\d+).(\d+).(\d+)-(\d{8})\.(\d{6})-(\d+|\+)""".r.pattern
+	private def scalaSnapshots(scalaVersion: String) =
+	{
+		val m = SnapshotPattern.matcher(scalaVersion)
+		if(m.matches)
+		{
+			val base = Seq(1,2,3).map(m.group).mkString(".")
+			val pattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/" + base + "-SNAPSHOT/[artifact]-[revision].[ext]"
+			
+			val resolver = new URLResolver
+			resolver.setName("Scala Tools Snapshots")
+			resolver.setM2compatible(true)
+			resolver.addArtifactPattern(pattern)
+			resolver
+		}
+		else
+			mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots")
+	}
 	private def localResolver(ivyUserDirectory: String) =
 	{
 		val localIvyRoot = ivyUserDirectory + "/local"

From 52708b88b79e893ec4345e5ec958dc6ce24f80f2 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 25 Sep 2009 02:20:23 +0000
Subject: [PATCH 115/268] Search for project directory depending on value of
 sbt.boot.search property (off by default)

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1041 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/Boot.scala | 46 +++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/boot/src/main/scala/Boot.scala b/boot/src/main/scala/Boot.scala
index 2a9eb9cb5..9cf5f652f 100755
--- a/boot/src/main/scala/Boot.scala
+++ b/boot/src/main/scala/Boot.scala
@@ -27,6 +27,8 @@ object Boot
 	def main(args: Array[String])
 	{
 		System.setProperty("sbt.boot", true.toString)
+		val found = Paths.projectSearch().getCanonicalPath
+		System.setProperty("user.dir", found)
 		checkProxy()
 		try { boot(args) }
 		catch
@@ -132,12 +134,50 @@ object Boot
 	private def isDefined(s: String) = s != null && !s.isEmpty
 }
 
-private class Paths extends NotNull
+object Paths
 {
-	protected final val ProjectDirectory = new File(ProjectDirectoryName)
+	val Only = "only"
+	val RootFirst = "root-first"
+	val Nearest = "nearest"
+	val NoSearch = "none"
+	val SearchPropertyName = "sbt.boot.search"
+	def projectSearch() =
+	{
+		val current = (new File(".")) getCanonicalFile
+		lazy val fromRoot = path(current, Nil).filter(hasProject).map(_.getCanonicalFile)
+		val found: Option[File] =
+			(System.getProperty(SearchPropertyName, NoSearch).trim.toLowerCase match
+			{
+				case RootFirst => fromRoot.headOption
+				case Nearest => fromRoot.reverse.headOption
+				case Only =>
+					if(hasProject(current))
+						Some(current)
+					else
+						fromRoot match
+						{
+							case Nil => Some(current)
+							case head :: Nil => Some(head)
+							case xs =>
+								System.err.println("Search method is 'only' and multiple ancestor directories contain project/build.properties:\n\t" + fromRoot.mkString("\n\t"))
+								System.exit(1)
+						        None
+						}
+				case _ => Some(current)
+			})
+		found.getOrElse(current)
+	}
+	private def hasProject(f: File) = new Paths(f) hasPropertiesFile
+	private def path(f: File, acc: List[File]): List[File] = if(f eq null) acc else path(f.getParentFile, f :: acc)
+}
+private class Paths(baseDirectory: File) extends NotNull
+{
+	def this() = this(new File(".") getCanonicalFile)
+	protected final val ProjectDirectory = new File(baseDirectory, ProjectDirectoryName)
 	protected final val BootDirectory = new File(ProjectDirectory, BootDirectoryName)
 	protected final val PropertiesFile = new File(ProjectDirectory, BuildPropertiesName)
-	
+
+	final def hasPropertiesFile = PropertiesFile.exists
 	final def checkProject()
 	{
 		if(!ProjectDirectory.exists)

From f167c3a9b0698de64340ccf1d53a2b0a58040520 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 25 Sep 2009 02:22:48 +0000
Subject: [PATCH 116/268] Default sbt.version in loader is now automatically
 defined by build

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1044 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 boot/src/main/scala/ProjectProperties.scala |  4 ++--
 project/build/LoaderProject.scala           | 21 ++++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/boot/src/main/scala/ProjectProperties.scala b/boot/src/main/scala/ProjectProperties.scala
index ec1678798..07d4e37ea 100644
--- a/boot/src/main/scala/ProjectProperties.scala
+++ b/boot/src/main/scala/ProjectProperties.scala
@@ -48,9 +48,9 @@ private object ProjectProperties
 	/** The default version of the new user project when the user doesn't explicitly specify a version when prompted.*/
 	val DefaultVersion = "1.0"
 	/** The default version of sbt when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultSbtVersion = "0.5.4"
+	val DefaultSbtVersion = DefaultVersions.Sbt //"0.5.4"
 	/** The default version of Scala when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultScalaVersion = "2.7.5"
+	val DefaultScalaVersion = DefaultVersions.Scala//"2.7.5"
 
 	// sets up the project properties for a throwaway project (flattens src and lib to the root project directory)
 	def scratch(file: File)
diff --git a/project/build/LoaderProject.scala b/project/build/LoaderProject.scala
index fe9b947eb..14dea8380 100644
--- a/project/build/LoaderProject.scala
+++ b/project/build/LoaderProject.scala
@@ -122,9 +122,28 @@ protected/* removes the ambiguity as to which project is the entry point by maki
 	|    public protected *;
 	|}
 	""".stripMargin
+
+	def managedSrc = path("src_managed")
+	def defaultVersionPath = managedSrc / "DefaultVersions.scala"
+	override def mainSourceRoots = super.mainSourceRoots +++ managedSrc
+	override def compileAction = super.compileAction dependsOn(versionProperties)
+	override def cleanAction = cleanTask(outputPath +++ managedSrc, cleanOptions)
+	lazy val versionProperties = task { writeVersionProperties(projectVersion.value.toString, scalaVersion.value.toString)  }
+	def writeVersionProperties(sbtVersion: String, scalaVersion: String) =
+		FileUtilities.write(defaultVersionPath.asFile, defaultVersions(sbtVersion, scalaVersion), log)
+
+	def defaultVersions(sbtVersion: String, scalaVersion: String) =
+"""
+package sbt.boot
+object DefaultVersions
+{
+	val Sbt = "%s"
+	val Scala = "%s"
+}
+""".format(sbtVersion, scalaVersion)
 }
 object LoaderProject
 {
 	val ProguardDescription = "Produces the final compacted jar that contains only the minimum classes needed using proguard."
 	val WriteProguardDescription = "Creates the configuration file to use with proguard."
-}
\ No newline at end of file
+}

From 2f684fe1669a0c5ea2a994d352764afb6745fa10 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 25 Sep 2009 02:24:16 +0000
Subject: [PATCH 117/268] Build against a specific 2.8 nightly

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1045 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 ivysettings.xml                         | 19 +++++++++++++++++++
 project/build/CrossCompileProject.scala |  5 +----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 ivysettings.xml

diff --git a/ivysettings.xml b/ivysettings.xml
new file mode 100644
index 000000000..2cb9d1630
--- /dev/null
+++ b/ivysettings.xml
@@ -0,0 +1,19 @@
+<ivysettings>
+	<settings defaultResolver="sbt-chain"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
+	<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
+	<resolvers>
+		<ibiblio name="scala-tools" m2compatible="true" root="http://scala-tools.org/repo-releases/"/>
+		<url name="scala-snapshots" m2compatible="true" >
+			<artifact pattern="http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]" />
+		</url>
+		<chain name="sbt-chain" returnFirst="true" checkmodified="true">
+			<resolver ref="local"/>
+			<resolver ref="public"/>
+			<resolver ref="scala-tools"/>
+		</chain>
+	</resolvers>
+	<modules>
+		<module organisation="org.scala-lang" revision="2.8.0-.*" resolver="scala-snapshots"/>
+	</modules>
+</ivysettings> 
\ No newline at end of file
diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
index 6b8f4a40b..a0cbba756 100644
--- a/project/build/CrossCompileProject.scala
+++ b/project/build/CrossCompileProject.scala
@@ -7,16 +7,13 @@ import scala.xml.NodeSeq
 * separate JVM and no partial compilation is done.*/
 abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScalaPaths
 {
-	/** Used for 2.8.0-SNAPSHOT*/
-	val scalaToolsSnapshots = "Scala Tools Snapshots" at "http://scala-tools.org/repo-snapshots"
-
 	/* The base configuration names for the versions of Scala*/
 	private val version2_7_2 = "2.7.2"
 	private val version2_7_3 = "2.7.3"
 	private val version2_7_4 = "2.7.4"
 	private val version2_7_5 = "2.7.5"
 	private val version2_7_6 = "2.7.6"
-	private val version2_8_0 = "2.8.0-SNAPSHOT"//"2.8.0.r18462-b20090811081019"
+	private val version2_8_0 = "2.8.0-20090910.003346-+"
 	private val base = "base"
 
 	/* The configurations for the versions of Scala.*/

From 958310a105a1a7eb38fbc4b81671cebd8c9f00a3 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 25 Sep 2009 13:11:14 +0000
Subject: [PATCH 118/268] Inline Ivy module configurations

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1047 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 ivysettings.xml                             |  1 +
 src/main/scala/sbt/BasicProjectTypes.scala  | 13 ++++++++++++-
 src/main/scala/sbt/ManageDependencies.scala | 19 +++++++++++++++++--
 src/main/scala/sbt/ManagedInterface.scala   | 13 ++++++++++---
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/ivysettings.xml b/ivysettings.xml
index 2cb9d1630..780f2b928 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -1,3 +1,4 @@
+<!-- to be replace by inline ModuleConfigurations when 0.5.5 is released -->
 <ivysettings>
 	<settings defaultResolver="sbt-chain"/>
 	<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 969f84b77..5c2817380 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -232,7 +232,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	/** The dependency manager that represents inline declarations.  The default manager packages the information
 	* from 'ivyXML', 'projectID', 'repositories', and 'libraryDependencies' and does not typically need to be
 	* be overridden. */
-	def manager = new SimpleManager(ivyXML, true, projectID, repositories.toSeq, ivyConfigurations, defaultConfiguration, libraryDependencies.toList: _*)
+	def manager = new SimpleManager(ivyXML, true, projectID, repositories.toSeq, moduleConfigurations.toSeq, ivyConfigurations, defaultConfiguration, libraryDependencies.toList: _*)
 
 	/** The pattern for Ivy to use when retrieving dependencies into the local project.  Classpath management
 	* depends on the first directory being [conf] and the extension being [ext].*/
@@ -607,6 +607,17 @@ trait ReflectiveRepositories extends Project
 		}
 	}
 	def reflectiveRepositories: Map[String, Resolver] = Reflective.reflectiveMappings[Resolver](this)
+
+	def moduleConfigurations: Set[ModuleConfiguration] =
+	{
+		val reflective = Set[ModuleConfiguration](reflectiveModuleConfigurations.values.toList: _*)
+		info.parent match
+		{
+			case Some(p: ReflectiveRepositories) => p.moduleConfigurations ++ reflective
+			case None => reflective
+		}
+	}
+	def reflectiveModuleConfigurations: Map[String, ModuleConfiguration] = Reflective.reflectiveMappings[ModuleConfiguration](this)
 }
 
 trait ReflectiveManagedProject extends ReflectiveProject with ReflectiveArtifacts with ReflectiveRepositories with ReflectiveLibraryDependencies with ReflectiveConfigurations
\ No newline at end of file
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 8eb95dc79..16d6f2920 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -11,7 +11,7 @@ import scala.collection.mutable.HashSet
 import Artifact.{defaultExtension, defaultType}
 
 import org.apache.ivy.{core, plugins, util, Ivy}
-import core.LogOptions
+import core.{IvyPatternHelper, LogOptions}
 import core.cache.DefaultRepositoryCacheManager
 import core.deliver.DeliverOptions
 import core.install.InstallOptions
@@ -200,12 +200,13 @@ object ManageDependencies
 				case sm: SbtManager =>
 				{
 					import sm._
-					if(resolvers.isEmpty && autodetectUnspecified)
+					if(resolvers.isEmpty && moduleConfigurations.isEmpty && autodetectUnspecified)
 						autodetectConfiguration()
 					else
 					{
 						log.debug("Using inline repositories.")
 						configureDefaults(withDefaultResolvers(resolvers))
+						setModuleConfigurations(settings, moduleConfigurations)
 					}
 					if(autodetect)
 						autodetectDependencies(toID(module), true)
@@ -563,6 +564,20 @@ object ManageDependencies
 		moduleID.setModuleArtifact(artifact)
 		moduleID.check()
 	}
+	private def setModuleConfigurations(settings: IvySettings, moduleConfigurations: Seq[ModuleConfiguration])
+	{
+		val existing = settings.getResolverNames
+		for(moduleConf <- moduleConfigurations)
+		{
+			import moduleConf._
+			import IvyPatternHelper._
+			import PatternMatcher._
+			if(!existing.contains(resolver.name))
+				settings.addResolver(ConvertResolver(resolver))
+			val attributes = javaMap(Map(MODULE_KEY -> name, ORGANISATION_KEY -> organization, REVISION_KEY -> revision))
+			settings.addModuleConfiguration(attributes, settings.getMatcher(EXACT_OR_REGEXP), resolver.name, null, null, null)
+		}
+	}
 	/** Sets the resolvers for 'settings' to 'resolvers'.  This is done by creating a new chain and making it the default. */
 	private def setResolvers(settings: IvySettings, resolvers: Seq[Resolver], log: Logger)
 	{
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 83a4376ea..9233c0029 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -29,6 +29,7 @@ sealed trait SbtManager extends Manager
 	def autodetect: Boolean
 	def module: ModuleID
 	def resolvers: Seq[Resolver]
+	def moduleConfigurations: Seq[ModuleConfiguration]
 	def dependencies: Iterable[ModuleID]
 	def autodetectUnspecified: Boolean
 	def dependenciesXML: NodeSeq
@@ -36,8 +37,9 @@ sealed trait SbtManager extends Manager
 	def defaultConfiguration: Option[Configuration]
 }
 final class SimpleManager private[sbt] (val dependenciesXML: NodeSeq, val autodetectUnspecified: Boolean,
-	val module: ModuleID, val resolvers: Seq[Resolver], explicitConfigurations: Iterable[Configuration],
-	val defaultConfiguration: Option[Configuration], val dependencies: ModuleID*) extends SbtManager
+	val module: ModuleID, val resolvers: Seq[Resolver], val moduleConfigurations: Seq[ModuleConfiguration],
+	explicitConfigurations: Iterable[Configuration],	val defaultConfiguration: Option[Configuration],
+	val dependencies: ModuleID*) extends SbtManager
 {
 	def autodetect = dependencies.isEmpty && dependenciesXML.isEmpty && module.explicitArtifacts.isEmpty && explicitConfigurations.isEmpty && autodetectUnspecified
 	def configurations =
@@ -53,7 +55,12 @@ final class SimpleManager private[sbt] (val dependenciesXML: NodeSeq, val autode
 		else
 			explicitConfigurations
 }
-
+final case class ModuleConfiguration(organization: String, name: String, revision: String, resolver: Resolver) extends NotNull
+object ModuleConfiguration
+{
+	def apply(org: String, resolver: Resolver): ModuleConfiguration = apply(org, "*", "*", resolver)
+	def apply(org: String, name: String, resolver: Resolver): ModuleConfiguration = ModuleConfiguration(org, name, "*", resolver)
+}
 final case class ModuleID(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact], extraAttributes: Map[String,String]) extends NotNull
 {
 	override def toString = organization + ":" + name + ":" + revision

From feb7c0dc102be3c9f142c4832f821d65d61cec95 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 25 Sep 2009 13:11:54 +0000
Subject: [PATCH 119/268] Test for inline Ivy module configurations

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1048 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../module-confs/changes/WrongOrg.scala       | 14 +++++++++++
 .../module-confs/changes/WrongPattern.scala   | 14 +++++++++++
 .../module-confs/changes/WrongVersion.scala   | 14 +++++++++++
 .../module-confs/project/build.properties     |  2 ++
 .../module-confs/project/build/Test.scala     | 14 +++++++++++
 .../dependency-management/module-confs/test   | 25 +++++++++++++++++++
 6 files changed, 83 insertions(+)
 create mode 100644 src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
 create mode 100644 src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
 create mode 100644 src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
 create mode 100644 src/sbt-test/dependency-management/module-confs/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/module-confs/project/build/Test.scala
 create mode 100644 src/sbt-test/dependency-management/module-confs/test

diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
new file mode 100644
index 000000000..52240e06a
--- /dev/null
+++ b/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
@@ -0,0 +1,14 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	
+	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]"
+	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
+	val scOnly = ModuleConfiguration("org.not-scala-lang", "*", "2.8.0-.*", scalaSnapshots)
+
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219"
+	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
new file mode 100644
index 000000000..4fc451b24
--- /dev/null
+++ b/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
@@ -0,0 +1,14 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	
+	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.a-SNAPSHOT/[artifact]-[revision].[ext]"
+	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
+	val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
+
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219"
+	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
new file mode 100644
index 000000000..4ac6d5a3e
--- /dev/null
+++ b/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
@@ -0,0 +1,14 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	
+	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]"
+	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
+	val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
+
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-218"
+	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/project/build.properties b/src/sbt-test/dependency-management/module-confs/project/build.properties
new file mode 100644
index 000000000..c6df3d9ce
--- /dev/null
+++ b/src/sbt-test/dependency-management/module-confs/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test Module Configurations
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
new file mode 100644
index 000000000..a19879906
--- /dev/null
+++ b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
@@ -0,0 +1,14 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	
+	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]"
+	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
+	val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
+
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219"
+	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/test b/src/sbt-test/dependency-management/module-confs/test
new file mode 100644
index 000000000..251e67e51
--- /dev/null
+++ b/src/sbt-test/dependency-management/module-confs/test
@@ -0,0 +1,25 @@
+> update
+[success]
+> clean
+[success]
+
+$ copy-file changes/WrongOrg.scala project/build/Test.scala
+[success]
+$ reload
+[success]
+> update
+[failure]
+
+$ copy-file changes/WrongVersion.scala project/build/Test.scala
+[success]
+$ reload
+[success]
+> update
+[failure]
+
+$ copy-file changes/WrongPattern.scala project/build/Test.scala
+[success]
+$ reload
+[success]
+> update
+[failure]

From 9666c641d627a7edb33c00742a4f99920914cefb Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 26 Sep 2009 01:00:00 +0000
Subject: [PATCH 120/268] No longer need "->default" in configurations
 (automatically mapped).

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1049 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala   |  5 +-
 src/main/scala/sbt/ManagedInterface.scala     | 10 ++--
 .../configurations/changes/Published.scala    |  4 ++
 .../configurations/changes/PublishedIvy.scala |  4 ++
 .../changes/TestPublishIvyStyle.scala         |  7 +++
 .../configurations/changes/TestUse.scala      | 13 +++++
 .../configurations/changes/TestUseIvy.scala   | 15 ++++++
 .../configurations/changes/Use.scala          |  8 +++
 .../configurations/changes/build.properties   |  3 ++
 .../changes/ivy.build.properties              |  3 ++
 .../changes/ivy.use.build.properties          |  3 ++
 .../configurations/project/build.properties   |  3 ++
 .../project/build/TestPublish.scala           |  7 +++
 .../dependency-management/configurations/test | 49 +++++++++++++++++++
 14 files changed, 126 insertions(+), 8 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/Published.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/PublishedIvy.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/TestPublishIvyStyle.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/TestUse.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/Use.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/build.properties
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/ivy.build.properties
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/ivy.use.build.properties
 create mode 100644 src/sbt-test/dependency-management/configurations/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/test

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 16d6f2920..3011229be 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -383,8 +383,7 @@ object ManageDependencies
 		val module = toDefaultModuleDescriptor(md)
 		val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
 		parser.setMd(module)
-		val defaultConf = if(defaultConfiguration.contains("->")) defaultConfiguration else (defaultConfiguration + "->default(compile)")
-		parser.setDefaultConf(defaultConf)
+		parser.setDefaultConf(defaultConfiguration)
 		addDependencies(module, extraDependencies, parser)
 		module
 	}
@@ -626,6 +625,8 @@ object ManageDependencies
 		import XmlModuleDescriptorParser.Parser
 		class CustomParser(settings: IvySettings) extends Parser(CustomXmlParser, settings) with NotNull
 		{
+			setDefaultConfMapping("*->default(compile)")
+
 			def setSource(url: URL) =
 			{
 				super.setResource(new URLResource(url))
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 9233c0029..ac8278351 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -253,7 +253,10 @@ object Resolver
 		def apply(name: String): FileRepository = FileRepository(name, defaultFileConfiguration, ivyStylePatterns)
 		/** Constructs a file resolver with the given name and base directory. */
 		def apply(name: String, baseDirectory: File)(implicit basePatterns: Patterns): FileRepository =
+		{
+			if(baseDirectory.exists && !baseDirectory.isDirectory) error("Not a directory: " + baseDirectory.getAbsolutePath) else baseDirectory.mkdirs()
 			baseRepository(baseDirectory.toURI)(FileRepository(name, defaultFileConfiguration, _))
+		}
 	}
 	object url
 	{
@@ -328,12 +331,7 @@ object Configurations
 	private[sbt] val DefaultMavenConfiguration = defaultConfiguration(true)
 	private[sbt] val DefaultIvyConfiguration = defaultConfiguration(false)
 	private[sbt] def DefaultConfiguration(mavenStyle: Boolean) = if(mavenStyle) DefaultMavenConfiguration else DefaultIvyConfiguration
-	private[sbt] def defaultConfiguration(mavenStyle: Boolean) =
-	{
-		val base = if(mavenStyle) Configurations.Compile else Configurations.Default
-		config(base.name + "->default(compile)")
-	}
-
+	private[sbt] def defaultConfiguration(mavenStyle: Boolean) = if(mavenStyle) Configurations.Compile else Configurations.Default
 	private[sbt] def removeDuplicates(configs: Iterable[Configuration]) = Set(scala.collection.mutable.Map(configs.map(config => (config.name, config)).toSeq: _*).values.toList: _*)
 }
 /** Represents an Ivy configuration. */
diff --git a/src/sbt-test/dependency-management/configurations/changes/Published.scala b/src/sbt-test/dependency-management/configurations/changes/Published.scala
new file mode 100644
index 000000000..ddaf589e5
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/Published.scala
@@ -0,0 +1,4 @@
+object Published
+{
+	val x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/PublishedIvy.scala b/src/sbt-test/dependency-management/configurations/changes/PublishedIvy.scala
new file mode 100644
index 000000000..5c671747c
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/PublishedIvy.scala
@@ -0,0 +1,4 @@
+object PublishedIvy
+{
+	val x = 4
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/TestPublishIvyStyle.scala b/src/sbt-test/dependency-management/configurations/changes/TestPublishIvyStyle.scala
new file mode 100644
index 000000000..49ba77e94
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/TestPublishIvyStyle.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestPublish(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def managedStyle = ManagedStyle.Ivy
+	val publishTo = Resolver.file("test-repo", path("repo").asFile)(Resolver.mavenStylePatterns)
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/TestUse.scala
new file mode 100644
index 000000000..fa0be9092
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/TestUse.scala
@@ -0,0 +1,13 @@
+
+import sbt._
+
+class TestUse(info: ProjectInfo) extends DefaultProject(info)
+{
+	val publishTo = Resolver.file("test-repo", path("repo").asFile)
+	val published = "test" % "test-ivy" % "1.0"
+	val publishedT = "test" % "test-ivy" % "1.0" % "test"
+	val publishedR = "test" % "test-ivy" % "1.0" % "runtime"
+	val mavenC = "test" % "test" % "1.0"
+	val mavenT = "test" % "test" % "1.0" % "test"
+	val mavenR = "test" % "test" % "1.0" % "runtime"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala b/src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala
new file mode 100644
index 000000000..c9a48c266
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala
@@ -0,0 +1,15 @@
+
+import sbt._
+
+class TestUseIvy(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def managedStyle = ManagedStyle.Ivy
+	val publishTo = Resolver.file("test-repo", path("repo").asFile)
+	val published = "test" % "test-ivy" % "1.0"
+	val publishedT = "test" % "test-ivy" % "1.0" % "test"
+	val publishedR = "test" % "test-ivy" % "1.0" % "runtime"
+
+	val mavenC = "test" % "test" % "1.0"
+	val mavenT = "test" % "test" % "1.0" % "test"
+	val mavenR = "test" % "test" % "1.0" % "runtime"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/Use.scala b/src/sbt-test/dependency-management/configurations/changes/Use.scala
new file mode 100644
index 000000000..acedeafb8
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/Use.scala
@@ -0,0 +1,8 @@
+object Use
+{
+	def y = Published.x
+}
+object UseIvy
+{
+	def yi = PublishedIvy.x
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/build.properties b/src/sbt-test/dependency-management/configurations/changes/build.properties
new file mode 100644
index 000000000..85cb472ff
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/build.properties
@@ -0,0 +1,3 @@
+project.name=test-use
+project.organization=test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy.build.properties b/src/sbt-test/dependency-management/configurations/changes/ivy.build.properties
new file mode 100644
index 000000000..df088a2cd
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy.build.properties
@@ -0,0 +1,3 @@
+project.name=test-ivy
+project.organization=test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy.use.build.properties b/src/sbt-test/dependency-management/configurations/changes/ivy.use.build.properties
new file mode 100644
index 000000000..cd8b539bd
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy.use.build.properties
@@ -0,0 +1,3 @@
+project.name=test-ivy-use
+project.organization=test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/project/build.properties b/src/sbt-test/dependency-management/configurations/project/build.properties
new file mode 100644
index 000000000..22be9896f
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/project/build.properties
@@ -0,0 +1,3 @@
+project.name=test
+project.organization=test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala b/src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala
new file mode 100644
index 000000000..62c0b1c8a
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/project/build/TestPublish.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class TestPublish(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def managedStyle = ManagedStyle.Maven // the default, but make it explicit
+	val publishTo = Resolver.file("test-repo", path("repo").asFile)
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/test b/src/sbt-test/dependency-management/configurations/test
new file mode 100644
index 000000000..cd9862b89
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/test
@@ -0,0 +1,49 @@
+# publish a jar with Published with managedStyle = ManagedStyle.Maven
+
+$ copy-file changes/Published.scala src/main/scala/Published.scala [success]
+> publish
+[success]
+
+
+# publish a jar with PublishedIvy with managedStyle = ManagedStyle.Ivy
+
+$ delete src project lib_managed [success]
+$ copy-file changes/ivy.build.properties project/build.properties [success]
+$ copy-file changes/TestPublishIvyStyle.scala project/build/TestPublish.scala [success]
+$ reload [success]
+$ copy-file changes/PublishedIvy.scala src/main/scala/PublishedIvy.scala [success]
+> publish
+[success]
+
+# get and compile against each published jar with managedStyle = ManagedStyle.Maven
+
+$ delete src project/build lib_managed [success]
+$ copy-file changes/TestUse.scala project/build/TestUse.scala [success]
+$ copy-file changes/build.properties project/build.properties [success]
+$ reload [success]
+$ copy-file changes/Use.scala src/main/scala/Use.scala [success]
+
+> compile
+[failure]
+
+> update
+[success]
+> compile
+[success]
+
+
+# get and compile against each published jar with managedStyle = ManagedStyle.Ivy
+
+$ delete src project/build lib_managed [success]
+$ copy-file changes/TestUseIvy.scala project/build/TestUseIvy.scala [success]
+$ copy-file changes/build.properties project/build.properties [success]
+$ reload [success]
+$ copy-file changes/Use.scala src/main/scala/Use.scala [success]
+
+> compile
+[failure]
+
+> update
+[success]
+> compile
+[success]
\ No newline at end of file

From 32d293c7946a68d9f3f7fd4baf856a3b8c19f5ce Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 27 Sep 2009 00:04:22 +0000
Subject: [PATCH 121/268] Make Patterns construction simpler

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1055 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala    |  2 +-
 src/main/scala/sbt/ManagedInterface.scala     | 20 ++++++++++++-------
 src/main/scala/sbt/impl/ConvertResolver.scala |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 5c2817380..19ee35cd3 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -267,7 +267,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 			case Some(m: BasicManagedProject) => m.managedStyle
 			case _ => Auto
 		}
-	protected implicit final val defaultPatterns: RepositoryHelpers.Patterns =
+	protected implicit final val defaultPatterns: Patterns =
 	{
 		managedStyle match
 		{
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index ac8278351..3e46cfd27 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -96,14 +96,20 @@ sealed case class MavenRepository(name: String, root: String) extends Resolver
 	override def toString = name + ": " + root
 }
 
+final class Patterns(val ivyPatterns: Seq[String], val artifactPatterns: Seq[String], val isMavenCompatible: Boolean) extends NotNull
+{
+	private[sbt] def mavenStyle(): Patterns = Patterns(ivyPatterns, artifactPatterns, true)
+	private[sbt] def withIvys(patterns: Seq[String]): Patterns = Patterns(patterns ++ ivyPatterns, artifactPatterns, isMavenCompatible)
+	private[sbt] def withArtifacts(patterns: Seq[String]): Patterns = Patterns(ivyPatterns, patterns ++ artifactPatterns, isMavenCompatible)
+}
+object Patterns
+{
+	def apply(artifactPatterns: String*): Patterns = Patterns(true, artifactPatterns : _*)
+	def apply(isMavenCompatible: Boolean, artifactPatterns: String*): Patterns = Patterns(Nil, artifactPatterns, isMavenCompatible)
+	def apply(ivyPatterns: Seq[String], artifactPatterns: Seq[String], isMavenCompatible: Boolean): Patterns = new Patterns(ivyPatterns, artifactPatterns, isMavenCompatible)
+}
 object RepositoryHelpers
 {
-	final case class Patterns(ivyPatterns: Seq[String], artifactPatterns: Seq[String], isMavenCompatible: Boolean) extends NotNull
-	{
-		private[sbt] def mavenStyle(): Patterns = Patterns(ivyPatterns, artifactPatterns, true)
-		private[sbt] def withIvys(patterns: Seq[String]): Patterns = Patterns(patterns ++ ivyPatterns, artifactPatterns, isMavenCompatible)
-		private[sbt] def withArtifacts(patterns: Seq[String]): Patterns = Patterns(ivyPatterns, patterns ++ artifactPatterns, isMavenCompatible)
-	}
 	final case class SshConnection(authentication: Option[SshAuthentication], hostname: Option[String], port: Option[Int]) extends NotNull
 	{
 		def copy(authentication: Option[SshAuthentication]) = SshConnection(authentication, hostname, port)
@@ -119,7 +125,7 @@ object RepositoryHelpers
 	final case class PasswordAuthentication(user: String, password: String) extends SshAuthentication
 	final case class KeyFileAuthentication(keyfile: File, password: String) extends SshAuthentication
 }
-import RepositoryHelpers.{Patterns, SshConnection, FileConfiguration}
+import RepositoryHelpers.{SshConnection, FileConfiguration}
 import RepositoryHelpers.{KeyFileAuthentication, PasswordAuthentication, SshAuthentication}
 
 /** sbt interface to an Ivy repository based on patterns, which is most Ivy repositories.*/
diff --git a/src/main/scala/sbt/impl/ConvertResolver.scala b/src/main/scala/sbt/impl/ConvertResolver.scala
index 4bfe0b014..1d9ec9414 100644
--- a/src/main/scala/sbt/impl/ConvertResolver.scala
+++ b/src/main/scala/sbt/impl/ConvertResolver.scala
@@ -91,7 +91,7 @@ private object ConvertResolver
 					setKeyFilePassword(password)
 			}
 	}
-	private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: RepositoryHelpers.Patterns)
+	private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: Patterns)
 	{
 		resolver.setM2compatible(patterns.isMavenCompatible)
 		patterns.ivyPatterns.foreach(resolver.addIvyPattern)

From 1cee3e8542a4223255c0a831d5a3dc027dd48659 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 27 Sep 2009 01:49:42 +0000
Subject: [PATCH 122/268] Fix 'dependency-management/configurations' test and
 properly implement defaultconfmapping

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1056 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala   | 17 ++++-----
 src/main/scala/sbt/ManagedInterface.scala     |  2 +
 .../configurations/changes/Published.scala    |  4 --
 .../configurations/changes/TestUse.scala      | 13 -------
 .../configurations/changes/TestUseIvy.scala   | 15 --------
 .../changes/ivy.build.properties              |  3 --
 .../Published.scala}                          |  0
 .../TestPublish.scala}                        |  2 +-
 .../configurations/changes/ivy/TestUse.scala  | 11 ++++++
 .../changes/{ => ivy}/Use.scala               |  4 --
 .../changes/ivy/publish.build.properties      |  3 ++
 .../use.build.properties}                     |  0
 .../changes/maven/Published.scala             |  4 ++
 .../changes/maven/TestUse.scala               | 10 +++++
 .../configurations/changes/maven/Use.scala    |  4 ++
 .../use.build.properties}                     |  0
 .../configurations/project/build.properties   |  2 +-
 .../dependency-management/configurations/test | 37 +++++++++----------
 .../exclude-transitive/test                   | 13 +++----
 19 files changed, 66 insertions(+), 78 deletions(-)
 delete mode 100644 src/sbt-test/dependency-management/configurations/changes/Published.scala
 delete mode 100644 src/sbt-test/dependency-management/configurations/changes/TestUse.scala
 delete mode 100644 src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala
 delete mode 100644 src/sbt-test/dependency-management/configurations/changes/ivy.build.properties
 rename src/sbt-test/dependency-management/configurations/changes/{PublishedIvy.scala => ivy/Published.scala} (100%)
 rename src/sbt-test/dependency-management/configurations/changes/{TestPublishIvyStyle.scala => ivy/TestPublish.scala} (79%)
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
 rename src/sbt-test/dependency-management/configurations/changes/{ => ivy}/Use.scala (52%)
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties
 rename src/sbt-test/dependency-management/configurations/changes/{ivy.use.build.properties => ivy/use.build.properties} (100%)
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/maven/Published.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
 create mode 100644 src/sbt-test/dependency-management/configurations/changes/maven/Use.scala
 rename src/sbt-test/dependency-management/configurations/changes/{build.properties => maven/use.build.properties} (100%)

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 3011229be..368c92502 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -77,7 +77,7 @@ object ManageDependencies
 			Control.trap("Could not read Ivy file: ", log)
 			{
 				val url = toURL(ivyFile)
-				val parser = new CustomXmlParser.CustomParser(settings)
+				val parser = new CustomXmlParser.CustomParser(settings, None)
 				parser.setValidate(flags.validate)
 				parser.setSource(url)
 				parser.parse()
@@ -90,9 +90,8 @@ object ManageDependencies
 		def parseDependencies(xml: String, moduleID: DefaultModuleDescriptor, defaultConfiguration: String): Either[String, CustomXmlParser.CustomParser] =
 			Control.trap("Could not read dependencies: ", log)
 			{
-				val parser = new CustomXmlParser.CustomParser(settings)
+				val parser = new CustomXmlParser.CustomParser(settings, Some(defaultConfiguration))
 				parser.setMd(moduleID)
-				parser.setDefaultConf(defaultConfiguration)
 				parser.setValidate(flags.validate)
 				val resource = new ByteResource(xml.getBytes)
 				parser.setInput(resource.openStream)
@@ -381,9 +380,8 @@ object ManageDependencies
 	private def addLateDependencies(ivy: Ivy, md: ModuleDescriptor, defaultConfiguration: String, extraDependencies: Iterable[ModuleID]) =
 	{
 		val module = toDefaultModuleDescriptor(md)
-		val parser = new CustomXmlParser.CustomParser(ivy.getSettings)
+		val parser = new CustomXmlParser.CustomParser(ivy.getSettings, Some(defaultConfiguration))
 		parser.setMd(module)
-		parser.setDefaultConf(defaultConfiguration)
 		addDependencies(module, extraDependencies, parser)
 		module
 	}
@@ -623,9 +621,9 @@ object ManageDependencies
 	private object CustomXmlParser extends XmlModuleDescriptorParser with NotNull
 	{
 		import XmlModuleDescriptorParser.Parser
-		class CustomParser(settings: IvySettings) extends Parser(CustomXmlParser, settings) with NotNull
+		class CustomParser(settings: IvySettings, defaultConfig: Option[String]) extends Parser(CustomXmlParser, settings) with NotNull
 		{
-			setDefaultConfMapping("*->default(compile)")
+			defaultConfig.foreach(x => setDefaultConfMapping("*->default(compile)"))
 
 			def setSource(url: URL) =
 			{
@@ -635,9 +633,8 @@ object ManageDependencies
 			/** Overridden because the super implementation overwrites the module descriptor.*/
 			override def setResource(res: Resource) {}
 			override def setMd(md: DefaultModuleDescriptor) = super.setMd(md)
-			override def parseDepsConfs(confs: String, dd: DefaultDependencyDescriptor) = super.parseDepsConfs(confs, dd)
-			override def getDefaultConf = super.getDefaultConf
-			override def setDefaultConf(conf: String) = super.setDefaultConf(conf)
+			override def parseDepsConfs(confs: String, dd: DefaultDependencyDescriptor): Unit = super.parseDepsConfs(confs, dd)
+			override def getDefaultConf = defaultConfig.getOrElse(super.getDefaultConf)
 		}
 	}
 	/** This code converts the given ModuleDescriptor to a DefaultModuleDescriptor by casting or generating an error.
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 3e46cfd27..6af59f830 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -334,6 +334,8 @@ object Configurations
 
 	lazy val CompilerPlugin = config("plugin") hide
 
+	def allPredefined = Default :: IntegrationTest :: CompilerPlugin :: defaultMavenConfigurations
+
 	private[sbt] val DefaultMavenConfiguration = defaultConfiguration(true)
 	private[sbt] val DefaultIvyConfiguration = defaultConfiguration(false)
 	private[sbt] def DefaultConfiguration(mavenStyle: Boolean) = if(mavenStyle) DefaultMavenConfiguration else DefaultIvyConfiguration
diff --git a/src/sbt-test/dependency-management/configurations/changes/Published.scala b/src/sbt-test/dependency-management/configurations/changes/Published.scala
deleted file mode 100644
index ddaf589e5..000000000
--- a/src/sbt-test/dependency-management/configurations/changes/Published.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Published
-{
-	val x = 3
-}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/TestUse.scala
deleted file mode 100644
index fa0be9092..000000000
--- a/src/sbt-test/dependency-management/configurations/changes/TestUse.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-
-import sbt._
-
-class TestUse(info: ProjectInfo) extends DefaultProject(info)
-{
-	val publishTo = Resolver.file("test-repo", path("repo").asFile)
-	val published = "test" % "test-ivy" % "1.0"
-	val publishedT = "test" % "test-ivy" % "1.0" % "test"
-	val publishedR = "test" % "test-ivy" % "1.0" % "runtime"
-	val mavenC = "test" % "test" % "1.0"
-	val mavenT = "test" % "test" % "1.0" % "test"
-	val mavenR = "test" % "test" % "1.0" % "runtime"
-}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala b/src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala
deleted file mode 100644
index c9a48c266..000000000
--- a/src/sbt-test/dependency-management/configurations/changes/TestUseIvy.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-
-import sbt._
-
-class TestUseIvy(info: ProjectInfo) extends DefaultProject(info)
-{
-	override def managedStyle = ManagedStyle.Ivy
-	val publishTo = Resolver.file("test-repo", path("repo").asFile)
-	val published = "test" % "test-ivy" % "1.0"
-	val publishedT = "test" % "test-ivy" % "1.0" % "test"
-	val publishedR = "test" % "test-ivy" % "1.0" % "runtime"
-
-	val mavenC = "test" % "test" % "1.0"
-	val mavenT = "test" % "test" % "1.0" % "test"
-	val mavenR = "test" % "test" % "1.0" % "runtime"
-}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy.build.properties b/src/sbt-test/dependency-management/configurations/changes/ivy.build.properties
deleted file mode 100644
index df088a2cd..000000000
--- a/src/sbt-test/dependency-management/configurations/changes/ivy.build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=test-ivy
-project.organization=test
-project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/PublishedIvy.scala b/src/sbt-test/dependency-management/configurations/changes/ivy/Published.scala
similarity index 100%
rename from src/sbt-test/dependency-management/configurations/changes/PublishedIvy.scala
rename to src/sbt-test/dependency-management/configurations/changes/ivy/Published.scala
diff --git a/src/sbt-test/dependency-management/configurations/changes/TestPublishIvyStyle.scala b/src/sbt-test/dependency-management/configurations/changes/ivy/TestPublish.scala
similarity index 79%
rename from src/sbt-test/dependency-management/configurations/changes/TestPublishIvyStyle.scala
rename to src/sbt-test/dependency-management/configurations/changes/ivy/TestPublish.scala
index 49ba77e94..934644b00 100644
--- a/src/sbt-test/dependency-management/configurations/changes/TestPublishIvyStyle.scala
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy/TestPublish.scala
@@ -3,5 +3,5 @@ import sbt._
 class TestPublish(info: ProjectInfo) extends DefaultProject(info)
 {
 	override def managedStyle = ManagedStyle.Ivy
-	val publishTo = Resolver.file("test-repo", path("repo").asFile)(Resolver.mavenStylePatterns)
+	val publishTo = Resolver.file("test-repo", path("repo").asFile)(Patterns(false, Resolver.mavenStyleBasePattern))
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
new file mode 100644
index 000000000..01ad76516
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
@@ -0,0 +1,11 @@
+
+import sbt._
+
+class TestUse(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def managedStyle = ManagedStyle.Ivy
+	val publishTo = Resolver.file("test-repo", path("repo").asFile)(Patterns(false, Resolver.mavenStyleBasePattern))
+	val mavenC = "org.example" % "test-ivy" % "1.0"
+	val mavenT = "org.example" % "test-ivy" % "1.0" % "test"
+	val mavenR = "org.example" % "test-ivy" % "1.0" % "runtime"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/Use.scala b/src/sbt-test/dependency-management/configurations/changes/ivy/Use.scala
similarity index 52%
rename from src/sbt-test/dependency-management/configurations/changes/Use.scala
rename to src/sbt-test/dependency-management/configurations/changes/ivy/Use.scala
index acedeafb8..e284f4982 100644
--- a/src/sbt-test/dependency-management/configurations/changes/Use.scala
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy/Use.scala
@@ -1,7 +1,3 @@
-object Use
-{
-	def y = Published.x
-}
 object UseIvy
 {
 	def yi = PublishedIvy.x
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties b/src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties
new file mode 100644
index 000000000..067fa5e0a
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties
@@ -0,0 +1,3 @@
+project.name=test-ivy
+project.organization=org.example
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy.use.build.properties b/src/sbt-test/dependency-management/configurations/changes/ivy/use.build.properties
similarity index 100%
rename from src/sbt-test/dependency-management/configurations/changes/ivy.use.build.properties
rename to src/sbt-test/dependency-management/configurations/changes/ivy/use.build.properties
diff --git a/src/sbt-test/dependency-management/configurations/changes/maven/Published.scala b/src/sbt-test/dependency-management/configurations/changes/maven/Published.scala
new file mode 100644
index 000000000..f85014ed1
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/maven/Published.scala
@@ -0,0 +1,4 @@
+object PublishedMaven
+{
+	val x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
new file mode 100644
index 000000000..49208bbd8
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
@@ -0,0 +1,10 @@
+
+import sbt._
+
+class TestUse(info: ProjectInfo) extends DefaultProject(info)
+{
+	val publishTo = Resolver.file("test-repo", path("repo").asFile)
+	val mavenC = "org.example" % "test" % "1.0"
+	val mavenT = "org.example" % "test" % "1.0" % "test"
+	val mavenR = "org.example" % "test" % "1.0" % "runtime"
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/maven/Use.scala b/src/sbt-test/dependency-management/configurations/changes/maven/Use.scala
new file mode 100644
index 000000000..9a23529aa
--- /dev/null
+++ b/src/sbt-test/dependency-management/configurations/changes/maven/Use.scala
@@ -0,0 +1,4 @@
+object UseMaven
+{
+	def y = PublishedMaven.x
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/build.properties b/src/sbt-test/dependency-management/configurations/changes/maven/use.build.properties
similarity index 100%
rename from src/sbt-test/dependency-management/configurations/changes/build.properties
rename to src/sbt-test/dependency-management/configurations/changes/maven/use.build.properties
diff --git a/src/sbt-test/dependency-management/configurations/project/build.properties b/src/sbt-test/dependency-management/configurations/project/build.properties
index 22be9896f..f38a35c95 100644
--- a/src/sbt-test/dependency-management/configurations/project/build.properties
+++ b/src/sbt-test/dependency-management/configurations/project/build.properties
@@ -1,3 +1,3 @@
 project.name=test
-project.organization=test
+project.organization=org.example
 project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/test b/src/sbt-test/dependency-management/configurations/test
index cd9862b89..841dc3bfe 100644
--- a/src/sbt-test/dependency-management/configurations/test
+++ b/src/sbt-test/dependency-management/configurations/test
@@ -1,27 +1,16 @@
 # publish a jar with Published with managedStyle = ManagedStyle.Maven
 
-$ copy-file changes/Published.scala src/main/scala/Published.scala [success]
+$ copy-file changes/maven/Published.scala src/main/scala/Published.scala [success]
 > publish
 [success]
-
-
-# publish a jar with PublishedIvy with managedStyle = ManagedStyle.Ivy
-
 $ delete src project lib_managed [success]
-$ copy-file changes/ivy.build.properties project/build.properties [success]
-$ copy-file changes/TestPublishIvyStyle.scala project/build/TestPublish.scala [success]
-$ reload [success]
-$ copy-file changes/PublishedIvy.scala src/main/scala/PublishedIvy.scala [success]
-> publish
-[success]
 
 # get and compile against each published jar with managedStyle = ManagedStyle.Maven
 
-$ delete src project/build lib_managed [success]
-$ copy-file changes/TestUse.scala project/build/TestUse.scala [success]
-$ copy-file changes/build.properties project/build.properties [success]
+$ copy-file changes/maven/TestUse.scala project/build/TestUse.scala [success]
+$ copy-file changes/maven/use.build.properties project/build.properties [success]
 $ reload [success]
-$ copy-file changes/Use.scala src/main/scala/Use.scala [success]
+$ copy-file changes/maven/Use.scala src/main/scala/Use.scala [success]
 
 > compile
 [failure]
@@ -30,15 +19,25 @@ $ copy-file changes/Use.scala src/main/scala/Use.scala [success]
 [success]
 > compile
 [success]
+$ delete src project lib_managed repo [success]
 
 
+# publish a jar with PublishedIvy with managedStyle = ManagedStyle.Ivy
+
+$ copy-file changes/ivy/publish.build.properties project/build.properties [success]
+$ copy-file changes/ivy/TestPublish.scala project/build/TestPublish.scala [success]
+$ reload [success]
+$ copy-file changes/ivy/Published.scala src/main/scala/Published.scala [success]
+> publish
+[success]
+
 # get and compile against each published jar with managedStyle = ManagedStyle.Ivy
 
-$ delete src project/build lib_managed [success]
-$ copy-file changes/TestUseIvy.scala project/build/TestUseIvy.scala [success]
-$ copy-file changes/build.properties project/build.properties [success]
+$ delete src project lib_managed [success]
+$ copy-file changes/ivy/TestUse.scala project/build/TestUse.scala [success]
+$ copy-file changes/ivy/use.build.properties project/build.properties [success]
 $ reload [success]
-$ copy-file changes/Use.scala src/main/scala/Use.scala [success]
+$ copy-file changes/ivy/Use.scala src/main/scala/Use.scala [success]
 
 > compile
 [failure]
diff --git a/src/sbt-test/dependency-management/exclude-transitive/test b/src/sbt-test/dependency-management/exclude-transitive/test
index 2a5c10a79..d0b58e349 100644
--- a/src/sbt-test/dependency-management/exclude-transitive/test
+++ b/src/sbt-test/dependency-management/exclude-transitive/test
@@ -1,10 +1,8 @@
 # load the project definition with transitive dependencies enabled
 # and check that they are not downloaded
 
-$ touch transitive
-[success]
-$ reload
-[success]
+$ touch transitive [success]
+$ reload [success]
 
 > update
 [success]
@@ -18,10 +16,9 @@ $ reload
 # load the project definition with transitive dependencies disabled
 # and check that they are not downloaded
 
-$ delete transitive
-[success]
-$ reload
-[success]
+$ delete ivy-cache
+$ delete transitive [success]
+$ reload [success]
 
 > update
 [success]

From 42b343ca9a59f593e583027b4b6feccb59c0fc6e Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sun, 27 Sep 2009 23:00:27 +0000
Subject: [PATCH 123/268] Fix issue where last path component of local
 repository was dropped if it did not exist.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1057 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala |  2 +-
 src/main/scala/sbt/ManagedInterface.scala   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 368c92502..6d462a2cb 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -623,7 +623,7 @@ object ManageDependencies
 		import XmlModuleDescriptorParser.Parser
 		class CustomParser(settings: IvySettings, defaultConfig: Option[String]) extends Parser(CustomXmlParser, settings) with NotNull
 		{
-			defaultConfig.foreach(x => setDefaultConfMapping("*->default(compile)"))
+			if(defaultConfig.isDefined) setDefaultConfMapping("*->default(compile)")
 
 			def setSource(url: URL) =
 			{
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 6af59f830..b7c890337 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -260,7 +260,7 @@ object Resolver
 		/** Constructs a file resolver with the given name and base directory. */
 		def apply(name: String, baseDirectory: File)(implicit basePatterns: Patterns): FileRepository =
 		{
-			if(baseDirectory.exists && !baseDirectory.isDirectory) error("Not a directory: " + baseDirectory.getAbsolutePath) else baseDirectory.mkdirs()
+			if(baseDirectory.exists && !baseDirectory.isDirectory) error("Not a directory: " + baseDirectory.getAbsolutePath)
 			baseRepository(baseDirectory.toURI)(FileRepository(name, defaultFileConfiguration, _))
 		}
 	}
@@ -274,7 +274,7 @@ object Resolver
 			baseRepository(baseURL.toURI)(URLRepository(name, _))
 	}
 	private def baseRepository[T](baseURI: java.net.URI)(construct: Patterns => T)(implicit basePatterns: Patterns): T =
-		construct(resolvePatterns(baseURI.normalize, basePatterns))
+		construct(resolvePatterns(normalize(baseURI), basePatterns))
 
 	/** If `base` is None, `patterns` is returned unchanged.
 	* Otherwise, the ivy file and artifact patterns in `patterns` are resolved against the given base. */
@@ -291,6 +291,14 @@ object Resolver
 		def resolveAll(patterns: Seq[String]) = patterns.map(resolve)
 		Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible)
 	}
+	/** Normalizes the given URI, which is assumed to represent a directory, even if that directory does not exist.  This method exists
+	* because URI.normalize does not append a slash if the directory does not exist.*/
+	private def normalize(uri: URI) =
+	{
+		val normalized = uri.normalize
+		val normString = normalized.toString
+		if(normString.endsWith("/")) normalized else new URI(normString + "/")
+	}
 	/** Constructs a `URI` with the path component set to `path` and the other components set to null.*/
 	private def pathURI(path: String) = new URI(null, null, path, null)
 

From 701edaa2a4b18987d4bc09d43e9aca523c9edf22 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 28 Sep 2009 00:48:10 +0000
Subject: [PATCH 124/268] Make cache directory affect resolution cache

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1059 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManageDependencies.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 6d462a2cb..49c9d4b91 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -340,6 +340,7 @@ object ManageDependencies
 		manager.setChangingMatcher(PatternMatcher.REGEXP);
 		manager.setChangingPattern(".*-SNAPSHOT");
 		settings.setDefaultRepositoryCacheManager(manager)
+		dir.foreach(dir => settings.setDefaultResolutionCacheBasedir(dir.absolutePath))
 	}
 	/** Creates an ExcludeRule that excludes artifacts with the given module organization and name for
 	* the given configurations. */

From 1affe9fa90e88cd1dff82ce360de7eca49aa61a5 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Mon, 28 Sep 2009 02:25:51 +0000
Subject: [PATCH 125/268] Fix extra test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1060 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/ManagedInterface.scala                    | 2 +-
 .../dependency-management/extra/changes/UseColor.scala       | 5 +++++
 .../extra/project/build/DefineColor.scala                    | 5 +++++
 src/sbt-test/dependency-management/extra/test                | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index b7c890337..407070d99 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -304,7 +304,7 @@ object Resolver
 
 	def defaultFileConfiguration = FileConfiguration(true, None)
 	def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true)
-	def ivyStylePatterns = Patterns(Nil, Nil, false)
+	def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, mavenStyleBasePattern :: Nil, false)
 
 	def defaultPatterns = mavenStylePatterns
 	def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
diff --git a/src/sbt-test/dependency-management/extra/changes/UseColor.scala b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
index 8c8a7b7c1..79639ab5e 100644
--- a/src/sbt-test/dependency-management/extra/changes/UseColor.scala
+++ b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
@@ -2,6 +2,11 @@ import sbt._
 
 class UseColor(info: ProjectInfo) extends DefaultProject(info)
 {
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	override def managedStyle = ManagedStyle.Ivy
+	val repo = Resolver.file("test-repo", ("repo" / "test").asFile)
 	def color = FileUtilities.readString("color".asFile, log).right.getOrElse(error("No color specified"))
 	override def libraryDependencies = Set(
 		"org.scala-tools.sbt" % "test-ivy-extra" %"1.0" extra("e:color" -> color)
diff --git a/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
index 94d17bfbb..658c6c063 100644
--- a/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
+++ b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
@@ -2,5 +2,10 @@ import sbt._
 
 class DefineColor(info: ProjectInfo) extends DefaultProject(info)
 {
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	override def managedStyle = ManagedStyle.Ivy
+	val publishTo = Resolver.file("test-repo", ("repo" / "test").asFile)
 	override def projectID = super.projectID extra("e:color" -> "red")
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/test b/src/sbt-test/dependency-management/extra/test
index fe40c91b6..e79c35cd1 100644
--- a/src/sbt-test/dependency-management/extra/test
+++ b/src/sbt-test/dependency-management/extra/test
@@ -1,4 +1,4 @@
-> publish-local
+> publish
 [success]
 
 $ delete project/build/

From 9f7a9b33f60800de8b491d7c9f2f23e5164e3c86 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 29 Sep 2009 00:20:45 +0000
Subject: [PATCH 126/268] Unify batch-style and interactive style commands

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1062 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/Main.scala | 289 ++++++++++++++++------------------
 1 file changed, 137 insertions(+), 152 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 8a74e37bf..3176b02c7 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -6,7 +6,7 @@ package sbt
 import scala.collection.immutable.TreeSet
 
 private trait RunCompleteAction extends NotNull
-private class Exit(val code: Int) extends RunCompleteAction
+private case class Exit(code: Int) extends RunCompleteAction
 private object Reload extends RunCompleteAction
 
 /** This class is the entry point for sbt.  If it is given any arguments, it interprets them
@@ -85,7 +85,6 @@ object Main
 			}
 		}
 	}
-	/** Returns true if the project should be reloaded, false if sbt should exit.*/
 	private def startProject(project: Project, args: Array[String], startTime: Long): RunCompleteAction =
 	{
 		project.log.info("Building project " + project.name + " " + project.version.toString + " using " + project.getClass.getName)
@@ -115,16 +114,17 @@ object Main
 					}
 				new Exit(exitCode)
 			case _ =>
-				val exitCode =
-					Control.lazyFold(args.toList)(handleBatchCommand(project)) match
-					{
-						case None => project.log.success("Build completed successfully."); NormalExitCode
-						case Some(errorMessage) =>
-							project.log.error("Error during build" + (if(errorMessage.isEmpty) "." else ": " + errorMessage) )
-							BuildErrorExitCode
-					}
+				val source = args.toList.elements
+				def nextCommand = if(source.hasNext) Right(source.next) else Left(new Exit(NormalExitCode) )
+				val result = loop(project, project, p => nextCommand, false)
+				result match
+				{
+					case Exit(NormalExitCode) => project.log.success("Build completed successfully.")
+					case Exit(_) => project.log.error("Error during build.")
+					case _ => ()
+				}
 				printTime(project, startTime, "build")
-				new Exit(exitCode)
+				result
 		}
 	}
 	private def crossBuildNext(project: Project, cross: CrossBuild) =
@@ -139,7 +139,7 @@ object Main
 			printTime(project, cross.startTime, "cross-build")
 		!complete
 	}
-	
+
 	/** The name of the command that loads a console with access to the current project through the variable 'project'.*/
 	val ProjectConsoleAction = "console-project"
 	/** The name of the command that shows the current project and logging level of that project.*/
@@ -172,7 +172,7 @@ object Main
 	val CrossBuildPrefix = "+"
 	/** Error message for when the user tries to prefix an action with CrossBuildPrefix but the loader is not used.*/
 	val CrossBuildUnsupported = "Cross-building is not supported when the loader is not used."
-	
+
 	/** The number of seconds between polling by the continuous compile command.*/
 	val ContinuousCompilePollDelaySeconds = 1
 
@@ -184,7 +184,7 @@ object Main
 	/** The list of all interactive commands other than logging level.*/
 	private def basicCommands: Iterable[String] = TreeSet(ShowProjectsAction, ShowActions, ShowCurrent, HelpAction,
 		RebootCommand, ReloadAction, TraceCommand, ContinuousCompileCommand, ProjectConsoleAction)
-	
+
 	/** Enters interactive mode for the given root project.  It uses JLine for tab completion and
 	* history.  It returns normally when the user terminates or reloads the interactive session.  That is,
 	* it does not call System.exit to quit.
@@ -200,87 +200,89 @@ object Main
 			val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
 			reader.setVariableCompletions(project.taskNames, project.propertyNames, methodCompletions)
 		}
-		
-		/** Prompts the user for the next command using 'currentProject' as context.
-		* If the command indicates that the user wishes to terminate or reload the session,
-		*   the function returns the appropriate value.
-		* Otherwise, the command is handled and this function is called again
-		*   (tail recursively) to prompt for the next command. */
-		def loop(currentProject: Project): RunCompleteAction =
+
+		def readCommand(currentProject: Project) =
 		{
-			updateTaskCompletions(currentProject) // this is done after every command because the completions could change due to the action invoked
-			reader.readLine("> ") match
+			updateTaskCompletions(currentProject) // this is done before every command because the completions could change due to the action previously invoked
+			reader.readLine("> ").toRight(new Exit(NormalExitCode))
+		}
+
+		loop(baseProject, baseProject, readCommand, true)
+	}
+
+	/** Prompts the user for the next command using 'currentProject' as context.
+	* If the command indicates that the user wishes to terminate or reload the session,
+	*   the function returns the appropriate value.
+	* Otherwise, the command is handled and this function is called again
+	*   (tail recursively) to prompt for the next command. */
+	private def loop(baseProject: Project, currentProject: Project, nextCommand: Project => Either[RunCompleteAction, String], isInteractive: Boolean): RunCompleteAction =
+		nextCommand(currentProject).right.flatMap{ line => process(baseProject, currentProject, line, isInteractive) } match
+		{
+			case Left(complete) => complete
+			case Right(project) => loop(baseProject, project, nextCommand, isInteractive)
+		}
+	private def process(baseProject: Project, currentProject: Project, line: String, isInteractive: Boolean): Either[RunCompleteAction, Project] =
+	{
+		def keepCurrent(success: Boolean) =  if(success) Right(currentProject) else Left(new Exit(BuildErrorExitCode) )
+		def interactiveKeepCurrent(success: Boolean) = keepCurrent(success || isInteractive)
+		def keep(u: Unit) = Right(currentProject)
+
+		val trimmed = line.trim
+		if(trimmed.isEmpty)
+			Right(currentProject)
+		else if(isTerminateAction(trimmed))
+			Left(new Exit(NormalExitCode))
+		else if(ReloadAction == trimmed)
+			Left(Reload)
+		else if(RebootCommand == trimmed)
+		{
+			if(!isInteractive) currentProject.log.warn("'reboot' does not pick up changes to 'scala.version' in batch mode.")
+			System.setProperty(ScalaVersion.LiveKey, "")
+			Left(new Exit(RebootExitCode))
+		}
+		else if(trimmed.startsWith(CrossBuildPrefix))
+		{
+			if(startCrossBuild(currentProject, trimmed.substring(CrossBuildPrefix.length).trim))
+				Left(new Exit(RebootExitCode))
+			else
+				Right(currentProject)
+		}
+		else if(trimmed.startsWith(ProjectAction + " "))
+		{
+			val projectName = trimmed.substring(ProjectAction.length + 1)
+			baseProject.projectClosure.find(_.name == projectName) match
 			{
-				case Some(line) =>
-				{
-					val trimmed = line.trim
-					if(trimmed.isEmpty)
-						loop(currentProject)
-					else if(isTerminateAction(trimmed))
-						new Exit(NormalExitCode)
-					else if(ReloadAction == trimmed)
-						Reload
-					else if(RebootCommand == trimmed)
-					{
-						System.setProperty(ScalaVersion.LiveKey, "")
-						new Exit(RebootExitCode)
-					}
-					else if(trimmed.startsWith(CrossBuildPrefix))
-					{
-						if(startCrossBuild(currentProject, trimmed.substring(CrossBuildPrefix.length).trim))
-							new Exit(RebootExitCode)
-						else
-							loop(currentProject)
-					}
-					else if(trimmed.startsWith(ProjectAction + " "))
-					{
-						val projectName = trimmed.substring(ProjectAction.length + 1)
-						baseProject.projectClosure.find(_.name == projectName) match
-						{
-							case Some(newProject) =>
-							{
-								printProject("Set current project to ", newProject)
-								updateTaskCompletions(newProject)
-								loop(newProject)
-							}
-							case None =>
-							{
-								currentProject.log.error("Invalid project name '" + projectName + "' (type 'projects' to list available projects).")
-								loop(currentProject)
-							}
-						}
-					}
-					else
-					{
-						if(trimmed == HelpAction)
-							displayInteractiveHelp()
-						else if(trimmed == ShowProjectsAction)
-							baseProject.projectClosure.foreach(listProject)
-						else if(trimmed.startsWith(SetAction + " "))
-							setProperty(currentProject, trimmed.substring(SetAction.length + 1))
-						else if(trimmed.startsWith(GetAction + " "))
-							getProperty(currentProject, trimmed.substring(GetAction.length + 1))
-						else if(trimmed == ProjectConsoleAction)
-							showResult(Run.projectConsole(currentProject), currentProject.log)
-						else
-							handleInteractiveCommand(currentProject, trimmed)
-						loop(currentProject)
-					}
-				}
-				case None => new Exit(NormalExitCode)
+				case Some(newProject) =>
+					printProject("Set current project to ", newProject)
+					Right(newProject)
+				case None =>
+					currentProject.log.error("Invalid project name '" + projectName + "' (type 'projects' to list available projects).")
+					keepCurrent(isInteractive)
 			}
 		}
-		
-		loop(baseProject)
+		else if(trimmed == HelpAction)
+			keep(displayHelp(isInteractive))
+		else if(trimmed == ShowProjectsAction)
+			keep(baseProject.projectClosure.foreach(listProject))
+		else if(trimmed.startsWith(SetAction + " "))
+			interactiveKeepCurrent( setProperty(currentProject, trimmed.substring(SetAction.length + 1)) )
+		else if(trimmed.startsWith(GetAction + " "))
+			interactiveKeepCurrent( getProperty(currentProject, trimmed.substring(GetAction.length + 1)) )
+		else if(trimmed == ProjectConsoleAction)
+			interactiveKeepCurrent(showResult(Run.projectConsole(currentProject), currentProject.log))
+		else
+			interactiveKeepCurrent( handleCommand(currentProject, trimmed) )
 	}
 	private def printCmd(name:String, desc:String) = Console.println("\t" + name + ": " + desc)
-	private def displayBatchHelp() = {
-		Console.println("You may execute any project action or method or one of the commands described below.")
-		Console.println("Available Commands:")
-		printCommonCommands()
-	}
-	private def printCommonCommands()
+	val BatchHelpHeader = "You may execute any project action or method or one of the commands described below."
+	val InteractiveHelpHeader = "You may execute any project action or one of the commands described below. Only one action " +
+			"may be executed at a time in interactive mode and is entered by name, as it would be at the command line." +
+			" Also, tab completion is available."
+	private def displayHelp(isInteractive: Boolean)
 	{
+		Console.println(if(isInteractive) InteractiveHelpHeader else BatchHelpHeader)
+		Console.println("Available Commands:")
+
 		printCmd("<action name>", "Executes the project specified action.")
 		printCmd("<method name> <parameter>*", "Executes the project specified method.")
 		printCmd(ContinuousExecutePrefix + " <command>", "Executes the project specified action or method whenever source files change.")
@@ -288,21 +290,13 @@ object Main
 		printCmd(ShowActions, "Shows all available actions.")
 		printCmd(RebootCommand, "Changes to scala.version or sbt.version are processed and the project definition is reloaded.")
 		printCmd(HelpAction, "Displays this help message.")
-	}
-	private def displayInteractiveHelp() = {
-		Console.println("You may execute any project action or one of the commands described below. Only one action " +
-			"may be executed at a time in interactive mode and is entered by name, as it would be at the command line." +
-			" Also, tab completion is available.")
-		Console.println("Available Commands:")
-
-		printCommonCommands()
 		printCmd(ReloadAction, "Reloads sbt, recompiling modified project definitions if necessary.")
 		printCmd(ShowCurrent, "Shows the current project and logging level of that project.")
 		printCmd(Level.levels.mkString(", "), "Set logging for the current project to the specified level.")
 		printCmd(TraceCommand, "Toggles whether logging stack traces is enabled.")
 		printCmd(ProjectAction + " <project name>", "Sets the currently active project.")
 		printCmd(ShowProjectsAction, "Shows all available projects.")
-		printCmd(TerminateActions.elements.mkString(", "), "Terminates the program.")
+		printCmd(TerminateActions.elements.mkString(", "), "Terminates the build.")
 		printCmd(SetAction + " <property> <value>", "Sets the value of the property given as its argument.")
 		printCmd(GetAction + " <property>", "Gets the value of the property given as its argument.")
 		printCmd(ProjectConsoleAction, "Enters the Scala interpreter with the current project bound to the variable 'current' and all members imported.")
@@ -330,21 +324,9 @@ object Main
 			Console.println(CrossBuildUnsupported)
 			false
 		}
-	
-	/** Handles the given command string provided by batch mode execution..*/
-	private def handleBatchCommand(project: Project)(command: String): Option[String] =
-	{
-		command.trim match
-		{
-			case HelpAction => displayBatchHelp(); None
-			case ShowActions => showActions(project); None
-			case CrossBuild(crossBuildAction) => Some(CrossBuildUnsupported)
-			case action => if(handleAction(project, action)) None else Some("")
-		}
-	}
-	
-	/** Handles the given command string provided at the command line.*/
-	private def handleInteractiveCommand(project: Project, command: String)
+
+	/** Handles the given command string provided at the command line.  Returns false if there was an error*/
+	private def handleCommand(project: Project, command: String): Boolean =
 	{
 		command match
 		{
@@ -355,19 +337,18 @@ object Main
 				printProject("Current project is ", project)
 				Console.println("Current log level is " + project.log.getLevel)
 				printTraceEnabled(project)
-			case ShowActions => showActions(project)
-			case TraceCommand => toggleTrace(project)
-			case Level(level) => setLevel(project, level)
+				true
+			case ShowActions => showActions(project); true
+			case TraceCommand => toggleTrace(project); true
+			case Level(level) => setLevel(project, level); true
 			case ContinuousCompileCommand => compileContinuously(project)
-			case action if action.startsWith(ContinuousExecutePrefix) =>
-				executeContinuously(project, action.substring(ContinuousExecutePrefix.length).trim)
+			case action if action.startsWith(ContinuousExecutePrefix) => executeContinuously(project, action.substring(ContinuousExecutePrefix.length).trim)
 			case action => handleAction(project, action)
 		}
 	}
-	private def showActions(project: Project): Unit =
-		Console.println(project.taskAndMethodList)
-	
-	// returns true if it succeeded (needed by noninteractive handleCommand)
+	private def showActions(project: Project): Unit = Console.println(project.taskAndMethodList)
+
+	// returns true if it succeeded
 	private def handleAction(project: Project, action: String): Boolean =
 	{
 		def show(result: Option[String]): Boolean = showResult(result, project.log)
@@ -376,6 +357,7 @@ object Main
 		printTime(project, startTime, "")
 		result
 	}
+	// returns true if it succeeded
 	private def showResult(result: Option[String], log: Logger): Boolean =
 	{
 		result match
@@ -409,7 +391,7 @@ object Main
 					didNotExist("action", name)
 		}
 	}
-	
+
 	/** Toggles whether stack traces are enabled.*/
 	private def toggleTrace(project: Project)
 	{
@@ -492,7 +474,6 @@ object Main
 		projects match
 		{
 			case project :: remaining =>
-			{
 				val uninitialized = project.uninitializedProperties.toList
 				if(uninitialized.isEmpty)
 					fillUndefinedProjectProperties(remaining)
@@ -503,43 +484,42 @@ object Main
 					project.saveEnvironment()
 					result
 				}
-			}
 			case Nil => true
 		}
 	}
 	/** Prints the value of the property with the given name in the given project. */
-	private def getProperty(project: Project, propertyName: String)
+	private def getProperty(project: Project, propertyName: String): Boolean =
 	{
 		if(propertyName.isEmpty)
+		{
 			project.log.error("No property name specified.")
+			false
+		}
 		else
 		{
 			project.getPropertyNamed(propertyName) match
 			{
 				case Some(property) =>
-				{
 					property.resolve match
 					{
-						case u: UndefinedValue => project.log.error("Value of property '" + propertyName + "' is undefined.")
-						case ResolutionException(m, e) => project.log.error(m)
-						case DefinedValue(value, isInherited, isDefault) => Console.println(value.toString)
+						case u: UndefinedValue => project.log.error("Value of property '" + propertyName + "' is undefined."); false
+						case ResolutionException(m, e) => project.log.error(m); false
+						case DefinedValue(value, isInherited, isDefault) => Console.println(value.toString); true
 					}
-				}
 				case None =>
-				{
 					val value = System.getProperty(propertyName)
 					if(value == null)
 						project.log.error("No property named '" + propertyName + "' is defined.")
 					else
 						Console.println(value)
-				}
+					value != null
 			}
 		}
 	}
 	/** Separates the space separated property name/value pair and stores the value in the user-defined property
 	* with the given name in the given project.  If no such property exists, the value is stored in a system
 	* property. */
-	private def setProperty(project: Project, propertyNameAndValue: String)
+	private def setProperty(project: Project, propertyNameAndValue: String): Boolean =
 	{
 		val m = """(\S+)(\s+\S.*)?""".r.pattern.matcher(propertyNameAndValue)
 		if(m.matches())
@@ -550,31 +530,33 @@ object Main
 				val v = m.group(2)
 				if(v == null) "" else v.trim
 			}
+			def notePending(changed: String): Unit = Console.println(" Build will use " + changed + newValue + " after running 'reboot' command or restarting sbt.")
 			project.getPropertyNamed(name) match
 			{
 				case Some(property) =>
 				{
-					val succeeded =
-						try
+					try
+					{
+						property.setStringValue(newValue)
+						property match
 						{
-							property.setStringValue(newValue)
-							val isScalaVersion = property == project.scalaVersion
-							val isSbtVersion = property == project.sbtVersion
-							if(isScalaVersion || isSbtVersion)
-							{
-								val changed = if(isSbtVersion) "sbt " else "Scala "
-								Console.println(" Build will use " + changed + newValue + " after running 'reboot' command or restarting sbt.")
-							}
-							else
-								Console.println(" Set property '" + name + "' = '" + newValue + "'")
+							case project.scalaVersion => notePending("Scala ")
+							case project.sbtVersion => notePending("sbt ")
+							case _ =>  Console.println(" Set property '" + name + "' = '" + newValue + "'")
 						}
-						catch { case e => project.log.error("Error setting property '" + name + "' in " + project.environmentLabel + ": " + e.toString) }
-					project.saveEnvironment()
+						true
+					}
+					catch { case e =>
+						project.log.error("Error setting property '" + name + "' in " + project.environmentLabel + ": " + e.toString)
+						false
+					}
+					finally { project.saveEnvironment().foreach(msg => project.log.error("Error saving environment: " + msg)) }
 				}
 				case None =>
 				{
 					System.setProperty(name, newValue)
 					project.log.info(" Set system property '" + name + "' = '" + newValue + "'")
+					true
 				}
 			}
 		}
@@ -583,10 +565,11 @@ object Main
 	}
 
 	private def compileContinuously(project: Project) = executeContinuously(project, "test-compile")
-	private def executeContinuously(project: Project, action: String)
+	private def executeContinuously(project: Project, action: String) =
 	{
 		def shouldTerminate: Boolean = (System.in.available > 0) && (project.terminateWatch(System.in.read()) || shouldTerminate)
-		if(checkAction(project, action))
+		val actionValid = checkAction(project, action)
+		if(actionValid)
 		{
 			SourceModificationWatch.watchUntil(project, ContinuousCompilePollDelaySeconds)(shouldTerminate)
 			{
@@ -595,12 +578,14 @@ object Main
 			}
 			while (System.in.available() > 0) System.in.read()
 		}
+		actionValid
 	}
 
 	private def isTerminateAction(s: String) = TerminateActions.elements.contains(s.toLowerCase)
-	private def setArgumentError(log: Logger) { log.error("Invalid arguments for 'set': expected property name and new value.") }
-	private def getArgumentError(log: Logger) { log.error("Invalid arguments for 'get': expected property name.") }
-	private def setProjectError(log: Logger) { log.error("Invalid arguments for 'project': expected project name.") }
+	private def setArgumentError(log: Logger) = logError(log)("Invalid arguments for 'set': expected property name and new value.")
+	private def getArgumentError(log: Logger) = logError(log)("Invalid arguments for 'get': expected property name.")
+	private def setProjectError(log: Logger) = logError(log)("Invalid arguments for 'project': expected project name.")
+	private def logError(log: Logger)(s: String) = { log.error(s); false }
 }
 private class CrossBuild(val remainingScalaVersions: Set[String], val command: String, val startTime: Long)
 {

From 266e16fafe034804e1c7ce8524a72e84bc1cfd14 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 29 Sep 2009 02:29:25 +0000
Subject: [PATCH 127/268] fix default Scala version in launcher to be 2.7.5

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1063 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build/LoaderProject.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build/LoaderProject.scala b/project/build/LoaderProject.scala
index 14dea8380..69cbe3b61 100644
--- a/project/build/LoaderProject.scala
+++ b/project/build/LoaderProject.scala
@@ -128,7 +128,7 @@ protected/* removes the ambiguity as to which project is the entry point by maki
 	override def mainSourceRoots = super.mainSourceRoots +++ managedSrc
 	override def compileAction = super.compileAction dependsOn(versionProperties)
 	override def cleanAction = cleanTask(outputPath +++ managedSrc, cleanOptions)
-	lazy val versionProperties = task { writeVersionProperties(projectVersion.value.toString, scalaVersion.value.toString)  }
+	lazy val versionProperties = task { writeVersionProperties(projectVersion.value.toString, "2.7.5") }//scalaVersion.value.toString)  }
 	def writeVersionProperties(sbtVersion: String, scalaVersion: String) =
 		FileUtilities.write(defaultVersionPath.asFile, defaultVersions(sbtVersion, scalaVersion), log)
 

From a507d97536bd92fb8c63f8e1f122ee0f35f380a4 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 29 Sep 2009 02:29:56 +0000
Subject: [PATCH 128/268] Set project.version to 0.5.5

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1064 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 42d6f3a7f..06e11773b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Fri Sep 18 14:22:56 EDT 2009
+#Mon Sep 28 21:54:53 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool
 sbt.version=0.5.4
-project.version=0.5.5-SNAPSHOT
+project.version=0.5.5
 scala.version=2.7.2

From 113a22b719409de0b126131b1653a2ff594288d6 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 29 Sep 2009 13:33:26 +0000
Subject: [PATCH 129/268] Add (-classifier) to retrieve pattern, add
 withSources, source, withJavadoc, javadoc method to ModuleID, and add test
 for the sources/javadoc support.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1065 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 src/main/scala/sbt/BasicProjectTypes.scala    |  8 ++--
 src/main/scala/sbt/ManagedInterface.scala     | 38 +++++++++----------
 .../sources/project/build.properties          |  2 +
 .../sources/project/build/Test.scala          | 22 +++++++++++
 .../dependency-management/sources/test        |  5 +++
 5 files changed, 51 insertions(+), 24 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/sources/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/sources/project/build/Test.scala
 create mode 100644 src/sbt-test/dependency-management/sources/test

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 19ee35cd3..4fee79150 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -236,7 +236,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 
 	/** The pattern for Ivy to use when retrieving dependencies into the local project.  Classpath management
 	* depends on the first directory being [conf] and the extension being [ext].*/
-	def outputPattern = "[conf]/[artifact](-[revision]).[ext]"
+	def outputPattern = "[conf]/[artifact](-[revision])(-[classifier]).[ext]"
 	/** Override this to specify the publications, configurations, and/or dependencies sections of an Ivy file.
 	* See http://code.google.com/p/simple-build-tool/wiki/LibraryManagement for details.*/
 	def ivyXML: scala.xml.NodeSeq = scala.xml.NodeSeq.Empty
@@ -381,13 +381,13 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		def this(resolverName: String, status: String) = this(resolverName, status, true)
 		def this(resolver: Resolver, status: String) = this(resolver.name, status)
 
-		protected def deliveredPathPattern = outputPath / "[artifact]-[revision].[ext]"
+		protected def deliveredPathPattern = outputPath / "[artifact]-[revision](-[classifier]).[ext]"
 		def deliveredPattern = deliveredPathPattern.relativePath
 		def srcArtifactPatterns: Iterable[String] =
 		{
 			val pathPatterns =
-				(outputPath / "[artifact]-[revision]-[type].[ext]") ::
-				(outputPath / "[artifact]-[revision].[ext]") ::
+				(outputPath / "[artifact]-[revision]-[type](-[classifier]).[ext]") ::
+				(outputPath / "[artifact]-[revision](-[classifier]).[ext]") ::
 				Nil
 			pathPatterns.map(_.relativePath)
 		}
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
index 407070d99..0274f59da 100644
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ b/src/main/scala/sbt/ManagedInterface.scala
@@ -72,6 +72,12 @@ final case class ModuleID(organization: String, name: String, revision: String,
 	def classifier(c: String) = artifacts(Artifact(name, c))
 	def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts, extraAttributes)
 	def extra(attributes: (String,String)*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, extraAttributes ++ ModuleID.checkE(attributes))
+	def sources() = artifacts(Artifact(name, "sources", "jar", "sources"))
+	def javadoc() = artifacts(Artifact(name, "javadoc", "jar", "javadoc"))
+	def withSources() = jarIfEmpty.sources()
+	def withJavadoc() = jarIfEmpty.javadoc()
+	private def jarIfEmpty = if(explicitArtifacts.isEmpty) jar() else this
+	def jar() = artifacts(Artifact(name, "jar", "jar"))
 }
 object ModuleID
 {
@@ -256,51 +262,42 @@ object Resolver
 	{
 		/** Constructs a file resolver with the given name.  The patterns to use must be explicitly specified
 		* using the `ivys` or `artifacts` methods on the constructed resolver object.*/
-		def apply(name: String): FileRepository = FileRepository(name, defaultFileConfiguration, ivyStylePatterns)
+		def apply(name: String): FileRepository = FileRepository(name, defaultFileConfiguration, Patterns(false))
 		/** Constructs a file resolver with the given name and base directory. */
 		def apply(name: String, baseDirectory: File)(implicit basePatterns: Patterns): FileRepository =
 		{
 			if(baseDirectory.exists && !baseDirectory.isDirectory) error("Not a directory: " + baseDirectory.getAbsolutePath)
-			baseRepository(baseDirectory.toURI)(FileRepository(name, defaultFileConfiguration, _))
+			baseRepository(new File(baseDirectory.toURI.normalize) getAbsolutePath)(FileRepository(name, defaultFileConfiguration, _))
 		}
 	}
 	object url
 	{
 		/** Constructs a URL resolver with the given name.  The patterns to use must be explicitly specified
 		* using the `ivys` or `artifacts` methods on the constructed resolver object.*/
-		def apply(name: String): URLRepository = URLRepository(name, ivyStylePatterns)
+		def apply(name: String): URLRepository = URLRepository(name, Patterns(false))
 		/** Constructs a file resolver with the given name and base directory. */
 		def apply(name: String, baseURL: URL)(implicit basePatterns: Patterns): URLRepository =
-			baseRepository(baseURL.toURI)(URLRepository(name, _))
+			baseRepository(baseURL.toURI.normalize.toString)(URLRepository(name, _))
 	}
-	private def baseRepository[T](baseURI: java.net.URI)(construct: Patterns => T)(implicit basePatterns: Patterns): T =
-		construct(resolvePatterns(normalize(baseURI), basePatterns))
+	private def baseRepository[T](base: String)(construct: Patterns => T)(implicit basePatterns: Patterns): T =
+		construct(resolvePatterns(base, basePatterns))
 
 	/** If `base` is None, `patterns` is returned unchanged.
 	* Otherwise, the ivy file and artifact patterns in `patterns` are resolved against the given base. */
 	private def resolvePatterns(base: Option[String], patterns: Patterns): Patterns =
 		base match
 		{
-			case Some(path) => resolvePatterns(pathURI(path), patterns)
+			case Some(path) => resolvePatterns(path, patterns)
 			case None => patterns
 		}
 	/** Resolves the ivy file and artifact patterns in `patterns` against the given base. */
-	private def resolvePatterns(base: URI, basePatterns: Patterns): Patterns =
+	private def resolvePatterns(base: String, basePatterns: Patterns): Patterns =
 	{
-		def resolve(pattern: String) = base.resolve(pathURI(pattern)).getPath
+		val normBase = base.replace('\\', '/')
+		def resolve(pattern: String) = if(normBase.endsWith("/") || pattern.startsWith("/")) normBase +pattern else normBase + "/" + pattern
 		def resolveAll(patterns: Seq[String]) = patterns.map(resolve)
 		Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible)
 	}
-	/** Normalizes the given URI, which is assumed to represent a directory, even if that directory does not exist.  This method exists
-	* because URI.normalize does not append a slash if the directory does not exist.*/
-	private def normalize(uri: URI) =
-	{
-		val normalized = uri.normalize
-		val normString = normalized.toString
-		if(normString.endsWith("/")) normalized else new URI(normString + "/")
-	}
-	/** Constructs a `URI` with the path component set to `path` and the other components set to null.*/
-	private def pathURI(path: String) = new URI(null, null, path, null)
 
 	def defaultFileConfiguration = FileConfiguration(true, None)
 	def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true)
@@ -308,7 +305,7 @@ object Resolver
 
 	def defaultPatterns = mavenStylePatterns
 	def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
-	def localBasePattern = "[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
+	def localBasePattern = "[organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]"
 
 	def userRoot = System.getProperty("user.home")
 	def userMavenRoot = userRoot + "/.m2/repository/"
@@ -374,6 +371,7 @@ object Artifact
 	def apply(name: String, extra: Map[String,String]): Artifact = Artifact(name, defaultType, defaultExtension, None, Nil, None, extra)
 	def apply(name: String, classifier: String): Artifact = Artifact(name, defaultType, defaultExtension, Some(classifier), Nil, None)
 	def apply(name: String, `type`: String, extension: String): Artifact = Artifact(name, `type`, extension, None, Nil, None)
+	def apply(name: String, `type`: String, extension: String, classifier: String): Artifact = Artifact(name, `type`, extension, Some(classifier), Nil, None)
 	def apply(name: String, url: URL): Artifact =Artifact(name, extract(url, defaultType), extract(url, defaultExtension), None, Nil, Some(url))
 	def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL]): Artifact =
 		Artifact(name, `type`, extension, classifier, configurations, url, Map.empty)
diff --git a/src/sbt-test/dependency-management/sources/project/build.properties b/src/sbt-test/dependency-management/sources/project/build.properties
new file mode 100644
index 000000000..2b4d7e5a1
--- /dev/null
+++ b/src/sbt-test/dependency-management/sources/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/sources/project/build/Test.scala b/src/sbt-test/dependency-management/sources/project/build/Test.scala
new file mode 100644
index 000000000..42f084ff2
--- /dev/null
+++ b/src/sbt-test/dependency-management/sources/project/build/Test.scala
@@ -0,0 +1,22 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	val sourcesOnly = "net.liftweb" % "lift-webkit" % "1.0" % "sources" sources() intransitive()
+	val sourcesAndJar = "org.scalacheck" % "scalacheck" % "1.5" withSources()
+	def expectedCompile = Set("scalacheck-1.5.jar", "scalacheck-1.5-sources.jar")
+	def expectedSources = Set("lift-webkit-1.0-sources.jar")
+	lazy val check = task
+	{
+		val compilePath = names(compileClasspath.get)
+		val sources = names(fullClasspath(Configurations.Sources).get)
+		if(!same(expectedCompile, compilePath))
+			Some("Expected compile classpath " + expectedCompile.mkString(", ") + " differs from actual: " + compilePath.mkString(", "))
+		else if(!same(expectedSources, sources))
+			Some("Expected sources " + expectedSources.mkString(", ") + " differ from actual: " + sources.mkString(", "))
+		else
+			None
+	}
+	def names(path: Iterable[Path]): Set[String] = Set() ++ path.map(_.asFile.getName)
+	def same(expected: Set[String], actual: Set[String]) = (expected -- actual).isEmpty
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/sources/test b/src/sbt-test/dependency-management/sources/test
new file mode 100644
index 000000000..7739dd87c
--- /dev/null
+++ b/src/sbt-test/dependency-management/sources/test
@@ -0,0 +1,5 @@
+> update
+[success]
+
+> check
+[success]
\ No newline at end of file

From 4e15cdcc0bab8e7c47723a3f6514290eeb50e0b8 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Tue, 29 Sep 2009 23:00:29 +0000
Subject: [PATCH 130/268] Build against Scala 2.8 nightly from Sept 29, 2009.

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1066 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build/CrossCompileProject.scala      |  2 +-
 src/main/scala/sbt/Compile.scala             | 20 ++++++++++----------
 src/main/scala/sbt/LineReader.scala          | 14 +++++++-------
 src/main/scala/sbt/ManageDependencies.scala  |  2 +-
 src/main/scala/sbt/classfile/ClassFile.scala | 10 +++++-----
 src/main/scala/sbt/classfile/Parser.scala    | 14 +++++++-------
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
index a0cbba756..e9bb4a1ef 100644
--- a/project/build/CrossCompileProject.scala
+++ b/project/build/CrossCompileProject.scala
@@ -13,7 +13,7 @@ abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScal
 	private val version2_7_4 = "2.7.4"
 	private val version2_7_5 = "2.7.5"
 	private val version2_7_6 = "2.7.6"
-	private val version2_8_0 = "2.8.0-20090910.003346-+"
+	private val version2_8_0 = "2.8.0-20090929.004247-+"
 	private val base = "base"
 
 	/* The configurations for the versions of Scala.*/
diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index 848f9f1fc..4abcc1c1d 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -17,7 +17,7 @@ sealed abstract class CompilerCore
 {
 	val ClasspathOptionString = "-classpath"
 	val OutputOptionString = "-d"
-	
+
 	// Returns false if there were errors, true if there were not.
 	protected def process(args: List[String], log: Logger): Boolean
 	// Returns false if there were errors, true if there were not.
@@ -27,7 +27,7 @@ sealed abstract class CompilerCore
 	def actionNothingToDoMessage: String
 	def actionSuccessfulMessage: String
 	def actionUnsuccessfulMessage: String
-	
+
 	private def classpathString(rawClasspathString: String, includeScala: Boolean) =
 		if(includeScala)
 			List(rawClasspathString, scalaClasspathForJava).mkString(File.pathSeparator)
@@ -51,7 +51,7 @@ sealed abstract class CompilerCore
 		FileUtilities.createDirectory(outputDir, log) orElse
 		{
 			def classpathAndOut(javac: Boolean): List[String] = OutputOptionString :: outputDir.getAbsolutePath :: classpathOption(javac)
-			
+
 			Control.trapUnit("Compiler error: ", log)
 			{
 				val sourceList = sources.map(_.asFile.getAbsolutePath).toList
@@ -87,7 +87,7 @@ sealed abstract class CompilerCore
 						val javaSourceList = filteredSources(".java")
 						compile("Java", javaSourceList, javaOptions, true)(processJava)
 					}
-					
+
 					val (first, second) = if(order == CompileOrder.JavaThenScala) (javaCompile, scalaCompile) else (scalaCompile, javaCompile)
 					if(first() && second())
 					{
@@ -157,7 +157,7 @@ final class Compile(maximumErrors: Int) extends CompilerBase
 		var reporter = new LoggerReporter(maximumErrors, log)
 		val settings = new Settings(reporter.error)
 		val command = new CompilerCommand(arguments, settings, error, false)
-		
+
 		object compiler extends Global(command.settings, reporter)
 		if(!reporter.hasErrors)
 		{
@@ -212,7 +212,7 @@ final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.
 {
 	import scala.tools.nsc.util.{FakePos,NoPosition,Position}
 	private val positions = new scala.collection.mutable.HashMap[Position, Severity]
-	
+
 	def error(msg: String) { error(FakePos("scalac"), msg) }
 
 	def printSummary()
@@ -222,7 +222,7 @@ final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.
 		if(ERROR.count > 0)
 			log.error(countElementsAsString(ERROR.count, "error") + " found")
 	}
-	
+
 	def display(pos: Position, msg: String, severity: Severity)
 	{
 		severity.count += 1
@@ -236,7 +236,7 @@ final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.
 			case WARNING => Level.Warn
 			case INFO => Level.Info
 		}
-	
+
 	private def print(level: Level.Value, posIn: Position, msg: String)
 	{
 		// the implicits keep source compatibility with the changes in 2.8 : Position.{source,line,column} are no longer Options
@@ -265,7 +265,7 @@ final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.
 					for(offset <- pos.offset; src <- pos.source)
 					{
 						val pointer = offset - src.lineToOffset(src.offsetToLine(offset))
-						val pointerSpace = lineContent.take(pointer).map { case '\t' => '\t'; case x => ' ' }
+						val pointerSpace = (lineContent: Seq[Char]).take(pointer).map { case '\t' => '\t'; case _ => ' ' }
 						log.log(level, pointerSpace.mkString + "^") // pointer to the column position of the error/warning
 					}
 				}
@@ -289,7 +289,7 @@ final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.
 			case _ => display(pos, msg, severity)
 		}
 	}
-	
+
 	private def testAndLog(pos: Position, severity: Severity): Boolean =
 	{
 		if(pos == null || pos.offset.isEmpty)
diff --git a/src/main/scala/sbt/LineReader.scala b/src/main/scala/sbt/LineReader.scala
index 614fd117e..2bd655bef 100644
--- a/src/main/scala/sbt/LineReader.scala
+++ b/src/main/scala/sbt/LineReader.scala
@@ -52,12 +52,12 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
 {
 	import completors._
 	import jline.{ArgumentCompletor, Completor, MultiCompletor, NullCompletor, SimpleCompletor}
-	
+
 	private val generalCompletor = simpleCompletor(generalCommands)
 	private val projectCompletor = simpleArgumentCompletor(projectAction :: Nil, projectNames)
-		
+
 	private val completor = new MultiCompletor()
-	
+
 	protected[this] val reader =
 	{
 		val cr = new ConsoleReader
@@ -74,14 +74,14 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
 		cr.addCompletor(completor)
 		cr
 	}
-	
+
 	/** Used for a single argument so that the argument can have spaces in it.*/
 	object SingleArgumentDelimiter extends ArgumentCompletor.AbstractArgumentDelimiter
 	{
 		def isDelimiterChar(buffer: String, pos: Int) =
 			(buffer.charAt(pos) == ' ') && buffer.substring(0, pos).trim.indexOf(' ') == -1
 	}
-	
+
 	private def simpleCompletor(completions: Iterable[String]) = new SimpleCompletor(completions.toList.toArray)
 	private def simpleArgumentCompletor(first: Iterable[String], second: Iterable[String]) =
 		singleArgumentCompletor(simpleCompletor(first), simpleCompletor(second))
@@ -98,11 +98,11 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
 		c.setStrict(true)
 		c
 	}
-	
+
 	private def propertyCompletor(propertyNames: Iterable[String]) =
 		simpleArgumentCompletor(propertyActions, propertyNames)
 	private def prefixedCompletor(baseCompletor: Completor) =
-		singleArgumentCompletor(simpleCompletor(prefixes.toList.toArray), baseCompletor)
+		singleArgumentCompletor(simpleCompletor(prefixes.toList.toArray[String]), baseCompletor)
 	def setVariableCompletions(taskNames: Iterable[String], propertyNames: Iterable[String], extra: Iterable[(String, Iterable[String])] )
 	{
 		import scala.collection.immutable.TreeSet
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 49c9d4b91..d0ad1b205 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -533,7 +533,7 @@ object ManageDependencies
 	}
 	private def addArtifacts(moduleID: DefaultModuleDescriptor, artifacts: Iterable[Artifact])
 	{
-		val allConfigurations = moduleID.getPublicConfigurationsNames
+		val allConfigurations = moduleID.getPublicConfigurationsNames.toSeq
 		for(artifact <- artifacts)
 		{
 			val configurationStrings =
diff --git a/src/main/scala/sbt/classfile/ClassFile.scala b/src/main/scala/sbt/classfile/ClassFile.scala
index a9fa3441a..df004c855 100644
--- a/src/main/scala/sbt/classfile/ClassFile.scala
+++ b/src/main/scala/sbt/classfile/ClassFile.scala
@@ -13,12 +13,12 @@ private[sbt] trait ClassFile
 	val fileName: String
 	val className: String
 	val superClassName: String
-	val interfaceNames: RandomAccessSeq[String]
+	val interfaceNames: Array[String]
 	val accessFlags: Int
-	val constantPool: RandomAccessSeq[Constant]
-	val fields: RandomAccessSeq[FieldOrMethodInfo]
-	val methods: RandomAccessSeq[FieldOrMethodInfo]
-	val attributes: RandomAccessSeq[AttributeInfo]
+	val constantPool: Array[Constant]
+	val fields: Array[FieldOrMethodInfo]
+	val methods: Array[FieldOrMethodInfo]
+	val attributes: Array[AttributeInfo]
 	val sourceFile: Option[String]
 	def types: Set[String]
 	def stringValue(a: AttributeInfo): String
diff --git a/src/main/scala/sbt/classfile/Parser.scala b/src/main/scala/sbt/classfile/Parser.scala
index c2c4cb52a..b4c85fada 100644
--- a/src/main/scala/sbt/classfile/Parser.scala
+++ b/src/main/scala/sbt/classfile/Parser.scala
@@ -23,7 +23,7 @@ private[sbt] object Parser
 		new ClassFile
 		{
 			assume(in.readInt() == JavaMagic, "Invalid class file: " + fileName)
-			
+
 			val fileName = filename
 			val minorVersion: Int = in.readUnsignedShort()
 			val majorVersion: Int = in.readUnsignedShort()
@@ -81,10 +81,10 @@ private[sbt] object Parser
 				fieldsOrMethods.flatMap { fieldOrMethod =>
 					descriptorToTypes(fieldOrMethod.descriptor)
 				}
-			
+
 			private def fieldTypes = getTypes(fields)
 			private def methodTypes = getTypes(methods)
-			
+
 			private def classConstantReferences =
 				constants.flatMap { constant =>
 					constant.tag match
@@ -119,7 +119,7 @@ private[sbt] object Parser
 	{
 		val constantPoolSize = in.readUnsignedShort()
 		val pool = new Array[Constant](constantPoolSize)
-		
+
 		def parse(i: Int): Unit =
 			if(i < constantPoolSize)
 			{
@@ -127,8 +127,8 @@ private[sbt] object Parser
 				pool(i) = constant
 				parse( if(constant.wide) i+2 else i+1 )
 			}
-		
-		parse(1) // to lookup: why 1?
+
+		parse(1)
 		pool
 	}
 
@@ -138,7 +138,7 @@ private[sbt] object Parser
 		tag match
 		{
 			case ConstantClass | ConstantString => new Constant(tag, in.readUnsignedShort())
-			case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType => 
+			case ConstantField | ConstantMethod | ConstantInterfaceMethod | ConstantNameAndType =>
 				new Constant(tag, in.readUnsignedShort(), in.readUnsignedShort())
 			case ConstantInteger => new Constant(tag, new java.lang.Integer(in.readInt()))
 			case ConstantFloat => new Constant(tag, new java.lang.Float(in.readFloat()))

From 705d61d1e38af1698a758e79c72e4f45c392742f Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Wed, 30 Sep 2009 00:46:08 +0000
Subject: [PATCH 131/268] Bumping versions

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1072 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 06e11773b..d7653ac2b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Mon Sep 28 21:54:53 EDT 2009
+#Tue Sep 29 20:46:06 EDT 2009
 project.organization=sbt
 project.name=Simple Build Tool
-sbt.version=0.5.4
-project.version=0.5.5
+sbt.version=0.5.5
+project.version=0.5.6-SNAPSHOT
 scala.version=2.7.2

From 0147545668c151b1d618685a289807949f663d60 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 3 Oct 2009 14:48:23 +0000
Subject: [PATCH 132/268] Quote paths in proguard configuration

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1078 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 project/build/LoaderProject.scala | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/project/build/LoaderProject.scala b/project/build/LoaderProject.scala
index 69cbe3b61..785b4b730 100644
--- a/project/build/LoaderProject.scala
+++ b/project/build/LoaderProject.scala
@@ -69,7 +69,7 @@ protected/* removes the ambiguity as to which project is the entry point by maki
 				|    public static void main(java.lang.String[]);
 				|}"""
 			
-			val defaultJar = (outputPath / defaultJarName).asFile.getAbsolutePath
+			val defaultJar = mkpath((outputPath / defaultJarName).asFile)
 			log.debug("proguard configuration using main jar " + defaultJar)
 			val ivyKeepOptions = ivyKeepResolvers.map("-keep public class " + _  + allPublic).mkString("\n")
 			val runtimeClasspath = runClasspath.get.map(_.asFile).toList
@@ -88,19 +88,21 @@ protected/* removes the ambiguity as to which project is the entry point by maki
 			//    include the version of JLine from the compiler.
 			val includeExternalJars = externalJarsNoIvy.filter(jar => !isJarX(jar, "scala-compiler"))
 			// exclude properties files and manifests from scala-library jar
-			val inJars = (defaultJar :: includeExternalJars.map( _ + "(!META-INF/**,!*.properties)")).map("-injars " + _).mkString("\n")
+			val inJars = (defaultJar :: includeExternalJars.map(f => mkpath(f) + "(!META-INF/**,!*.properties)")).map("-injars " + _).mkString("\n")
 			
 			withJar(ivyJars, "Ivy") { ivyJar =>
 				withJar(jlineJars, "JLine") { jlineJar =>
 					val proguardConfiguration =
-						outTemplate.stripMargin.format(libraryJars.mkString(File.pathSeparator),
-							ivyJar.getAbsolutePath, jlineJar.getAbsolutePath,
-							inJars, outputJar.absolutePath, ivyKeepOptions, keepJLine, mainClassName)
+						outTemplate.stripMargin.format(mkpaths(libraryJars),
+							mkpath(ivyJar), mkpath(jlineJar),
+							inJars, mkpath(outputJar.asFile), ivyKeepOptions, keepJLine, mainClassName)
 					log.debug("Proguard configuration written to " + proguardConfigurationPath)
 					FileUtilities.write(proguardConfigurationPath.asFile, proguardConfiguration, log)
 				}
 			}
 		}
+	private def mkpaths(f: Seq[File]) = f.map(mkpath).mkString(File.separator)
+	private def mkpath(f: File) = '\"' + f.getAbsolutePath + '\"'
 	private def withJar(files: List[File], name: String)(f: File => Option[String]): Option[String] =
 		files match
 		{

From 776efa91003df5df134ef67eecd93bf4a2437f51 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Sat, 3 Oct 2009 15:44:29 +0000
Subject: [PATCH 133/268] Clean up publish-local test

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1079 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../publish-local/project/build/MultiPublishTest.scala           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
index af013d8ee..fadb0a30f 100644
--- a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
+++ b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
@@ -18,6 +18,5 @@ class MultiPublishTest(info: ProjectInfo) extends ParentProject(info)
 				ManagedStyle.Maven
 			else
 				ManagedStyle.Auto
-		val publishTo = "Scala Tools Nexus" at (outputPath / "test-repo").absolutePath
 	}
 }
\ No newline at end of file

From 9bb813a2fc253f5a54370adac881df14279ac20a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 9 Oct 2009 19:31:55 -0400
Subject: [PATCH 134/268] Use xsbt for launch, compile, run, console, and doc.
 Build Scala version can now be different from the version used by sbt and the
 project definition. Remove sbt compiler plugin, which is now provided by xsbt

---
 boot/LICENSE                                |  25 --
 boot/NOTICE                                 |  35 --
 boot/lib/jline-0.9.94.jar                   | Bin 87325 -> 0 bytes
 boot/licenses/LICENSE_Ivy                   | 258 ------------
 boot/licenses/LICENSE_JLine                 |  33 --
 boot/licenses/LICENSE_Scala                 |  35 --
 boot/src/main/scala/Boot.scala              | 350 ----------------
 boot/src/main/scala/BootConfiguration.scala |  96 -----
 boot/src/main/scala/FilteredLoader.scala    |  20 -
 boot/src/main/scala/ProjectProperties.scala | 147 -------
 boot/src/main/scala/SimpleReader.scala      |  26 --
 boot/src/main/scala/Update.scala            | 273 ------------
 ivysettings.xml                             |  20 -
 project/build.properties                    |   6 +-
 project/build/CrossCompileProject.scala     | 217 ----------
 project/build/LoaderProject.scala           | 151 -------
 project/build/ReleaseProject.scala          |   4 +-
 project/build/SbtProject.scala              | 104 ++++-
 project/plugins/Plugins.scala               |   6 -
 src/main/scala/sbt/Analyzer.scala           | 246 -----------
 src/main/scala/sbt/BasicProjectTypes.scala  |   2 +-
 src/main/scala/sbt/BuilderProject.scala     |  32 +-
 src/main/scala/sbt/Compile.scala            | 331 ++++-----------
 src/main/scala/sbt/Conditional.scala        |  72 ++--
 src/main/scala/sbt/DefaultProject.scala     |  37 +-
 src/main/scala/sbt/Environment.scala        |  56 +--
 src/main/scala/sbt/IntegrationTesting.scala |  12 +-
 src/main/scala/sbt/Logger.scala             |  37 +-
 src/main/scala/sbt/Main.scala               | 442 ++++++++------------
 src/main/scala/sbt/Project.scala            | 120 +++---
 src/main/scala/sbt/ProjectInfo.scala        |  14 +-
 src/main/scala/sbt/Resources.scala          |  20 +-
 src/main/scala/sbt/Run.scala                |  73 +---
 src/main/scala/sbt/ScalaProject.scala       |  58 ++-
 src/main/scala/sbt/ScalaVersion.scala       |  47 ---
 src/main/scala/sbt/WebApp.scala             |  29 +-
 36 files changed, 619 insertions(+), 2815 deletions(-)
 delete mode 100644 boot/LICENSE
 delete mode 100644 boot/NOTICE
 delete mode 100644 boot/lib/jline-0.9.94.jar
 delete mode 100644 boot/licenses/LICENSE_Ivy
 delete mode 100644 boot/licenses/LICENSE_JLine
 delete mode 100644 boot/licenses/LICENSE_Scala
 delete mode 100755 boot/src/main/scala/Boot.scala
 delete mode 100644 boot/src/main/scala/BootConfiguration.scala
 delete mode 100644 boot/src/main/scala/FilteredLoader.scala
 delete mode 100644 boot/src/main/scala/ProjectProperties.scala
 delete mode 100644 boot/src/main/scala/SimpleReader.scala
 delete mode 100644 boot/src/main/scala/Update.scala
 delete mode 100644 ivysettings.xml
 delete mode 100644 project/build/CrossCompileProject.scala
 delete mode 100644 project/build/LoaderProject.scala
 delete mode 100644 project/plugins/Plugins.scala
 delete mode 100644 src/main/scala/sbt/Analyzer.scala
 delete mode 100644 src/main/scala/sbt/ScalaVersion.scala

diff --git a/boot/LICENSE b/boot/LICENSE
deleted file mode 100644
index 6e0b0067b..000000000
--- a/boot/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2009 Mark Harrah
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
diff --git a/boot/NOTICE b/boot/NOTICE
deleted file mode 100644
index b2378b336..000000000
--- a/boot/NOTICE
+++ /dev/null
@@ -1,35 +0,0 @@
-Simple Build Tool (sbt)
-Copyright 2009 Mark Harrah
-
-Parts of the Scala library are distributed with sbt:
-Copyright 2002-2008 EPFL, Lausanne
-Licensed under BSD-style license (see licenses/LICENSE_Scala)
-
-JLine is distributed with sbt:
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
-Licensed under BSD-style license (see licenses/LICENSE_JLine)
-
-Apache Ivy, licensed under the Apache License, Version 2.0
-(see licenses/LICENSE_Apache) is distributed with sbt and
-requires the following notice:
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of Ivy were originally developed by
-Jayasoft SARL (http://www.jayasoft.fr/)
-and are licensed to the Apache Software Foundation under the
-"Software Grant License Agreement"
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
diff --git a/boot/lib/jline-0.9.94.jar b/boot/lib/jline-0.9.94.jar
deleted file mode 100644
index dede3721dee71225c942ebcfa4e38250e1e893c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87325
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
a1kFQkg0cdOEMRZ};T&L9pX~<BehdIIJx1>U

diff --git a/boot/licenses/LICENSE_Ivy b/boot/licenses/LICENSE_Ivy
deleted file mode 100644
index a73dda8d7..000000000
--- a/boot/licenses/LICENSE_Ivy
+++ /dev/null
@@ -1,258 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-------------------------------------------------------------------------------
-License for JCraft JSch package
-------------------------------------------------------------------------------
-Copyright (c) 2002,2003,2004,2005,2006,2007 Atsuhiko Yamanaka, JCraft,Inc. 
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright 
-     notice, this list of conditions and the following disclaimer in 
-     the documentation and/or other materials provided with the distribution.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-
-------------------------------------------------------------------------------
-License for jQuery
-------------------------------------------------------------------------------
-Copyright (c) 2007 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
\ No newline at end of file
diff --git a/boot/licenses/LICENSE_JLine b/boot/licenses/LICENSE_JLine
deleted file mode 100644
index 1cdc44c21..000000000
--- a/boot/licenses/LICENSE_JLine
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/boot/licenses/LICENSE_Scala b/boot/licenses/LICENSE_Scala
deleted file mode 100644
index 968bcd6e9..000000000
--- a/boot/licenses/LICENSE_Scala
+++ /dev/null
@@ -1,35 +0,0 @@
-SCALA LICENSE
-
-Copyright (c) 2002-2008 EPFL, Lausanne, unless otherwise specified.
-All rights reserved.
-
-This software was developed by the Programming Methods Laboratory of the
-Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
-
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-   3. Neither the name of the EPFL nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
\ No newline at end of file
diff --git a/boot/src/main/scala/Boot.scala b/boot/src/main/scala/Boot.scala
deleted file mode 100755
index 9cf5f652f..000000000
--- a/boot/src/main/scala/Boot.scala
+++ /dev/null
@@ -1,350 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
- */
- package sbt.boot
-
-// This is the main class for the sbt launcher.  Its purpose is to ensure the appropriate
-// versions of sbt and scala are downloaded to the projects 'project/boot' directory.
-// Then, the downloaded version of sbt is started as usual using the right version of
-// scala.
-
-// Artifact names must be consistent between the main sbt build and this build.
-
-import java.io.{File, FileFilter}
-import java.net.{MalformedURLException, URL, URLClassLoader}
-
-// contains constants and paths
-import BootConfiguration._
-import UpdateTarget.{UpdateScala, UpdateSbt}
-
-// The exception to use when an error occurs at the launcher level (and not a nested exception).
-// This indicates overrides toString because the exception class name is not needed to understand
-// the error message.
-private class BootException(override val toString: String) extends RuntimeException
-// The entry point to the launcher
-object Boot
-{
-	def main(args: Array[String])
-	{
-		System.setProperty("sbt.boot", true.toString)
-		val found = Paths.projectSearch().getCanonicalPath
-		System.setProperty("user.dir", found)
-		checkProxy()
-		try { boot(args) }
-		catch
-		{
-			case b: BootException => errorAndExit(b)
-			case e =>
-				e.printStackTrace
-				errorAndExit(e)
-		}
-		System.exit(0)
-	}
-	private def errorAndExit(e: Throwable)
-	{
-		System.out.println("Error during sbt execution: " + e.toString)
-		System.exit(1)
-	}
-	def boot(args: Array[String])
-	{
-		 // prompt to create project if it doesn't exist.
-		 // will not return if user declines
-		(new Paths).checkProject()
-		val loaderCache = new LoaderCache
-		if(args.length == 0)
-			load(args, loaderCache) // interactive mode, which can only use one version of scala for a run
-		else
-			runBatch(args.toList, Nil, loaderCache)  // batch mode, which can reboot with a different scala version
-	}
-	private def runBatch(args: List[String], accumulateReversed: List[String], loaderCache: LoaderCache)
-	{
-		def doLoad() = if(!accumulateReversed.isEmpty) load(accumulateReversed.reverse.toArray, loaderCache)
-		args match
-		{
-			case Nil => doLoad()
-			case RebootCommand :: tail =>
-				doLoad()
-				runBatch(tail, Nil, loaderCache)
-			case action :: tail if action.trim.startsWith(CrossBuildPrefix) =>
-				doLoad()
-				load(Array(action), loaderCache) // call main with the single cross-build argument, preserving the '+' prefix, with which it knows what to do
-				runBatch(tail, Nil, loaderCache)
-			case notReload :: tail => runBatch(tail, notReload :: accumulateReversed, loaderCache)
-		}
-	}
-	/** Loads the project in the current working directory using the version of scala and sbt
-	* declared in the build. The class loader used prevents the Scala and Ivy classes used by
-	* this loader from being seen by the loaded sbt/project.*/
-	private def load(args: Array[String], loaderCache: LoaderCache)
-	{
-		val loader = (new Setup(loaderCache)).loader()
-		val sbtMain = Class.forName(SbtMainClass, true, loader)
-		val exitCode = run(sbtMain, args)
-		if(exitCode == NormalExitCode)
-			()
-		else if(exitCode == RebootExitCode)
-			load(args, loaderCache)
-		else
-			System.exit(exitCode)
-	}
-	private def run(sbtMain: Class[_], args: Array[String]): Int =
-	{
-		try {
-			// Versions newer than 0.3.8 enter through the run method, which does not call System.exit
-			val runMethod = sbtMain.getMethod(MainMethodName, classOf[Array[String]])
-			runMethod.invoke(null, Array(args) : _*).asInstanceOf[Int]
-		} catch {
-			case e: NoSuchMethodException => runOld(sbtMain, args)
-		}
-	}
-	/** The entry point for version 0.3.8 was the main method. */
-	private def runOld(sbtMain: Class[_], args: Array[String]): Int =
-	{
-		val runMethod = sbtMain.getMethod(OldMainMethodName, classOf[Array[String]])
-		runMethod.invoke(null, Array(args) : _*)
-		NormalExitCode
-	}
-	
-	private def checkProxy()
-	{
-		import ProxyProperties._
-		val httpProxy = System.getenv(HttpProxyEnv)
-		if(isDefined(httpProxy) && !isPropertyDefined(ProxyHost) && !isPropertyDefined(ProxyPort))
-		{
-			try
-			{
-				val proxy = new URL(httpProxy)
-				setProperty(ProxyHost, proxy.getHost)
-				val port = proxy.getPort
-				if(port >= 0)
-					System.setProperty(ProxyPort, port.toString)
-				copyEnv(HttpProxyUser, ProxyUser)
-				copyEnv(HttpProxyPassword, ProxyPassword)
-			}
-			catch
-			{
-				case e: MalformedURLException =>
-					System.out.println("Warning: could not parse http_proxy setting: " + e.toString)
-			}
-		}
-	}
-	private def copyEnv(envKey: String, sysKey: String) { setProperty(sysKey, System.getenv(envKey)) }
-	private def setProperty(key: String, value: String) { if(value != null) System.setProperty(key, value) }
-	private def isPropertyDefined(k: String) = isDefined(System.getProperty(k))
-	private def isDefined(s: String) = s != null && !s.isEmpty
-}
-
-object Paths
-{
-	val Only = "only"
-	val RootFirst = "root-first"
-	val Nearest = "nearest"
-	val NoSearch = "none"
-	val SearchPropertyName = "sbt.boot.search"
-	def projectSearch() =
-	{
-		val current = (new File(".")) getCanonicalFile
-		lazy val fromRoot = path(current, Nil).filter(hasProject).map(_.getCanonicalFile)
-		val found: Option[File] =
-			(System.getProperty(SearchPropertyName, NoSearch).trim.toLowerCase match
-			{
-				case RootFirst => fromRoot.headOption
-				case Nearest => fromRoot.reverse.headOption
-				case Only =>
-					if(hasProject(current))
-						Some(current)
-					else
-						fromRoot match
-						{
-							case Nil => Some(current)
-							case head :: Nil => Some(head)
-							case xs =>
-								System.err.println("Search method is 'only' and multiple ancestor directories contain project/build.properties:\n\t" + fromRoot.mkString("\n\t"))
-								System.exit(1)
-						        None
-						}
-				case _ => Some(current)
-			})
-		found.getOrElse(current)
-	}
-	private def hasProject(f: File) = new Paths(f) hasPropertiesFile
-	private def path(f: File, acc: List[File]): List[File] = if(f eq null) acc else path(f.getParentFile, f :: acc)
-}
-private class Paths(baseDirectory: File) extends NotNull
-{
-	def this() = this(new File(".") getCanonicalFile)
-	protected final val ProjectDirectory = new File(baseDirectory, ProjectDirectoryName)
-	protected final val BootDirectory = new File(ProjectDirectory, BootDirectoryName)
-	protected final val PropertiesFile = new File(ProjectDirectory, BuildPropertiesName)
-
-	final def hasPropertiesFile = PropertiesFile.exists
-	final def checkProject()
-	{
-		if(!ProjectDirectory.exists)
-		{
-			val line = SimpleReader.readLine("Project does not exist, create new project? (y/N/s) : ")
-			if(Setup.isYes(line))
-				ProjectProperties(PropertiesFile, true)
-			else if(Setup.isScratch(line))
-				ProjectProperties.scratch(PropertiesFile)
-			else
-				System.exit(1)
-		}
-	}
-}
-/** A class to handle setting up the properties and classpath of the project
-* before it is loaded. */
-private class Setup(loaderCache: LoaderCache) extends Paths
-{
-	/** Checks that the requested version of sbt and scala have been downloaded.
-	* It performs a simple check that the appropriate directories exist.  It uses Ivy
-	* to resolve and retrieve any necessary libraries. The classpath to use is returned.*/
-	final def loader(): ClassLoader = loader(Nil)
-	private final def loader(forcePrompt: Seq[String]): ClassLoader =
-	{
-		val (normalScalaVersion, sbtVersion) = ProjectProperties.forcePrompt(PropertiesFile, forcePrompt : _*)
-		val scalaVersion = crossScalaVersion(normalScalaVersion)
-		loaderCache( scalaVersion, sbtVersion ) match
-		{
-			case Some(existingLoader) =>
-			{
-				setScalaVersion(scalaVersion)
-				existingLoader
-			}
-			case None =>
-			{
-				getLoader(scalaVersion, sbtVersion) match
-				{
-					case Left(retry) => loader(retry)
-					case Right(classLoader) => classLoader
-				}
-			}
-		}
-	}
-	private def crossScalaVersion(simpleScalaVersion: String): String =
-	{
-		val crossScalaVersion = System.getProperty(SbtScalaVersionKey)
-		if(crossScalaVersion == null || crossScalaVersion.isEmpty)
-			simpleScalaVersion
-		else
-			crossScalaVersion
-	}
-	private def getLoader(scalaVersion: String, sbtVersion: String): Either[Seq[String], ClassLoader] =
-	{
-		import Setup.{failIfMissing,isYes,needsUpdate}
-		import ProjectProperties.{ScalaVersionKey, SbtVersionKey}
-	
-		val baseDirectory = new File(BootDirectory, baseDirectoryName(scalaVersion))
-		System.setProperty(ScalaHomeProperty, baseDirectory.getAbsolutePath)
-		val scalaDirectory = new File(baseDirectory, ScalaDirectoryName)
-		val sbtDirectory = new File(baseDirectory, sbtDirectoryName(sbtVersion))
-		
-		val classLoader = createLoader(scalaDirectory, sbtDirectory)
-		val updateTargets = needsUpdate("", classLoader, TestLoadScalaClasses, UpdateScala) ::: needsUpdate(sbtVersion, classLoader, TestLoadSbtClasses, UpdateSbt)
-		if(updateTargets.isEmpty) // avoid loading Ivy related classes if there is nothing to update
-			success(classLoader, scalaVersion, sbtVersion)
-		else
-		{
-			Update(baseDirectory, sbtVersion, scalaVersion, updateTargets: _*)
-		
-			val classLoader = createLoader(scalaDirectory, sbtDirectory)
-			val sbtFailed = failIfMissing(classLoader, TestLoadSbtClasses, "sbt " + sbtVersion, SbtVersionKey)
-			val scalaFailed = failIfMissing(classLoader, TestLoadScalaClasses, "Scala " + scalaVersion, ScalaVersionKey)
-			
-			(scalaFailed +++ sbtFailed) match
-			{
-				case Success => success(classLoader, scalaVersion, sbtVersion)
-				case f: Failure =>
-					val noRetrieveMessage = "Could not retrieve " + f.label + "."
-					val getNewVersions = SimpleReader.readLine(noRetrieveMessage + " Select different version? (y/N) : ")
-					if(isYes(getNewVersions))
-						Left(f.keys)
-					else
-						throw new BootException(noRetrieveMessage)
-			}
-		}
-	}
-	private def success(classLoader: ClassLoader, scalaVersion: String, sbtVersion: String) =
-	{
-		setScalaVersion(scalaVersion)
-		loaderCache( scalaVersion, sbtVersion ) = classLoader
-		Right(classLoader)
-	}
-	private def createLoader(dirs: File*) =
-	{
-		val classpath = Setup.getJars(dirs : _*)
-		new URLClassLoader(classpath.toArray, new BootFilteredLoader)
-	}
-	private def setScalaVersion(scalaVersion: String) { System.setProperty(SbtScalaVersionKey, scalaVersion) }
-}
-private final class LoaderCache
-{
-	private[this] var cachedSbtVersion: Option[String] = None
-	private[this] val loaderMap = new scala.collection.mutable.HashMap[String, ClassLoader]
-	def apply(scalaVersion: String, sbtVersion: String): Option[ClassLoader] =
-	{
-		cachedSbtVersion flatMap { currentSbtVersion =>
-			if(sbtVersion == currentSbtVersion)
-				loaderMap.get(scalaVersion)
-			else
-				None
-		}
-	}
-	def update(scalaVersion: String, sbtVersion: String, loader: ClassLoader)
-	{
-		for(currentSbtVersion <- cachedSbtVersion)
-		{
-			if(sbtVersion != currentSbtVersion)
-				loaderMap.clear()
-		}
-		cachedSbtVersion = Some(sbtVersion)
-		loaderMap(scalaVersion) = loader
-	}
-}
-private object Setup
-{
-	private def failIfMissing(loader: ClassLoader, classes: Iterable[String], label: String, key: String) = checkTarget(loader, classes, Success, new Failure(label, List(key)))
-	private def needsUpdate(version: String, loader: ClassLoader, classes: Iterable[String], target: UpdateTarget.Value) =
-		if(version.endsWith("-SNAPSHOT"))
-			target :: Nil
-		else
-			checkTarget(loader, classes, Nil, target :: Nil)
-	private def checkTarget[T](loader: ClassLoader, classes: Iterable[String], ifSuccess: => T, ifFailure: => T): T =
-	{
-		try
-		{
-			for(c <- classes)
-				Class.forName(c, false, loader)
-			ifSuccess
-		}
-		catch { case e: ClassNotFoundException => ifFailure }
-	}
-	def isYes(so: Option[String]) = isValue("y", "yes")(so)
-	def isScratch(so: Option[String]) = isValue("s", "scratch")(so)
-	def isValue(values: String*)(so: Option[String]) =
-		so match
-		{
-			case Some(s) => values.contains(s.toLowerCase)
-			case None => false
-		}
-	private def getJars(directories: File*) = directories.flatMap(file => wrapNull(file.listFiles(JarFilter))).map(_.toURI.toURL)
-	private def wrapNull(a: Array[File]): Array[File] = if(a == null) Array() else a
-}
-
-
-private object JarFilter extends FileFilter
-{
-	def accept(file: File) = !file.isDirectory && file.getName.endsWith(".jar")
-}
-
-private sealed trait Checked extends NotNull { def +++(o: Checked): Checked }
-private final object Success extends Checked { def +++(o: Checked) = o }
-private final class Failure(val label: String, val keys: List[String]) extends Checked
-{
-	def +++(o: Checked) =
-		o match
-		{
-			case Success => this
-			case f: Failure => new Failure(label + " and " + f.label, keys ::: f.keys)
-		}
-}
\ No newline at end of file
diff --git a/boot/src/main/scala/BootConfiguration.scala b/boot/src/main/scala/BootConfiguration.scala
deleted file mode 100644
index 9fcf74802..000000000
--- a/boot/src/main/scala/BootConfiguration.scala
+++ /dev/null
@@ -1,96 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
- */
- package sbt.boot
-
-// project/boot/                [BootDirectoryName]
-//     scala-<version>/    [baseDirectoryName]
-//          lib/                      [ScalaDirectoryName]
-//          sbt-<version>/  [sbtDirectoryName]
-//
-// see also ProjectProperties for the set of constants that apply to the build.properties file in a project
-private object BootConfiguration
-{
-	val SbtMainClass = "sbt.Main"
-	val MainMethodName = "run"
-	val OldMainMethodName = "main"
-	
-	// these are the module identifiers to resolve/retrieve
-	val ScalaOrg = "org.scala-lang"
-	val SbtOrg = "sbt"
-	val CompilerModuleName = "scala-compiler"
-	val LibraryModuleName = "scala-library"
-	val SbtModuleName = "simple-build-tool"
-	
-	/** The Ivy conflict manager to use for updating.*/
-	val ConflictManagerName = "strict"
-	/** The name of the local Ivy repository, which is used when compiling sbt from source.*/
-	val LocalIvyName = "local"
-	/** The pattern used for the local Ivy repository, which is used when compiling sbt from source.*/
-	val LocalPattern = "[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
-	/** The artifact pattern used for the local Ivy repository.*/
-	def LocalArtifactPattern = LocalPattern
-	/** The Ivy pattern used for the local Ivy repository.*/
-	def LocalIvyPattern = LocalPattern
-		
-	/** The name of the property declaring the version of scala to use to build the project when not cross-building.*/
-	val ScalaVersion = "scala.version"
-	/** The name of the property declaring the version of sbt to use to build the project.*/
-	val SbtVersion = "sbt.version"
-	/** The name of the system property containing the version of scala actually used to build a project.
-	* This might be different from the ScalaVersion property when cross-building.*/
-	val SbtScalaVersionKey = "sbt.scala.version"
-	/** The class name prefix used to hide the Scala classes used by this loader from sbt
-	* and the project definition*/
-	val ScalaPackage = "scala."
-	/** The class name prefix used to hide the Ivy classes used by this loader from sbt
-	* and the project definition*/
-	val IvyPackage = "org.apache.ivy."
-	/** The loader will check that these classes can be loaded and will assume that their presence indicates
-	* sbt and its dependencies have been downloaded.*/
-	val TestLoadSbtClasses = "sbt.Main" :: "org.apache.ivy.Ivy" :: Nil
-	/** The loader will check that these classes can be loaded and will assume that their presence indicates
-	* the Scala compiler and library have been downloaded.*/
-	val TestLoadScalaClasses = "scala.ScalaObject" :: "scala.tools.nsc.GenericRunnerCommand" :: Nil
-	
-	val ProjectDirectoryName = "project"
-	val BootDirectoryName = "boot"
-	val BuildPropertiesName ="build.properties"
-	val ScalaHomeProperty = "scala.home"
-	val UpdateLogName = "update.log"
-	
-	val CrossBuildPrefix = "+"
-	val RebootCommand = "reboot"
-	val RebootExitCode = -1
-	val NormalExitCode = 0
-	val DefaultIvyConfiguration = "default"
-	
-	/** The base URL to use to resolve sbt for download. */
-	val sbtRootBase = "http://simple-build-tool.googlecode.com/svn/artifacts/"
-	/** The name of the directory within the boot directory to retrieve scala to. */
-	val ScalaDirectoryName = "lib"
-	/** The Ivy pattern to use for retrieving the scala compiler and library.  It is relative to the directory
-	* containing all jars for the requested version of scala. */
-	val scalaRetrievePattern = ScalaDirectoryName + "/[artifact].[ext]"
-	
-	/** The Ivy pattern to use for retrieving sbt and its dependencies.  It is relative to the directory
-	* containing all jars for the requested version of scala. */
-	def sbtRetrievePattern(sbtVersion: String) = sbtDirectoryName(sbtVersion) + "/[artifact]-[revision].[ext]"
-	/** The Ivy pattern to use for resolving sbt and its dependencies from the Google code project.*/
-	def sbtResolverPattern(scalaVersion: String) = sbtRootBase + "[revision]/[type]s/[artifact].[ext]"
-	/** The name of the directory to retrieve sbt and its dependencies to.*/
-	def sbtDirectoryName(sbtVersion: String) = SbtOrg + "-" + sbtVersion
-	/** The name of the directory in the boot directory to put all jars for the given version of scala in.*/
-	def baseDirectoryName(scalaVersion: String) = "scala-" + scalaVersion
-}
-private object ProxyProperties
-{
-	val HttpProxyEnv = "http_proxy"
-	val HttpProxyUser = "http_proxy_user"
-	val HttpProxyPassword = "http_proxy_pass"
-	
-	val ProxyHost = "http.proxyHost"
-	val ProxyPort = "http.proxyPort"
-	val ProxyUser = "http.proxyUser"
-	val ProxyPassword = "http.proxyPassword"
-}
\ No newline at end of file
diff --git a/boot/src/main/scala/FilteredLoader.scala b/boot/src/main/scala/FilteredLoader.scala
deleted file mode 100644
index b0ee20873..000000000
--- a/boot/src/main/scala/FilteredLoader.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
- */
-package sbt.boot
-
-import BootConfiguration._
-
-/** A custom class loader to ensure the main part of sbt doesn't load any Scala or
-* Ivy classes from the jar containing the loader. */
-private[boot] final class BootFilteredLoader extends ClassLoader with NotNull
-{
-	@throws(classOf[ClassNotFoundException])
-	override final def loadClass(className: String, resolve: Boolean): Class[_] =
-	{
-		if(className.startsWith(ScalaPackage) || className.startsWith(IvyPackage))
-			throw new ClassNotFoundException(className)
-		else
-			super.loadClass(className, resolve)
-	}
-}
\ No newline at end of file
diff --git a/boot/src/main/scala/ProjectProperties.scala b/boot/src/main/scala/ProjectProperties.scala
deleted file mode 100644
index 07d4e37ea..000000000
--- a/boot/src/main/scala/ProjectProperties.scala
+++ /dev/null
@@ -1,147 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
- */
-package sbt.boot
-
-/*
-Project does not exist, create new project? [y/N/s] y
-Name: 
-Organization []:
-Version [1.0]: 
-Scala version [2.7.5]: 
-sbt version [0.5.4]: 
-*/
-import java.io.File
-/** Constants related to reading/writing the build.properties file in a project.
-* See BootConfiguration for general constants used by the loader. */
-private object ProjectProperties
-{
-	/** The properties key for storing the name of the project.*/
-	val NameKey = "project.name"
-	/** The properties key for storing the organization of the project.*/
-	val OrganizationKey = "project.organization"
-	/** The properties key for storing the version of the project.*/
-	val VersionKey = "project.version"
-	/** The properties key for storing the version of Scala used with the project.*/
-	val ScalaVersionKey = "scala.version"
-	/** The properties key for storing the version of sbt used to build the project.*/
-	val SbtVersionKey = "sbt.version"
-	/** The properties key to communicate to the main component of sbt that the project
-	* should be initialized after being loaded, typically by creating a default directory structure.*/
-	val InitializeProjectKey = "project.initialize"
-	/** The properties key that configures the project to be flattened a bit for use by quick throwaway projects.*/
-	val ScratchKey = "project.scratch"
-	
-	/** The label used when prompting for the name of the user's project.*/
-	val NameLabel = "Name"
-	/** The label used when prompting for the organization of the user's project.*/
-	val OrganizationLabel = "Organization"
-	/** The label used when prompting for the version of the user's project.*/
-	val VersionLabel = "Version"
-	/** The label used when prompting for the version of Scala to use for the user's project.*/
-	val ScalaVersionLabel = "Scala version"
-	/** The label used when prompting for the version of sbt to use for the user's project.*/
-	val SbtVersionLabel = "sbt version"
-	
-	/** The default organization of the new user project when the user doesn't explicitly specify one when prompted.*/
-	val DefaultOrganization = ""
-	/** The default version of the new user project when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultVersion = "1.0"
-	/** The default version of sbt when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultSbtVersion = DefaultVersions.Sbt //"0.5.4"
-	/** The default version of Scala when the user doesn't explicitly specify a version when prompted.*/
-	val DefaultScalaVersion = DefaultVersions.Scala//"2.7.5"
-
-	// sets up the project properties for a throwaway project (flattens src and lib to the root project directory)
-	def scratch(file: File)
-	{
-		withProperties(file) { properties =>
-			for( (key, _, default, _) <- propertyDefinitions(false))
-				properties(key) = default.getOrElse("scratch")
-			properties(ScratchKey) = true.toString
-		}
-	}
-	// returns (scala version, sbt version)
-	def apply(file: File, setInitializeProject: Boolean): (String, String) = applyImpl(file, setInitializeProject, Nil)
-	def forcePrompt(file: File, propertyKeys: String*) = applyImpl(file, false, propertyKeys)
-	private def applyImpl(file: File, setInitializeProject: Boolean, propertyKeys: Iterable[String]): (String, String) =
-	{
-		val organizationOptional = file.exists
-		withProperties(file) { properties =>
-			properties -= propertyKeys
-			
-			prompt(properties, organizationOptional)
-			if(setInitializeProject)
-				properties(InitializeProjectKey) = true.toString
-		}
-	}
-	// (key, label, defaultValue, promptRequired)
-	private def propertyDefinitions(organizationOptional: Boolean) = 
-		(NameKey, NameLabel, None, true) :: 
-		(OrganizationKey, OrganizationLabel, Some(DefaultOrganization), !organizationOptional) ::
-		(VersionKey, VersionLabel, Some(DefaultVersion), true) ::
-		(ScalaVersionKey, ScalaVersionLabel, Some(DefaultScalaVersion), true) ::
-		(SbtVersionKey, SbtVersionLabel, Some(DefaultSbtVersion), true) ::
-		Nil
-	private def prompt(fill: ProjectProperties, organizationOptional: Boolean)
-	{
-		for( (key, label, default, promptRequired) <- propertyDefinitions(organizationOptional))
-		{
-			val value = fill(key)
-			if(value == null && promptRequired)
-				fill(key) = readLine(label, default)
-		}
-	}
-	private def withProperties(file: File)(f: ProjectProperties => Unit) =
-	{
-		val properties = new ProjectProperties(file)
-		f(properties)
-		properties.save
-		(properties(ScalaVersionKey), properties(SbtVersionKey))
-	}
-	private def readLine(label: String, default: Option[String]): String =
-	{
-		val prompt =
-			default match
-			{
-				case Some(d) => "%s [%s]: ".format(label, d)
-				case None => "%s: ".format(label)
-			}
-		SimpleReader.readLine(prompt) orElse default match
-		{
-			case Some(line) => line
-			case None => throw new BootException("Project not loaded: " + label + " not specified.")
-		}
-	}
-}
-
-import java.io.{FileInputStream, FileOutputStream}
-import java.util.Properties
-private class ProjectProperties(file: File) extends NotNull
-{
-	private[this] var modified = false
-	private[this] val properties = new Properties
-	if(file.exists)
-	{
-		val in = new FileInputStream(file)
-		try { properties.load(in) } finally { in.close() }
-	}
-	
-	def update(key: String, value: String)
-	{
-		modified = true
-		properties.setProperty(key, value)
-	}
-	def apply(key: String) = properties.getProperty(key)
-	def save()
-	{
-		if(modified)
-		{
-			file.getParentFile.mkdirs()
-			val out = new FileOutputStream(file)
-			try { properties.store(out, "Project Properties") } finally { out.close() }
-			modified = false
-		}
-	}
-	def -= (keys: Iterable[String]) {  for(key <- keys) properties.remove(key)  }
-}
\ No newline at end of file
diff --git a/boot/src/main/scala/SimpleReader.scala b/boot/src/main/scala/SimpleReader.scala
deleted file mode 100644
index 3e9359625..000000000
--- a/boot/src/main/scala/SimpleReader.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
- */
-package sbt.boot
-
-import jline.ConsoleReader
-object SimpleReader extends NotNull
-{
-	protected[this] val reader =
-	{
-		val cr = new ConsoleReader
-		cr.setBellEnabled(false)
-		cr
-	}
-	def readLine(prompt: String) =
-		reader.readLine(prompt) match
-		{
-			case null => None
-			case x =>
-				val trimmed = x.trim
-				if(trimmed.isEmpty)
-					None
-				else
-					Some(trimmed)
-		}
-}
\ No newline at end of file
diff --git a/boot/src/main/scala/Update.scala b/boot/src/main/scala/Update.scala
deleted file mode 100644
index 6dab2d711..000000000
--- a/boot/src/main/scala/Update.scala
+++ /dev/null
@@ -1,273 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009 Mark Harrah
- */
-package sbt.boot
-
-import java.io.{File, FileWriter, PrintWriter, Writer}
-
-import org.apache.ivy.{core, plugins, util, Ivy}
-import core.LogOptions
-import core.cache.DefaultRepositoryCacheManager
-import core.event.EventManager
-import core.module.id.ModuleRevisionId
-import core.module.descriptor.{Configuration, DefaultDependencyDescriptor, DefaultModuleDescriptor, ModuleDescriptor}
-import core.report.ResolveReport
-import core.resolve.{ResolveEngine, ResolveOptions}
-import core.retrieve.{RetrieveEngine, RetrieveOptions}
-import core.sort.SortEngine
-import core.settings.IvySettings
-import plugins.resolver.{ChainResolver, FileSystemResolver, IBiblioResolver, URLResolver}
-import util.{DefaultMessageLogger, Message}
-
-import BootConfiguration._
-
-private[boot] object UpdateTarget extends Enumeration
-{
-	val UpdateScala, UpdateSbt = Value
-}
-import UpdateTarget.{UpdateSbt, UpdateScala}
-
-object Update
-{
-	/** Use Ivy to resolve and retrieve the specified 'targets' for the given versions.*/
-	def apply(bootDirectory: File, sbtVersion: String, scalaVersion: String, targets: UpdateTarget.Value*) =
-		synchronized // synchronized because Ivy is not thread-safe
-		{
-			val up = new Update(bootDirectory, sbtVersion, scalaVersion, targets : _*)
-			up.update()
-		}
-}
-/** Ensures that the Scala and sbt jars exist for the given versions or else downloads them.*/
-private final class Update(bootDirectory: File, sbtVersion: String, scalaVersion: String, targets: UpdateTarget.Value*)
-{
-	private def logFile = new File(bootDirectory, UpdateLogName)
-	/** A Writer to use to write the full logging information to a file for debugging. **/
-	lazy val logWriter =
-	{
-		bootDirectory.mkdirs
-		new PrintWriter(new FileWriter(logFile))
-	}
-
-	/** The main entry point of this class for use by the Update module.  It runs Ivy */
-	private def update()
-	{
-		Message.setDefaultLogger(new SbtIvyLogger(logWriter))
-		try { targets.foreach(update) } // runs update on each module separately
-		catch
-		{
-			case e: Exception =>
-				e.printStackTrace(logWriter)
-				log(e.toString)
-				println("  (see " + logFile + " for complete log)")
-		}
-		finally { logWriter.close() }
-	}
-	/** Runs update for the specified target (updates either the scala or sbt jars for building the project) */
-	private def update(target: UpdateTarget.Value)
-	{
-		val settings = new IvySettings
-		val ivy = Ivy.newInstance(settings)
-		ivy.pushContext()
-		try { update(target, settings) }
-		finally { ivy.popContext() }
-	}
-	private def update(target: UpdateTarget.Value, settings: IvySettings)
-	{
-		import Configuration.Visibility.PUBLIC
-		// the actual module id here is not that important
-		val moduleID = new DefaultModuleDescriptor(createID(SbtOrg, "boot", "1.0"), "release", null, false)
-		moduleID.setLastModified(System.currentTimeMillis)
-		moduleID.addConfiguration(new Configuration(DefaultIvyConfiguration, PUBLIC, "", Array(), true, null))
-		// add dependencies based on which target needs updating
-		target match
-		{
-			case UpdateScala =>
-				addDependency(moduleID, ScalaOrg, CompilerModuleName, scalaVersion, "default")
-				addDependency(moduleID, ScalaOrg, LibraryModuleName, scalaVersion, "default")
-				update(settings, moduleID, target, false)
-			case UpdateSbt =>
-				addDependency(moduleID, SbtOrg, SbtModuleName, sbtVersion, scalaVersion)
-				try { update(settings, moduleID, target, false) }
-				catch
-				{
-					 // unfortunately, there is not a more specific exception thrown when a configuration does not exist,
-					 // so we always retry after cleaning the ivy file for this version of sbt on in case it is a newer version
-					 // of Scala than when this version of sbt was initially published
-					case e: RuntimeException =>
-						update(settings, moduleID, target, true)
-				}
-		}
-	}
-	/** Runs the resolve and retrieve for the given moduleID, which has had its dependencies added already. */
-	private def update(settings: IvySettings, moduleID: DefaultModuleDescriptor,  target: UpdateTarget.Value, cleanExisting: Boolean)
-	{
-		val eventManager = new EventManager
-		addResolvers(settings, scalaVersion, target)
-		settings.setDefaultConflictManager(settings.getConflictManager(ConflictManagerName))
-		settings.setBaseDir(bootDirectory)
-		if(cleanExisting)
-		{
-			val sbtID = createID(SbtOrg, SbtModuleName, sbtVersion)
-			onDefaultRepositoryCacheManager(settings) { cache =>
-				val ivyFile = cache.getIvyFileInCache(sbtID)
-				ivyFile.delete()
-				val original = new File(ivyFile.getParentFile, ivyFile.getName + ".original")
-				original.delete()
-			}
-		}
-		resolve(settings, eventManager, moduleID)
-		retrieve(settings, eventManager, moduleID, target)
-	}
-	private def createID(organization: String, name: String, revision: String) =
-		ModuleRevisionId.newInstance(organization, name, revision)
-	/** Adds the given dependency to the default configuration of 'moduleID'. */
-	private def addDependency(moduleID: DefaultModuleDescriptor, organization: String, name: String, revision: String, conf: String)
-	{
-		val dep = new DefaultDependencyDescriptor(moduleID, createID(organization, name, revision), false, false, true)
-		dep.addDependencyConfiguration(DefaultIvyConfiguration, conf)
-		moduleID.addDependency(dep)
-	}
-	private def resolve(settings: IvySettings, eventManager: EventManager, module: ModuleDescriptor)
-	{
-		val resolveOptions = new ResolveOptions
-		  // this reduces the substantial logging done by Ivy, including the progress dots when downloading artifacts
-		resolveOptions.setLog(LogOptions.LOG_DOWNLOAD_ONLY)
-		val resolveEngine = new ResolveEngine(settings, eventManager, new SortEngine(settings))
-		val resolveReport = resolveEngine.resolve(module, resolveOptions)
-		if(resolveReport.hasError)
-		{
-			logExceptions(resolveReport)
-			println(Set(resolveReport.getAllProblemMessages.toArray: _*).mkString(System.getProperty("line.separator")))
-			throw new BootException("Error retrieving required libraries")
-		}
-	}
-	/** Exceptions are logged to the update log file. */
-	private def logExceptions(report: ResolveReport)
-	{
-		for(unresolved <- report.getUnresolvedDependencies)
-		{
-			val problem = unresolved.getProblem
-			if(problem != null)
-				problem.printStackTrace(logWriter)
-        }
-	}
-	/** Retrieves resolved dependencies using the given target to determine the location to retrieve to. */
-	private def retrieve(settings: IvySettings, eventManager: EventManager, module: ModuleDescriptor,  target: UpdateTarget.Value)
-	{
-		val retrieveOptions = new RetrieveOptions
-		val retrieveEngine = new RetrieveEngine(settings, eventManager)
-		val pattern =
-			target match
-			{
-				// see BuildConfiguration
-				case UpdateSbt => sbtRetrievePattern(sbtVersion)
-				case UpdateScala => scalaRetrievePattern
-			}
-		retrieveEngine.retrieve(module.getModuleRevisionId, pattern, retrieveOptions);
-	}
-	/** Add the scala tools repositories and a URL resolver to download sbt from the Google code project.*/
-	private def addResolvers(settings: IvySettings, scalaVersion: String,  target: UpdateTarget.Value)
-	{
-		val newDefault = new ChainResolver
-		newDefault.setName("redefined-public")
-		newDefault.add(localResolver(settings.getDefaultIvyUserDir.getAbsolutePath))
-		newDefault.add(mavenLocal)
-		newDefault.add(mavenMainResolver)
-		target match
-		{
-			case UpdateSbt =>
-				newDefault.add(sbtResolver(scalaVersion))
-			case UpdateScala =>
-				newDefault.add(mavenResolver("Scala-Tools Maven2 Repository", "http://scala-tools.org/repo-releases"))
-				newDefault.add(scalaSnapshots(scalaVersion))
-		}
-		onDefaultRepositoryCacheManager(settings)(_.setUseOrigin(true))
-		settings.addResolver(newDefault)
-		settings.setDefaultResolver(newDefault.getName)
-	}
-	private def onDefaultRepositoryCacheManager(settings: IvySettings)(f: DefaultRepositoryCacheManager => Unit)
-	{
-		settings.getDefaultRepositoryCacheManager match
-		{
-			case manager: DefaultRepositoryCacheManager => f(manager)
-			case _ => ()
-		}
-	}
-	/** Uses the pattern defined in BuildConfiguration to download sbt from Google code.*/
-	private def sbtResolver(scalaVersion: String) =
-	{
-		val pattern = sbtResolverPattern(scalaVersion)
-		val resolver = new URLResolver
-		resolver.setName("Sbt Repository")
-		resolver.addIvyPattern(pattern)
-		resolver.addArtifactPattern(pattern)
-		resolver
-	}
-	private def mavenLocal = mavenResolver("Maven2 Local", "file://" + System.getProperty("user.home") + "/.m2/repository/")
-	/** Creates a maven-style resolver.*/
-	private def mavenResolver(name: String, root: String) =
-	{
-		val resolver = defaultMavenResolver(name)
-		resolver.setRoot(root)
-		resolver
-	}
-	/** Creates a resolver for Maven Central.*/
-	private def mavenMainResolver = defaultMavenResolver("Maven Central")
-	/** Creates a maven-style resolver with the default root.*/
-	private def defaultMavenResolver(name: String) =
-	{
-		val resolver = new IBiblioResolver
-		resolver.setName(name)
-		resolver.setM2compatible(true)
-		resolver
-	}
-	private val SnapshotPattern = """(\d+).(\d+).(\d+)-(\d{8})\.(\d{6})-(\d+|\+)""".r.pattern
-	private def scalaSnapshots(scalaVersion: String) =
-	{
-		val m = SnapshotPattern.matcher(scalaVersion)
-		if(m.matches)
-		{
-			val base = Seq(1,2,3).map(m.group).mkString(".")
-			val pattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/" + base + "-SNAPSHOT/[artifact]-[revision].[ext]"
-			
-			val resolver = new URLResolver
-			resolver.setName("Scala Tools Snapshots")
-			resolver.setM2compatible(true)
-			resolver.addArtifactPattern(pattern)
-			resolver
-		}
-		else
-			mavenResolver("Scala-Tools Maven2 Snapshots Repository", "http://scala-tools.org/repo-snapshots")
-	}
-	private def localResolver(ivyUserDirectory: String) =
-	{
-		val localIvyRoot = ivyUserDirectory + "/local"
-		val artifactPattern = localIvyRoot + "/" + LocalArtifactPattern
-		val ivyPattern = localIvyRoot + "/" + LocalIvyPattern
-		val resolver = new FileSystemResolver
-		resolver.setName(LocalIvyName)
-		resolver.addIvyPattern(ivyPattern)
-		resolver.addArtifactPattern(artifactPattern)
-		resolver
-	}
-	/** Logs the given message to a file and to the console. */
-	private def log(msg: String) =
-	{
-		try { logWriter.println(msg) }
-		catch { case e: Exception => System.err.println("Error writing to update log file: " + e.toString) }
-		println(msg)
-	}
-}
-/** A custom logger for Ivy to ignore the messages about not finding classes
-* intentionally filtered using proguard. */
-private final class SbtIvyLogger(logWriter: PrintWriter) extends DefaultMessageLogger(Message.MSG_INFO) with NotNull
-{
-	private val ignorePrefix = "impossible to define"
-	override def log(msg: String, level: Int)
-	{
-		logWriter.println(msg)
-		if(level <= getLevel && msg != null && !msg.startsWith(ignorePrefix))
-			System.out.println(msg)
-	}
-	override def rawlog(msg: String, level: Int) { log(msg, level) }
-}
\ No newline at end of file
diff --git a/ivysettings.xml b/ivysettings.xml
deleted file mode 100644
index 780f2b928..000000000
--- a/ivysettings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- to be replace by inline ModuleConfigurations when 0.5.5 is released -->
-<ivysettings>
-	<settings defaultResolver="sbt-chain"/>
-	<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
-	<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
-	<resolvers>
-		<ibiblio name="scala-tools" m2compatible="true" root="http://scala-tools.org/repo-releases/"/>
-		<url name="scala-snapshots" m2compatible="true" >
-			<artifact pattern="http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]" />
-		</url>
-		<chain name="sbt-chain" returnFirst="true" checkmodified="true">
-			<resolver ref="local"/>
-			<resolver ref="public"/>
-			<resolver ref="scala-tools"/>
-		</chain>
-	</resolvers>
-	<modules>
-		<module organisation="org.scala-lang" revision="2.8.0-.*" resolver="scala-snapshots"/>
-	</modules>
-</ivysettings> 
\ No newline at end of file
diff --git a/project/build.properties b/project/build.properties
index d7653ac2b..433d31217 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Tue Sep 29 20:46:06 EDT 2009
-project.organization=sbt
+#Thu Oct 01 17:51:28 EDT 2009
+project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.5
 project.version=0.5.6-SNAPSHOT
-scala.version=2.7.2
+scala.version=2.7.5
diff --git a/project/build/CrossCompileProject.scala b/project/build/CrossCompileProject.scala
deleted file mode 100644
index e9bb4a1ef..000000000
--- a/project/build/CrossCompileProject.scala
+++ /dev/null
@@ -1,217 +0,0 @@
-import sbt._
-
-import java.io.File
-import scala.xml.NodeSeq
-
-/** Support for compiling sbt across multiple versions of Scala.  The scala compiler is run in a
-* separate JVM and no partial compilation is done.*/
-abstract class CrossCompileProject extends BasicScalaProject with MavenStyleScalaPaths
-{
-	/* The base configuration names for the versions of Scala*/
-	private val version2_7_2 = "2.7.2"
-	private val version2_7_3 = "2.7.3"
-	private val version2_7_4 = "2.7.4"
-	private val version2_7_5 = "2.7.5"
-	private val version2_7_6 = "2.7.6"
-	private val version2_8_0 = "2.8.0-20090929.004247-+"
-	private val base = "base"
-
-	/* The configurations for the versions of Scala.*/
-	private val conf_2_7_2 = config(version2_7_2)
-	private val conf_2_7_3 = config(version2_7_3)
-	private val conf_2_7_4 = config(version2_7_4)
-	private val conf_2_7_5 = config(version2_7_5)
-	private val conf_2_7_6 = config(version2_7_6)
-	private val conf_2_8_0 = config(version2_8_0)
-	private val conf_base = config(base)
-	// the list of all configurations cross-compile supports
-	private val allConfigurations = conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: conf_2_7_6 :: conf_2_8_0 :: Nil
-	// the list of configurations to actually build against
-	private val buildConfigurations = allConfigurations//conf_2_7_2 :: conf_2_8_0 :: Nil//conf_2_7_2 :: conf_2_7_3 :: conf_2_7_4 :: conf_2_7_5 :: Nil
-	// the configuration to use for normal development (when cross-building is not done)
-	private def developmentVersion = buildConfigurations.first
-
-	/* Methods to derive the configuration name from the base name 'v'.*/
-	private def optional(v: Configuration) = config("optional-" + v.toString)
-	private def scalac(v: Configuration) = config("scalac-" + v.toString)
-	private def sbt(v: Configuration) = config("sbt_" + v.toString)
-	private def depConf(v: Configuration) = v.toString + "->default"
-
-	// =========== Cross-compilation across scala versions ===========
-
-	// The dependencies that should go in each configuration are:
-	//   base                             Required dependencies that are the same across all scala versions.
-	//   <version>                  Required dependencies to use with Scala <version>
-	//   optional-base              Optional dependencies that are the same for all scala versions
-	//   optional-<version>   Optional dependencies to use with Scala <version>
-	//   compile                        Used for normal development, it should extend a specific <version> and optional-<version>
-	//   scalac-<version>       The scala compiler for Scala <version>
-	// There should be a jar publication for each version of scala.  The artifact should be named sbt_<version>.
-	override def ivyXML =
-		(<configurations>
-			<conf name={conf_base.toString}/>
-			<conf name={optional(conf_base).toString}/>
-			{ variableConfigurations }
-			<!-- The configuration used for normal development (actions other than cross-*) -->
-			<conf name="default" extends={developmentVersion + "," + optional(developmentVersion).toString} visibility="private"/>
-		</configurations>
-		<publications>
-			{ publications }
-		</publications>
-		<dependencies>
-			<!-- Dependencies that are the same across all Scala versions -->
-			<dependency org="org.apache.ivy" name="ivy" rev="2.0.0" transitive="false" conf={depConf(conf_base)}/>
-			<dependency org="com.jcraft" name="jsch" rev="0.1.31" transitive="false" conf={depConf(conf_base)}/>
-			<dependency org="org.mortbay.jetty" name="jetty" rev="6.1.14" transitive="true" conf={depConf(optional(conf_base))}/>
-
-			<!-- the dependencies that are different depending on the version of Scala -->
-			{ variableDependencies(conf_2_7_2, /*ScalaTest*/"0.9.3", /*Specs*/"1.4.0", false) }
-			{ variableDependencies(conf_2_7_3, /*ScalaTest*/"0.9.4", /*Specs*/"1.4.3", true) }
-			{ variableDependencies(conf_2_7_4, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
-			{ variableDependencies(conf_2_7_5, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
-			{ variableDependencies(conf_2_7_6, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
-			{ variableDependencies(conf_2_8_0, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true) }
-		</dependencies>)
-
-	/** Creates a publication (an 'artifact' element) for each Scala version */
-	private def publications: NodeSeq =
-	{
-		for(conf <- buildConfigurations) yield
-			<artifact name={sbt(conf).toString} conf={conf.toString}/>
-	}
-	/** Creates the main, optional, and scalac configurations for each Scala version*/
-	private def variableConfigurations: NodeSeq =
-	{
-		buildConfigurations flatMap
-		{ conf =>
-			scalaComment(conf) ++
-			(<conf name={conf.toString} extends={conf_base.toString}/>
-			<conf name={optional(conf).toString} extends={optional(conf_base).toString}/>
-			<conf name={scalac(conf).toString} visibility="private"/>)
-		}
-	}
-	/** Defines the dependencies for the given version of Scala, ScalaTest, and Specs.  If uniformTestOrg is true,
-	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name. */
-	private def variableDependencies(scalaVersion: Configuration, scalaTestVersion: String, specsVersion: String, uniformTestOrg: Boolean) =
-	{
-		if(buildConfigurations.contains(scalaVersion))
-		{
-			scalaComment(scalaVersion) ++
-			{
-				if(scalaVersion eq conf_2_8_0)
-					Nil
-				else
-				{
-					testDependency("scalatest", scalaTestVersion, uniformTestOrg, scalaVersion) ++
-					testDependency("specs", specsVersion, uniformTestOrg, scalaVersion) ++
-					testDependency("scalacheck", "1.5", false, scalaVersion)
-				}
-			} ++
-			scalaDependency("scala-compiler", scalaVersion) ++ scalaDependency("scala-library", scalaVersion) ++
-			{
-				if(scalaVersion == conf_2_8_0)
-					<dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf={depConf(conf_2_8_0)}/>
-				else
-					NodeSeq.Empty
-			}
-		}
-		else
-			Nil
-	}
-	private def scalaDependency(name: String, scalaVersion: Configuration) =
-		<dependency org="org.scala-lang" name={name} rev={scalaVersion.toString} conf={depConf(scalac(scalaVersion))}/>
-
-	/** Creates a comment containing the version of Scala*/
-	private def scalaComment(scalaVersion: Configuration) = scala.xml.Comment("Scala " + scalaVersion)
-	/** Creates a dependency element for a test.  See 'testOrg' for a description of uniformTestOrg.*/
-
-	private def testDependency(name: String, version: String, uniformTestOrg: Boolean, baseConf: Configuration) =
-		<dependency org={testOrg(name, uniformTestOrg)} name={name} rev={version} transitive="false" conf={depConf(optional(baseConf))}/>
-
-	/** Returns the organization for the given test library.  If uniform is true,
-	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name.*/
-	private def testOrg(name: String, uniform: Boolean) =
-		if(uniform) "org.scala-tools.testing"
-		else "org." + name
-
-	/** Disable filtering Scala jars from dependency management, because we need them and are putting them
-	* in custom configurations and are using them in a separate process than sbt runs in.*/
-	override def filterScalaJars = false
-
-	/** The lib directory is now only for building using the 'build' script.*/
-	override def unmanagedClasspath = path("ignore_lib_directory")
-	/** When cross-compiling, replace mainCompilePath with the classes directory for the version being compiled.*/
-	override def fullUnmanagedClasspath(config: Configuration) =
-		if( (Configurations.Default :: Configurations.defaultMavenConfigurations) contains config)
-			super.fullUnmanagedClasspath(config)
-		else
-			classesPath(config) +++ mainResourcesPath
-
-	// include the optional-<version> dependencies as well as the ones common across all scala versions
-	def optionalClasspath(version: Configuration) = fullClasspath(optional(version)) +++ super.optionalClasspath
-
-	private val CompilerMainClass = "scala.tools.nsc.Main"
-	// use a publish configuration that publishes the 'base' + all <version> configurations (base is required because
-	//   the <version> configurations extend it)
-	private val conf = new DefaultPublishConfiguration("local", "release")
-	{
-		override def configurations: Option[Iterable[Configuration]] = Some(config(base) :: buildConfigurations)
-	}
-	// the actions for cross-version packaging and publishing
-	lazy val crossPackage = buildConfigurations.map(packageForScala)
-	lazy val crossDeliverLocal = deliverTask(conf, updateOptions) dependsOn(crossPackage : _*)
-	lazy val crossPublishLocal = publishTask(conf, updateOptions) dependsOn(crossDeliverLocal)
-	// Creates a task that produces a packaged sbt compiled against Scala scalaVersion.
-	//  The jar is named 'sbt_<scala-version>-<sbt-version>.jar'
-	private def packageForScala(scalaVersion: Configuration) =
-	{
-		val classes = classesPath(scalaVersion) ** "*"
-		val jarName = crossJarName(scalaVersion)
-		val packageActionName = crossActionName("package", scalaVersion)
-		val compileAction = compileForScala(scalaVersion) named(crossActionName("compile", scalaVersion))
-		packageTask(classes +++ mainResources, outputPath, jarName, packageOptions) dependsOn(compileAction) named(packageActionName)
-	}
-	private def crossActionName(base: String, scalaVersion: Configuration) = base + " [ " + scalaVersion.toString + " ] "
-	private def crossJarName(scalaVersion: Configuration) = sbt(scalaVersion) + "-" + version.toString +  ".jar"
-	// This creates a task that compiles sbt against the given version of scala.  Classes are put in classes-<scalaVersion>.
-	private def compileForScala(version: Configuration)=
-	{
-		def filteredSources =
-			if(version eq conf_2_8_0) // cannot compile against test libraries currently
-				Path.lazyPathFinder { mainSources.get.filter(!_.asFile.getName.endsWith("TestFrameworkImpl.scala")) }
-			else
-				mainSources
-		task
-		{
-			val classes = classesPath(version)
-			val toClean = (outputPath / crossJarName(version)) +++ (classes ** "*")
-			val setupResult =
-				FileUtilities.clean(toClean.get, true, log) orElse
-				FileUtilities.createDirectory(classes, log)
-			for(err <- setupResult) log.error(err)
-			// the classpath containing the scalac compiler
-			val compilerClasspath = concatPaths(fullClasspath(scalac(version)))
-
-			// The libraries to compile sbt against
-			val classpath = fullClasspath(version) +++ optionalClasspath(version)
-			val sources: List[String] = pathListStrings(filteredSources)
-			val compilerOptions = List("-cp", concatPaths(classpath), "-d", classes.toString)
-			val compilerArguments: List[String] = compilerOptions ::: sources
-
-			// the compiler classpath has to be appended to the boot classpath to work properly
-			val allArguments = "-Xmx512M" :: ("-Xbootclasspath/a:" + compilerClasspath) :: CompilerMainClass :: compilerArguments
-			log.debug("Running external compiler with command: java " + allArguments.mkString(" "))
-			val start = System.currentTimeMillis
-			val exitValue = Process("java", allArguments) ! log
-			val stop = System.currentTimeMillis
-			log.info("Compiled sbt with Scala " + version.name + " in " + ((stop-start)/1000.0) + " s")
-			if(exitValue == 0)
-				None
-			else
-				Some("Nonzero exit value (" + exitValue + ") when calling scalac " + version + " with options: \n" + compilerOptions.mkString(" "))
-		}
-	}
-	private def concatPaths(p: PathFinder): String = Path.makeString(p.get)
-	private def pathListStrings(p: PathFinder): List[String] = p.get.map(_.absolutePath).toList
-	private def classesPath(scalaVersion: Configuration) = ("target"  / ("classes-" + scalaVersion.toString)) ##
-}
diff --git a/project/build/LoaderProject.scala b/project/build/LoaderProject.scala
deleted file mode 100644
index 785b4b730..000000000
--- a/project/build/LoaderProject.scala
+++ /dev/null
@@ -1,151 +0,0 @@
-import sbt._
-
-import LoaderProject._
-import java.io.File
-
-// a project for the sbt launcher
-// the main content of this project definition is setting up and running proguard
-//   to combine and compact all dependencies into a single jar
-protected/* removes the ambiguity as to which project is the entry point by making this class non-public*/
-	class LoaderProject(info: ProjectInfo) extends DefaultProject(info)
-{
-	val mainClassName = "sbt.boot.Boot"
-	val baseName = "sbt-launcher"
-	val proguardConfigurationPath: Path = outputPath / "proguard.pro"
-	lazy val outputJar: Path = rootProject.outputPath / (baseName + "-" + version + ".jar")
-	def rootProjectDirectory = rootProject.info.projectPath
-
-	override lazy val release = task { None }
-	override def mainClass = Some(mainClassName)
-	override def defaultJarBaseName = baseName + "-" + version.toString
-	
-	/******  Resources *****/
-	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
-	override def mainResources = super.mainResources +++ extraResources
-	
-	/****** Dependencies  *******/
-	val defaultConfig = config("default")
-	val toolsConfig = config("tools")
-	val ivy = "org.apache.ivy" % "ivy" % "2.0.0"
-	val proguardJar = "net.sf.proguard" % "proguard" % "4.3" % "tools->default"
-	
-	/******** Proguard *******/
-	lazy val proguard = proguardTask dependsOn(`package`, writeProguardConfiguration) describedAs(ProguardDescription)
-	lazy val writeProguardConfiguration = writeProguardConfigurationTask dependsOn `package` describedAs WriteProguardDescription
-	
-	private def proguardTask =
-		task
-		{
-			FileUtilities.clean(outputJar :: Nil, log)
-			val proguardClasspath = managedClasspath(toolsConfig)
-			val proguardClasspathString = Path.makeString(proguardClasspath.get)
-			val configFile = proguardConfigurationPath.asFile.getAbsolutePath
-			val exitValue = Process("java", List("-Xmx128M", "-cp", proguardClasspathString, "proguard.ProGuard", "@" + configFile)) ! log
-			if(exitValue == 0) None else Some("Proguard failed with nonzero exit code (" + exitValue + ")")
-		}
-	private def writeProguardConfigurationTask =
-		task
-		{
-			// these are classes that need to be explicitly kept because they are loaded reflectively
-			val ivyKeepResolvers =
-				"org.apache.ivy.plugins.resolver.URLResolver" ::
-				"org.apache.ivy.plugins.resolver.IBiblioResolver" ::
-				Nil
-			// the template for the proguard configuration file
-			val outTemplate = """
-				|-dontoptimize
-				|-dontobfuscate
-				|-dontnote
-				|-dontwarn
-				|-libraryjars %s
-				|-injars %s(!META-INF/**,!fr/**,!**/antlib.xml,!**/*.png)
-				|-injars %s(!META-INF/**)
-				|%s
-				|-outjars %s
-				|-ignorewarnings
-				|%s
-				|%s
-				|-keep public class %s {
-				|    public static void main(java.lang.String[]);
-				|}"""
-			
-			val defaultJar = mkpath((outputPath / defaultJarName).asFile)
-			log.debug("proguard configuration using main jar " + defaultJar)
-			val ivyKeepOptions = ivyKeepResolvers.map("-keep public class " + _  + allPublic).mkString("\n")
-			val runtimeClasspath = runClasspath.get.map(_.asFile).toList
-			val jlineJars = runtimeClasspath.filter(isJLineJar)
-			val externalDependencies = (mainCompileConditional.analysis.allExternals).map(_.getAbsoluteFile).filter(_.getName.endsWith(".jar"))
-			log.debug("proguard configuration external dependencies: \n\t" + externalDependencies.mkString("\n\t"))
-			// partition jars from the external jar dependencies of this project by whether they are located in the project directory
-			// if they are, they are specified with -injars, otherwise they are specified with -libraryjars
-			val (externalJars, libraryJars) = externalDependencies.toList.partition(jar => Path.relativize(rootProjectDirectory, jar).isDefined)
-			log.debug("proguard configuration library jars locations: " + libraryJars.mkString(", "))
-			// pull out Ivy in order to exclude resources inside
-			val (ivyJars, externalJarsNoIvy) = externalJars.partition(_.getName.startsWith("ivy"))
-			log.debug("proguard configuration ivy jar location: " + ivyJars.mkString(", "))
-			// the loader uses JLine, so there is a dependency on the compiler (because JLine is distributed with the compiler,
-			//   it finds the JLine classes from the compiler jar instead of the jline jar on the classpath), but we don't want to
-			//    include the version of JLine from the compiler.
-			val includeExternalJars = externalJarsNoIvy.filter(jar => !isJarX(jar, "scala-compiler"))
-			// exclude properties files and manifests from scala-library jar
-			val inJars = (defaultJar :: includeExternalJars.map(f => mkpath(f) + "(!META-INF/**,!*.properties)")).map("-injars " + _).mkString("\n")
-			
-			withJar(ivyJars, "Ivy") { ivyJar =>
-				withJar(jlineJars, "JLine") { jlineJar =>
-					val proguardConfiguration =
-						outTemplate.stripMargin.format(mkpaths(libraryJars),
-							mkpath(ivyJar), mkpath(jlineJar),
-							inJars, mkpath(outputJar.asFile), ivyKeepOptions, keepJLine, mainClassName)
-					log.debug("Proguard configuration written to " + proguardConfigurationPath)
-					FileUtilities.write(proguardConfigurationPath.asFile, proguardConfiguration, log)
-				}
-			}
-		}
-	private def mkpaths(f: Seq[File]) = f.map(mkpath).mkString(File.separator)
-	private def mkpath(f: File) = '\"' + f.getAbsolutePath + '\"'
-	private def withJar(files: List[File], name: String)(f: File => Option[String]): Option[String] =
-		files match
-		{
-			case Nil => Some(name + " not present (try running update)")
-			case jar :: _ => f(jar)
-		}
-	private def isJLineJar(file: File) = isJarX(file, "jline")
-	private def isJarX(file: File, x: String) =
-	{
-		val name = file.getName
-		name.startsWith(x) && name.endsWith(".jar")
-	}
-	// class body declaration for proguard that keeps all public members
-	private val allPublic = " {\n public * ;\n}"
-	
-	private val keepJLine =
-	"""
-	|-keep public class jline.** {
-	|    public protected *;
-	|}
-	""".stripMargin
-
-	def managedSrc = path("src_managed")
-	def defaultVersionPath = managedSrc / "DefaultVersions.scala"
-	override def mainSourceRoots = super.mainSourceRoots +++ managedSrc
-	override def compileAction = super.compileAction dependsOn(versionProperties)
-	override def cleanAction = cleanTask(outputPath +++ managedSrc, cleanOptions)
-	lazy val versionProperties = task { writeVersionProperties(projectVersion.value.toString, "2.7.5") }//scalaVersion.value.toString)  }
-	def writeVersionProperties(sbtVersion: String, scalaVersion: String) =
-		FileUtilities.write(defaultVersionPath.asFile, defaultVersions(sbtVersion, scalaVersion), log)
-
-	def defaultVersions(sbtVersion: String, scalaVersion: String) =
-"""
-package sbt.boot
-object DefaultVersions
-{
-	val Sbt = "%s"
-	val Scala = "%s"
-}
-""".format(sbtVersion, scalaVersion)
-}
-object LoaderProject
-{
-	val ProguardDescription = "Produces the final compacted jar that contains only the minimum classes needed using proguard."
-	val WriteProguardDescription = "Creates the configuration file to use with proguard."
-}
diff --git a/project/build/ReleaseProject.scala b/project/build/ReleaseProject.scala
index c728ad69e..d9ad31207 100644
--- a/project/build/ReleaseProject.scala
+++ b/project/build/ReleaseProject.scala
@@ -1,7 +1,7 @@
 /* sbt -- Simple Build Tool
  * Copyright 2009  Mark Harrah
  */
-import sbt._
+/*import sbt._
 
 import java.io.File
 
@@ -93,4 +93,4 @@ package sbt {
 		implicit def elemToPB(command: scala.xml.Elem): ProcessBuilder =
 			impl.CommandParser.parse(command.text.trim).fold(error, Function.tupled(Process.apply))
 	}
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index eb9c7a80f..77b689814 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -5,33 +5,91 @@ import sbt._
 
 import java.io.File
 
-class SbtProject(info: ProjectInfo) extends ParentProject(info) with ReleaseProject
+class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.SbtScripted
 {
-	// Launcher sub project.
-	lazy val boot = project("boot", "Simple Build Tool Loader", new LoaderProject(_))
-	// Main builder sub project
-	lazy val main = project(info.projectPath, "Simple Build Tool", new MainProject(_))
-	// One-shot build for users building from trunk
-	lazy val fullBuild = task { None } dependsOn(boot.proguard, main.crossPublishLocal) describedAs
-		"Builds the loader and builds main sbt against all supported versions of Scala and installs to the local repository."
-		
-	override def shouldCheckOutputDirectories = false
-	override def baseUpdateOptions = QuietUpdate :: Nil
-	
-	//override def parallelExecution = true
-	override def deliverLocalAction = noAction
-	private def noAction = task { None }
-	override def publishLocalAction = noAction
-}
-
-protected class MainProject(val info: ProjectInfo) extends CrossCompileProject with test.SbtScripted
-{
-	override def defaultJarBaseName = "sbt_" + version.toString
 	/** Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
 	override def mainResources = super.mainResources +++ extraResources
 	override def mainClass = Some("sbt.Main")
 	override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: "sbt.ProcessSpecification" :: Nil) :: super.testOptions.toList
-	override def scriptedDependencies = testCompile :: `package` :: Nil
-	override lazy val release = task { None }
+	override def normalizedName = "sbt"
+	//override def scriptedDependencies = testCompile :: `package` :: Nil
+
+	def specificSnapshotRepo =
+		Resolver.url("scala-nightly") artifacts("http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]") mavenStyle()
+	val nightlyScala = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", specificSnapshotRepo)
+
+	override def compileOptions = Nil
+
+	def scalaVersionString = ScalaVersion.current.getOrElse(scalaVersion.value)
+	override def mainSources =
+	{
+		if(scalaVersionString == Version2_8_0)
+				Path.lazyPathFinder( super.mainSources.get.filter( !_.asFile.getName.endsWith("TestFrameworkImpl.scala") ))
+		else
+				super.mainSources
+	}
+
+	override def useDefaultConfigurations = false
+	val default = Configurations.Default
+	val optional = Configurations.Optional
+	val provided = Configurations.Provided
+
+	/* The base configuration names for the versions of Scala*/
+	private val Version2_7_2 = "2.7.2"
+	private val Version2_7_3 = "2.7.3"
+	private val Version2_7_4 = "2.7.4"
+	private val Version2_7_5 = "2.7.5"
+	private val Version2_7_6 = "2.7.6"
+	private val Version2_8_0 = "2.8.0-20090929.004247-+"
+	// the list of all supported versions
+	private def allVersions = Version2_7_2 :: Version2_7_3 :: Version2_7_4 :: Version2_7_5 :: Version2_7_6 :: Version2_8_0 :: Nil
+
+	override def crossScalaVersions = Set(Version2_7_2, Version2_7_5)//, Version2_8_0)
+
+	val ivy = "org.apache.ivy" % "ivy" % "2.0.0" intransitive()
+	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
+	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
+
+	// xsbt components
+	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % "0.7.0_13" % "provided"
+	val compiler = "org.scala-tools.sbt" %% "compile" % "0.7.0_13"
+
+	override def libraryDependencies = super.libraryDependencies ++ getDependencies(scalaVersionString)
+
+	def getDependencies(scalaVersion: String) =
+		scalaVersion match
+		{
+			case Version2_7_2 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.3", /*Specs*/"1.4.0", false)
+			case Version2_7_3 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.4", /*Specs*/"1.4.3", true)
+			case Version2_7_4 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
+			case Version2_7_5 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
+			case Version2_7_6 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
+			case Version2_8_0 => variableDependencies(true,  scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
+			case _ => error("Unsupported Scala version: " + scalaVersion)
+		}
+
+	/** Defines the dependencies for the given version of Scala, ScalaTest, and Specs.  If uniformTestOrg is true,
+	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name. */
+	private def variableDependencies(is28: Boolean, scalaVersion: String, scalaTestVersion: String, specsVersion: String, uniformTestOrg: Boolean) =
+	{
+		( if(is28) Nil else testDependencies(scalaTestVersion, specsVersion, uniformTestOrg)) ++
+			( if(is28) Seq("jline" % "jline" % "0.9.94" intransitive()) else Nil)
+	}
+	private def testDependencies(scalaTestVersion: String, specsVersion: String, uniformTestOrg: Boolean) =
+	{
+		testDependency("scalatest", scalaTestVersion, uniformTestOrg) ::
+		testDependency("specs", specsVersion, uniformTestOrg) ::
+		testDependency("scalacheck", "1.5", false) ::
+		Nil
+	}
+
+	/** Creates a dependency element for a test.  See 'testOrg' for a description of uniformTestOrg.*/
+
+	private def testDependency(name: String, version: String, uniformTestOrg: Boolean) =
+		testOrg(name, uniformTestOrg) % name % version % "optional" intransitive()
+
+	/** Returns the organization for the given test library.  If uniform is true,
+	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name.*/
+	private def testOrg(name: String, uniform: Boolean) = if(uniform) "org.scala-tools.testing" else "org." + name
 }
\ No newline at end of file
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
deleted file mode 100644
index 0ef71c57f..000000000
--- a/project/plugins/Plugins.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-import sbt._
-
-class Plugins(info: ProjectInfo) extends PluginDefinition(info)
-{
-	val scripted = "org.scala-tools.sbt" % "test" % "0.5.3"
-}
diff --git a/src/main/scala/sbt/Analyzer.scala b/src/main/scala/sbt/Analyzer.scala
deleted file mode 100644
index b1e8a0462..000000000
--- a/src/main/scala/sbt/Analyzer.scala
+++ /dev/null
@@ -1,246 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
- */
-package sbt
-
-import scala.tools.nsc.{io, plugins, symtab, Global, Phase}
-import io.{AbstractFile, PlainFile, ZipArchive}
-import plugins.{Plugin, PluginComponent}
-import symtab.Flags
-import scala.collection.mutable.{HashMap, HashSet, Map, Set}
-
-import java.io.File
-
-object Analyzer
-{
-	val PluginName = "sbt-analyzer"
-	val CallbackIDOptionName = "callback:"
-}
-class Analyzer(val global: Global) extends Plugin
-{
-	import global._
-	import Analyzer._
-	
-	val name = PluginName
-	val description = "A plugin to find all concrete instances of a given class and extract dependency information."
-	val components = List[PluginComponent](Component)
-	
-	private var callbackOption: Option[AnalysisCallback] = None
-	
-	override def processOptions(options: List[String], error: String => Unit)
-	{
-		for(option <- options)
-		{
-			if(option.startsWith(CallbackIDOptionName))
-				callbackOption = AnalysisCallback(option.substring(CallbackIDOptionName.length).toInt)
-			else
-				error("Option for sbt analyzer plugin not understood: " + option)
-		}
-		if(callbackOption.isEmpty)
-			error("Callback ID not specified for sbt analyzer plugin.")
-	}
-
-	override val optionsHelp: Option[String] =
-	{
-		val prefix = "  -P:" + name + ":"
-		Some(prefix + CallbackIDOptionName + "<callback-id>            Set the callback id.\n")
-	}
-
-	/* ================================================== */
-	// These two templates abuse scope for source compatibility between Scala 2.7.x and 2.8.x so that a single
-	// sbt codebase compiles with both series of versions.
-	// In 2.8.x, PluginComponent.runsAfter has type List[String] and the method runsBefore is defined on
-	//   PluginComponent with default value Nil.
-	// In 2.7.x, runsBefore does not exist on PluginComponent and PluginComponent.runsAfter has type String.
-	//
-	// Therefore, in 2.8.x, object runsBefore is shadowed by PluginComponent.runsBefore (which is Nil) and so
-	//   afterPhase :: runsBefore
-	// is equivalent to List[String](afterPhase)
-	// In 2.7.x, object runsBefore is not shadowed and so runsAfter has type String.
-	private object runsBefore { def :: (s: String) = s }
-	private abstract class CompatiblePluginComponent(afterPhase: String) extends PluginComponent
-	{
-		override val runsAfter = afterPhase :: runsBefore
-	}
-	/* ================================================== */
-	
-	private object Component extends CompatiblePluginComponent("jvm")
-	{
-		val global = Analyzer.this.global
-		val phaseName = Analyzer.this.name
-		def newPhase(prev: Phase) = new AnalyzerPhase(prev)
-	}
-
-	private class AnalyzerPhase(prev: Phase) extends Phase(prev)
-	{
-		def name = Analyzer.this.name
-		def run
-		{
-			val callback = callbackOption.get
-			val projectPath = callback.basePath
-			val projectPathString = Path.basePathString(projectPath).getOrElse({error("Could not determine base path for " + projectPath); ""})
-			def relativize(file: File) = Path.relativize(projectPath, projectPathString, file)
-			
-			val outputDir = new File(global.settings.outdir.value)
-			val outputPathOption = relativize(outputDir)
-			if(outputPathOption.isEmpty)
-				error("Output directory " + outputDir.getAbsolutePath + " must be in the project directory.")
-			val outputPath = outputPathOption.get
-			
-			val superclassNames = callback.superclassNames.map(newTermName)
-			val superclassesAll =
-				for(name <- superclassNames) yield
-				{
-					try { Some(global.definitions.getClass(name)) }
-					catch { case fe: scala.tools.nsc.FatalError => callback.superclassNotFound(name.toString); None }
-				}
-			val superclasses = superclassesAll.filter(_.isDefined).map(_.get)
-			
-			for(unit <- currentRun.units)
-			{
-				// build dependencies structure
-				val sourceFile = unit.source.file.file
-				val sourcePathOption = relativize(sourceFile)
-				if(sourcePathOption.isEmpty)
-					error("Source file " + sourceFile.getAbsolutePath + " must be in the project directory.")
-				val sourcePath = sourcePathOption.get
-				callback.beginSource(sourcePath)
-				for(on <- unit.depends)
-				{
-					val onSource = on.sourceFile
-					if(onSource == null)
-					{
-						classFile(on) match
-						{
-							case Some(f) =>
-							{
-								f match
-								{
-									case ze: ZipArchive#Entry => callback.jarDependency(new File(ze.getArchive.getName), sourcePath)
-									case pf: PlainFile =>
-									{
-										Path.relativize(outputPath, pf.file) match
-										{
-											case None =>  // dependency is a class file outside of the output directory
-												callback.classDependency(pf.file, sourcePath)
-											case Some(relativeToOutput) => // dependency is a product of a source not included in this compilation
-												callback.productDependency(relativeToOutput, sourcePath)
-										}
-									}
-									case _ => ()
-								}
-							}
-							case None => ()
-						}
-					}
-					else
-					{
-						for(depPath <- relativize(onSource.file))
-							callback.sourceDependency(depPath, sourcePath)
-					}
-				}
-				
-				// find subclasses and modules with main methods
-				for(clazz @ ClassDef(mods, n, _, _) <- unit.body)
-				{
-					val sym = clazz.symbol
-					if(sym != NoSymbol && mods.isPublic && !mods.isAbstract && !mods.isTrait &&
-						 !sym.isImplClass && sym.isStatic && !sym.isNestedClass)
-					{
-						val isModule = sym.isModuleClass
-						for(superclass <- superclasses.filter(sym.isSubClass))
-							callback.foundSubclass(sourcePath, sym.fullNameString, superclass.fullNameString, isModule)
-						if(isModule && hasMainMethod(sym))
-							callback.foundApplication(sourcePath, sym.fullNameString)
-					}
-				}
-				
-				// build list of generated classes
-				for(iclass <- unit.icode)
-				{
-					val sym = iclass.symbol
-					def addGenerated(separatorRequired: Boolean)
-					{
-						val classPath = pathOfClass(outputPath, sym, separatorRequired)
-						if(classPath.asFile.exists)
-							callback.generatedClass(sourcePath, classPath)
-					}
-					if(sym.isModuleClass && !sym.isImplClass)
-					{
-						if(isTopLevelModule(sym) && sym.linkedClassOfModule == NoSymbol)
-							addGenerated(false)
-						addGenerated(true)
-					}
-					else
-						addGenerated(false)
-				}
-				callback.endSource(sourcePath)
-			}
-		}
-	}
-	
-	private def classFile(sym: Symbol): Option[AbstractFile] =
-	{
-		import scala.tools.nsc.symtab.Flags
-		val name = sym.fullNameString(java.io.File.separatorChar) + (if (sym.hasFlag(Flags.MODULE)) "$" else "")
-		val entry = classPath.root.find(name, false)
-		if (entry ne null)
-			Some(entry.classFile)
-		else if(isTopLevelModule(sym))
-		{
-			val linked = sym.linkedClassOfModule
-			if(linked == NoSymbol)
-				None
-			else
-				classFile(linked)
-		}
-		else
-			None
-	}
-	
-	private def isTopLevelModule(sym: Symbol): Boolean =
-		atPhase (currentRun.picklerPhase.next) {
-			sym.isModuleClass && !sym.isImplClass && !sym.isNestedClass
-		}
-	private def pathOfClass(outputPath: Path, s: Symbol, separatorRequired: Boolean): Path =
-		pathOfClass(outputPath, s, separatorRequired, ".class")
-	private def pathOfClass(outputPath: Path, s: Symbol, separatorRequired: Boolean, postfix: String): Path =
-	{
-		if(s.owner.isPackageClass && s.isPackageClass)
-			packagePath(outputPath, s) / postfix
-		else
-			pathOfClass(outputPath, s.owner.enclClass, true, s.simpleName + (if(separatorRequired) "$" else "") + postfix)
-	}
-	private def packagePath(outputPath: Path, s: Symbol): Path =
-	{
-		if(s.isEmptyPackageClass || s.isRoot)
-			outputPath
-		else
-			packagePath(outputPath, s.owner.enclClass) / s.simpleName.toString
-	}
-	
-	private def hasMainMethod(sym: Symbol): Boolean =
-	{
-		val main = sym.info.nonPrivateMember(newTermName("main"))//nme.main)
-		main.tpe match
-		{
-			case OverloadedType(pre, alternatives) => alternatives.exists(alt => isVisible(alt) && isMainType(pre.memberType(alt)))
-			case tpe => isVisible(main) && isMainType(main.owner.thisType.memberType(main))
-		}
-	}
-	private def isVisible(sym: Symbol) = sym != NoSymbol && sym.isPublic && !sym.isDeferred
-	private def isMainType(tpe: Type) =
-	{
-		tpe match
-		{
-			// singleArgument is of type Symbol in 2.8.0 and type Type in 2.7.x
-			case MethodType(List(singleArgument), result) => isUnitType(result) && isStringArray(singleArgument)
-			case _ => false
-		}
-	}
-	private lazy val StringArrayType = appliedType(definitions.ArrayClass.typeConstructor, definitions.StringClass.tpe :: Nil)
-	// isStringArray is overloaded to handle the incompatibility between 2.7.x and 2.8.0
-	private def isStringArray(tpe: Type): Boolean = tpe.typeSymbol == StringArrayType.typeSymbol
-	private def isStringArray(sym: Symbol): Boolean = isStringArray(sym.tpe)
-	private def isUnitType(tpe: Type) = tpe.typeSymbol == definitions.UnitClass
-}
\ No newline at end of file
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 4fee79150..fc8ecd6a4 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -184,7 +184,7 @@ trait ManagedProject extends ClasspathProject
 	implicit def toGroupID(groupID: String): GroupID =
 	{
 		nonEmpty(groupID, "Group ID")
-		new GroupID(groupID, ScalaVersion.currentString)
+		new GroupID(groupID, buildScalaVersion)
 	}
 	implicit def toRepositoryName(name: String): RepositoryName =
 	{
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index ceef28d46..7152ac2c0 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -22,7 +22,7 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 	def dependencyPath = path(DefaultDependencyDirectoryName)
 	def libraries = descendents(dependencyPath, jarFilter)
 	override final def dependencies = Nil
-	
+
 	protected final def logInfo(messages: String*): Unit = atInfo { messages.foreach(message => log.info(message)) }
 	protected final def atInfo(action: => Unit)
 	{
@@ -31,10 +31,10 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 		action
 		log.setLevel(oldLevel)
 	}
-	
+
 	def projectClasspath = compilePath +++ libraries +++ sbtJarPath
 	def sbtJarPath = Path.lazyPathFinder { Path.fromFile(FileUtilities.sbtJar) :: Nil }
-		
+
 	abstract class BuilderCompileConfiguration extends AbstractCompileConfiguration
 	{
 		def projectPath = info.projectPath
@@ -54,11 +54,13 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 			def classpath = projectClasspath
 			def analysisPath = outputPath / DefaultMainAnalysisDirectoryName
 		}
-		
+
 	def tpe: String
 
-	val definitionCompileConditional = new BuilderCompileConditional(definitionCompileConfiguration, tpe)
-	final class BuilderCompileConditional(config: BuilderCompileConfiguration, tpe: String) extends AbstractCompileConditional(config)
+		import xsbt.{ComponentManager, ScalaInstance}
+
+	val definitionCompileConditional = new BuilderCompileConditional(definitionCompileConfiguration, buildCompiler, tpe)
+	final class BuilderCompileConditional(config: BuilderCompileConfiguration, compiler: xsbt.AnalyzingCompiler, tpe: String) extends AbstractCompileConditional(config, compiler)
 	{
 		type AnalysisType = BuilderCompileAnalysis
 		override protected def constructAnalysis(analysisPath: Path, projectPath: Path, log: Logger) =
@@ -94,12 +96,12 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 	protected def definitionChanged() {}
 	lazy val compile = compileTask
 	def compileTask = task { definitionCompileConditional.run }
-	
+
 	def projectDefinition: Either[String, Option[String]] =
 	{
 		definitionCompileConditional.analysis.allProjects.toList match
 		{
-			case Nil => 
+			case Nil =>
 				log.debug("No " + tpe + "s detected using default project.")
 				Right(None)
 			case singleDefinition :: Nil => Right(Some(singleDefinition))
@@ -114,7 +116,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 	private lazy val pluginProject =
 	{
 		if(pluginPath.exists)
-			Some(new PluginBuilderProject(ProjectInfo(pluginPath.asFile, Nil, None)(rawLogger)))
+			Some(new PluginBuilderProject(ProjectInfo(pluginPath.asFile, Nil, None)(rawLogger, info.app, info.buildScalaVersion)))
 		else
 			None
 	}
@@ -137,13 +139,13 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 			pluginUptodate() = flag
 			saveEnvironment()
 		}
-		
+
 		private def pluginTask(f: => Option[String]) = task { if(!pluginUptodate.value) f else None }
-		
+
 		lazy val syncPlugins = pluginTask(sync()) dependsOn(extractSources)
 		lazy val extractSources = pluginTask(extract()) dependsOn(update)
 		lazy val update = pluginTask(loadAndUpdate()) dependsOn(compile)
-		
+
 		private def sync() = pluginCompileConditional.run orElse { setUptodate(true); None }
 		private def extract() =
 		{
@@ -161,7 +163,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 			Control.thread(projectDefinition) {
 				case Some(definition) =>
 					logInfo("\nUpdating plugins...")
-					val pluginInfo = ProjectInfo(info.projectPath.asFile, Nil, None)(rawLogger)
+					val pluginInfo = ProjectInfo(info.projectPath.asFile, Nil, None)(rawLogger, info.app, info.buildScalaVersion)
 					val pluginBuilder = Project.constructProject(pluginInfo, Project.getProjectClass[PluginDefinition](definition, projectClasspath, getClass.getClassLoader))
 					pluginBuilder.projectName() = "Plugin builder"
 					pluginBuilder.projectVersion() = OpaqueVersion("1.0")
@@ -184,8 +186,8 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 		}
 		def plugins = descendents(managedDependencyPath, jarFilter)
 		def pluginClasspath: PathFinder = plugins +++ pluginCompileConfiguration.outputDirectory
-		
-		lazy val pluginCompileConditional = new BuilderCompileConditional(pluginCompileConfiguration, "plugin")
+
+		lazy val pluginCompileConditional = new BuilderCompileConditional(pluginCompileConfiguration, buildCompiler, "plugin")
 		lazy val pluginCompileConfiguration =
 			new BuilderCompileConfiguration
 			{
diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index 4abcc1c1d..c103e4e4b 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -4,102 +4,57 @@
 package sbt
 
 import java.io.File
+import xsbt.{AnalyzingCompiler, CompileFailed, CompilerArguments, ComponentManager, ScalaInstance}
 
 object CompileOrder extends Enumeration
 {
 	val Mixed, JavaThenScala, ScalaThenJava = Value
 }
-private object CompilerCore
-{
-	def scalaClasspathForJava = FileUtilities.scalaJars.map(_.getAbsolutePath).mkString(File.pathSeparator)
-}
+
 sealed abstract class CompilerCore
 {
-	val ClasspathOptionString = "-classpath"
-	val OutputOptionString = "-d"
+	final def apply(label: String, sources: Iterable[Path], classpath: Iterable[Path], outputDirectory: Path, scalaOptions: Seq[String], log: Logger): Option[String] =
+		apply(label, sources, classpath, outputDirectory, scalaOptions, Nil, CompileOrder.Mixed, log)
+	final def apply(label: String, sources: Iterable[Path], classpath: Iterable[Path], outputDirectory: Path, scalaOptions: Seq[String], javaOptions: Seq[String], order: CompileOrder.Value, log: Logger): Option[String] =
+	{
+			def filteredSources(extension: String) = sources.filter(_.asFile.getName.endsWith(extension))
+			def fileSet(sources: Iterable[Path]) = Set() ++ sources.map(_.asFile)
+			def process(label: String, sources: Iterable[_], act: => Unit) =
+				() => if(sources.isEmpty) log.debug("No " + label + " sources.") else act
 
-	// Returns false if there were errors, true if there were not.
-	protected def process(args: List[String], log: Logger): Boolean
-	// Returns false if there were errors, true if there were not.
-	protected def processJava(args: List[String], log: Logger): Boolean = true
-	protected def scalaClasspathForJava: String
-	def actionStartMessage(label: String): String
-	def actionNothingToDoMessage: String
-	def actionSuccessfulMessage: String
-	def actionUnsuccessfulMessage: String
-
-	private def classpathString(rawClasspathString: String, includeScala: Boolean) =
-		if(includeScala)
-			List(rawClasspathString, scalaClasspathForJava).mkString(File.pathSeparator)
-		else
-			rawClasspathString
-
-	final def apply(label: String, sources: Iterable[Path], classpathString: String, outputDirectory: Path, options: Seq[String], log: Logger): Option[String] =
-		apply(label, sources, classpathString, outputDirectory, options, Nil, CompileOrder.Mixed, log)
-	final def apply(label: String, sources: Iterable[Path], rawClasspathString: String, outputDirectory: Path, options: Seq[String], javaOptions: Seq[String], order: CompileOrder.Value, log: Logger): Option[String] =
+		val javaSources = fileSet(filteredSources(".java"))
+		val scalaSources = fileSet( if(order == CompileOrder.Mixed) sources else filteredSources(".scala") )
+		val classpathSet = fileSet(classpath)
+		val scalaCompile = process("Scala", scalaSources, processScala(scalaSources, classpathSet, outputDirectory.asFile, scalaOptions, log) )
+		val javaCompile = process("Java", javaSources, processJava(javaSources, classpathSet, outputDirectory.asFile, javaOptions, log))
+		try { doCompile(label, sources, outputDirectory, order, log)(javaCompile, scalaCompile) }
+		catch { case e: xsbti.CompileFailed => log.trace(e); Some(e.toString) }
+	}
+	protected def doCompile(label: String, sources: Iterable[Path], outputDirectory: Path, order: CompileOrder.Value, log: Logger)(javaCompile: () => Unit, scalaCompile: () => Unit) =
 	{
 		log.info(actionStartMessage(label))
-		def classpathOption(includeScala: Boolean): List[String] =
+		if(sources.isEmpty)
 		{
-			val classpath = classpathString(rawClasspathString, includeScala)
-			if(classpath.isEmpty)
-				Nil
-			else
-				List(ClasspathOptionString, classpath)
+			log.info(actionNothingToDoMessage)
+			None
 		}
-		val outputDir = outputDirectory.asFile
-		FileUtilities.createDirectory(outputDir, log) orElse
+		else
 		{
-			def classpathAndOut(javac: Boolean): List[String] = OutputOptionString :: outputDir.getAbsolutePath :: classpathOption(javac)
-
-			Control.trapUnit("Compiler error: ", log)
+			FileUtilities.createDirectory(outputDirectory.asFile, log) orElse Control.trapUnit("Compiler error: ", log)
 			{
-				val sourceList = sources.map(_.asFile.getAbsolutePath).toList
-				if(sourceList.isEmpty)
-				{
-					log.info(actionNothingToDoMessage)
-					None
-				}
-				else
-				{
-					def filteredSources(extension: String) = sourceList.filter(_.endsWith(extension))
-					def compile(label: String, sources: List[String], options: Seq[String], includeScala: Boolean)(process: (List[String], Logger) => Boolean) =
-					{
-						if(sources.isEmpty)
-						{
-							log.debug("No "+label+" sources to compile.")
-							true
-						}
-						else
-						{
-							val arguments = (options ++ classpathAndOut(includeScala) ++ sources).toList
-							log.debug(label + " arguments: " + arguments.mkString(" "))
-							process(arguments, log)
-						}
-					}
-					def scalaCompile = () =>
-					{
-						val scalaSourceList = if(order == CompileOrder.Mixed) sourceList else filteredSources(".scala")
-						compile("Scala", scalaSourceList, options, false)(process)
-					}
-					def javaCompile = () =>
-					{
-						val javaSourceList = filteredSources(".java")
-						compile("Java", javaSourceList, javaOptions, true)(processJava)
-					}
-
-					val (first, second) = if(order == CompileOrder.JavaThenScala) (javaCompile, scalaCompile) else (scalaCompile, javaCompile)
-					if(first() && second())
-					{
-						log.info(actionSuccessfulMessage)
-						None
-					}
-					else
-						Some(actionUnsuccessfulMessage)
-				}
+				val (first, second) = if(order == CompileOrder.JavaThenScala) (javaCompile, scalaCompile) else (scalaCompile, javaCompile)
+				first()
+				second()
+				log.info(actionSuccessfulMessage)
+				None
 			}
 		}
 	}
+	def actionStartMessage(label: String): String
+	def actionNothingToDoMessage: String
+	def actionSuccessfulMessage: String
+	protected def processScala(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger): Unit
+	protected def processJava(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger): Unit
 }
 
 sealed abstract class CompilerBase extends CompilerCore
@@ -107,199 +62,75 @@ sealed abstract class CompilerBase extends CompilerCore
 	def actionStartMessage(label: String) = "Compiling " + label + " sources..."
 	val actionNothingToDoMessage = "Nothing to compile."
 	val actionSuccessfulMessage = "Compilation successful."
-	val actionUnsuccessfulMessage = "Compilation unsuccessful."
-}
-final class ForkCompile(config: ForkScalaCompiler) extends CompilerBase
-{
-	import java.io.File
-	protected def process(arguments: List[String], log: Logger) =
-		Fork.scalac(config.javaHome, config.compileJVMOptions, config.scalaJars, arguments, log) == 0
-	override protected def processJava(args: List[String], log: Logger) =
-		Fork.javac(config.javaHome, args, log) == 0
-	override protected def scalaClasspathForJava = config.scalaJars.mkString(File.pathSeparator)
-}
-object ForkCompile
-{
-	def apply(config: ForkScalaCompiler, conditional: CompileConditional) =
-	{
-		import conditional.config.{compileOrder, classpath, javaOptions, label, log, options, outputDirectory, sources}
-		// recompile only if any sources were modified after any classes or no classes exist
-		val sourcePaths = sources.get
-		val newestSource = (0L /: sourcePaths)(_ max _.lastModified)
-		val products = (outputDirectory  ** GlobFilter("*.class")).get
-		val oldestClass = (java.lang.Long.MAX_VALUE /: products)(_ min _.lastModified)
-		if(products.isEmpty || newestSource > oldestClass)
-		{
-			// full recompile, since we are not doing proper dependency tracking
-			FileUtilities.clean(outputDirectory :: Nil, log)
-			val compiler = new ForkCompile(config)
-			FileUtilities.createDirectory(outputDirectory.asFile, log)
-			compiler(label, sourcePaths, Path.makeString(classpath.get), outputDirectory, options, javaOptions, compileOrder, log)
-		}
-		else
-		{
-			log.info("Compilation up to date.")
-			None
-		}
-	}
 }
 
 // The following code is based on scala.tools.nsc.Main and scala.tools.nsc.ScalaDoc
 // Copyright 2005-2008 LAMP/EPFL
 // Original author: Martin Odersky
 
-final class Compile(maximumErrors: Int) extends CompilerBase
+final class Compile(maximumErrors: Int, compiler: AnalyzingCompiler, analysisCallback: AnalysisCallback, baseDirectory: Path) extends CompilerBase
 {
-	protected def process(arguments: List[String], log: Logger) =
+	protected def processScala(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger)
 	{
-		import scala.tools.nsc.{CompilerCommand, FatalError, Global, Settings, reporters, util}
-		import util.FakePos
-		var reporter = new LoggerReporter(maximumErrors, log)
-		val settings = new Settings(reporter.error)
-		val command = new CompilerCommand(arguments, settings, error, false)
-
-		object compiler extends Global(command.settings, reporter)
-		if(!reporter.hasErrors)
-		{
-			val run = new compiler.Run
-			run compile command.files
-			reporter.printSummary()
-		}
-		!reporter.hasErrors
+		val callbackInterface = new AnalysisInterface(analysisCallback, baseDirectory, outputDirectory)
+		compiler(Set() ++ sources, Set() ++ classpath, outputDirectory, options, true, callbackInterface, maximumErrors, log)
+	}
+	protected def processJava(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger)
+	{
+		val arguments = (new CompilerArguments(compiler.scalaInstance))(sources, classpath, outputDirectory, options, true)
+		val code = Process("javac", arguments) ! log
+		if( code != 0 ) throw new CompileFailed(arguments.toArray, "javac returned nonzero exit code")
 	}
-	override protected def processJava(args: List[String], log: Logger) =
-		(Process("javac", args) ! log) == 0
-	protected def scalaClasspathForJava = CompilerCore.scalaClasspathForJava
 }
-final class Scaladoc(maximumErrors: Int) extends CompilerCore
+final class Scaladoc(maximumErrors: Int, compiler: AnalyzingCompiler) extends CompilerCore
 {
-	protected def scalaClasspathForJava = CompilerCore.scalaClasspathForJava
-	protected def process(arguments: List[String], log: Logger) =
-	{
-		import scala.tools.nsc.{doc, CompilerCommand, FatalError, Global, reporters, util}
-		import util.FakePos
-		val reporter = new LoggerReporter(maximumErrors, log)
-		val docSettings: doc.Settings = new doc.Settings(reporter.error)
-		val command = new CompilerCommand(arguments, docSettings, error, false)
-		object compiler extends Global(command.settings, reporter)
-		{
-			override val onlyPresentation = true
-		}
-		if(!reporter.hasErrors)
-		{
-			val run = new compiler.Run
-			run compile command.files
-			val generator = new doc.DefaultDocDriver
-			{
-				lazy val global: compiler.type = compiler
-				lazy val settings = docSettings
-			}
-			generator.process(run.units)
-			reporter.printSummary()
-		}
-		!reporter.hasErrors
-	}
+	protected def processScala(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger): Unit =
+		compiler.doc(sources, classpath, outputDirectory, options, maximumErrors, log)
+	protected def processJava(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger) = ()
+
 	def actionStartMessage(label: String) = "Generating API documentation for " + label + " sources..."
 	val actionNothingToDoMessage = "No sources specified."
 	val actionSuccessfulMessage = "API documentation generation successful."
 	def actionUnsuccessfulMessage = "API documentation generation unsuccessful."
 }
-
-// The following code is based on scala.tools.nsc.reporters.{AbstractReporter, ConsoleReporter}
-// Copyright 2002-2009 LAMP/EPFL
-// Original author: Martin Odersky
-final class LoggerReporter(maximumErrors: Int, log: Logger) extends scala.tools.nsc.reporters.Reporter
+final class Console(compiler: AnalyzingCompiler) extends NotNull
 {
-	import scala.tools.nsc.util.{FakePos,NoPosition,Position}
-	private val positions = new scala.collection.mutable.HashMap[Position, Severity]
-
-	def error(msg: String) { error(FakePos("scalac"), msg) }
-
-	def printSummary()
+	/** Starts an interactive scala interpreter session with the given classpath.*/
+	def apply(classpath: Iterable[Path], log: Logger): Option[String] =
+		apply(classpath, "", log)
+	def apply(classpath: Iterable[Path], initialCommands: String, log: Logger): Option[String] =
 	{
-		if(WARNING.count > 0)
-			log.warn(countElementsAsString(WARNING.count, "warning") + " found")
-		if(ERROR.count > 0)
-			log.error(countElementsAsString(ERROR.count, "error") + " found")
+		def console0 = compiler.console(Set() ++ classpath.map(_.asFile), initialCommands, log)
+		JLine.withJLine( Run.executeTrapExit(console0, log) )
 	}
+}
 
-	def display(pos: Position, msg: String, severity: Severity)
+private final class AnalysisInterface(delegate: AnalysisCallback, basePath: Path, outputDirectory: File) extends xsbti.AnalysisCallback with NotNull
+{
+	val outputPath = Path.fromFile(outputDirectory)
+	def superclassNames = delegate.superclassNames.toSeq.toArray[String]
+	def superclassNotFound(superclassName: String) = delegate.superclassNotFound(superclassName)
+	def beginSource(source: File) = delegate.beginSource(srcPath(source))
+	def foundSubclass(source: File, subclassName: String, superclassName: String, isModule: Boolean) =
+		delegate.foundSubclass(srcPath(source), subclassName, superclassName, isModule)
+	def sourceDependency(dependsOn: File, source: File) =
+		delegate.sourceDependency(srcPath(dependsOn), srcPath(source))
+	def jarDependency(jar: File, source: File) = delegate.jarDependency(jar, srcPath(source))
+	def generatedClass(source: File, clazz: File) = delegate.generatedClass(srcPath(source), classPath(clazz))
+	def endSource(source: File) = delegate.endSource(srcPath(source))
+	def foundApplication(source: File, className: String) = delegate.foundApplication(srcPath(source), className)
+	def classDependency(clazz: File, source: File) =
 	{
-		severity.count += 1
-		if(severity != ERROR || maximumErrors < 0 || severity.count <= maximumErrors)
-			print(severityToLevel(severity), pos, msg)
-	}
-	private def severityToLevel(severity: Severity): Level.Value =
-		severity match
+		val sourcePath = srcPath(source)
+		Path.relativize(outputPath, clazz) match
 		{
-			case ERROR => Level.Error
-			case WARNING => Level.Warn
-			case INFO => Level.Info
-		}
-
-	private def print(level: Level.Value, posIn: Position, msg: String)
-	{
-		// the implicits keep source compatibility with the changes in 2.8 : Position.{source,line,column} are no longer Options
-		implicit def anyToOption[T <: AnyRef](t: T): Option[T] = Some(t)
-		implicit def intToOption(t: Int): Option[Int] = Some(t)
-		val pos =
-			posIn match
-			{
-				case null | NoPosition => NoPosition
-				case x: FakePos => x
-				case x =>
-					posIn.inUltimateSource(posIn.source.get)
-			}
-		pos match
-		{
-			case NoPosition => log.log(level, msg)
-			case FakePos(fmsg) => log.log(level, fmsg+" "+msg)
-			case _ =>
-				val sourcePrefix = pos.source.map(_.file.path).getOrElse("")
-				val lineNumberString = pos.line.map(line => ":" + line + ":").getOrElse(":") + " "
-				log.log(level, sourcePrefix + lineNumberString + msg)
-				if (!pos.line.isEmpty)
-				{
-					val lineContent = pos.lineContent.stripLineEnd
-					log.log(level, lineContent) // source line with error/warning
-					for(offset <- pos.offset; src <- pos.source)
-					{
-						val pointer = offset - src.lineToOffset(src.offsetToLine(offset))
-						val pointerSpace = (lineContent: Seq[Char]).take(pointer).map { case '\t' => '\t'; case _ => ' ' }
-						log.log(level, pointerSpace.mkString + "^") // pointer to the column position of the error/warning
-					}
-				}
-		}
-	}
-	override def reset =
-	{
-		super.reset
-		positions.clear
-	}
-
-	protected def info0(pos: Position, msg: String, severity: Severity, force: Boolean)
-	{
-		severity match
-		{
-			case WARNING | ERROR =>
-			{
-				if(!testAndLog(pos, severity))
-					display(pos, msg, severity)
-			}
-			case _ => display(pos, msg, severity)
-		}
-	}
-
-	private def testAndLog(pos: Position, severity: Severity): Boolean =
-	{
-		if(pos == null || pos.offset.isEmpty)
-			false
-		else if(positions.get(pos).map(_ >= severity).getOrElse(false))
-			true
-		else
-		{
-			positions(pos) = severity
-			false
+			case None =>  // dependency is a class file outside of the output directory
+				delegate.classDependency(clazz, sourcePath)
+			case Some(relativeToOutput) => // dependency is a product of a source not included in this compilation
+				delegate.productDependency(relativeToOutput, sourcePath)
 		}
 	}
+	def relativizeOrAbs(base: Path, file: File) = Path.relativize(base, file).getOrElse(Path.fromFile(file))
+	def classPath(file: File) = relativizeOrAbs(outputPath, file)
+	def srcPath(file: File) = relativizeOrAbs(basePath, file)
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
index 446f4d9a1..802c1afd0 100644
--- a/src/main/scala/sbt/Conditional.scala
+++ b/src/main/scala/sbt/Conditional.scala
@@ -3,29 +3,31 @@
  */
 package sbt
 
+import xsbt.AnalyzingCompiler
+
 trait Conditional[Source, Product, External] extends NotNull
 {
 	type AnalysisType <: TaskAnalysis[Source, Product, External]
 	val analysis: AnalysisType = loadAnalysis
-	
+
 	protected def loadAnalysis: AnalysisType
 	protected def log: Logger
 
 	protected def productType: String
 	protected def productTypePlural: String
-	
+
 	protected def sourcesToProcess: Iterable[Source]
-	
+
 	protected def sourceExists(source: Source): Boolean
 	protected def sourceLastModified(source: Source): Long
-	
+
 	protected def productExists(product: Product): Boolean
 	protected def productLastModified(product: Product): Long
-	
+
 	protected def externalInfo(externals: Iterable[External]): Iterable[(External, ExternalInfo)]
-	
+
 	protected def execute(cAnalysis: ConditionalAnalysis): Option[String]
-	
+
 	final case class ExternalInfo(available: Boolean, lastModified: Long) extends NotNull
 	trait ConditionalAnalysis extends NotNull
 	{
@@ -35,7 +37,7 @@ trait Conditional[Source, Product, External] extends NotNull
 		def invalidatedSourcesCount: Int
 		def removedSourcesCount: Int
 	}
-	
+
 	final def run =
 	{
 		val result = execute(analyze)
@@ -45,7 +47,7 @@ trait Conditional[Source, Product, External] extends NotNull
 	private def analyze =
 	{
 		import scala.collection.mutable.HashSet
-		
+
 		val sourcesSnapshot = sourcesToProcess
 		val removedSources = new HashSet[Source]
 		removedSources ++= analysis.allSources
@@ -56,10 +58,10 @@ trait Conditional[Source, Product, External] extends NotNull
 			log.debug("Source " + removed + " removed.")
 			analysis.removeDependent(removed)
 		}
-		
+
 		val unmodified = new HashSet[Source]
 		val modified = new HashSet[Source]
-		
+
 		for(source <- sourcesSnapshot)
 		{
 			if(isSourceModified(source))
@@ -102,7 +104,7 @@ trait Conditional[Source, Product, External] extends NotNull
 				analysis.removeExternalDependency(external)
 			}
 		}
-		
+
 		val handled = new scala.collection.mutable.HashSet[Source]
 		val transitive = !java.lang.Boolean.getBoolean("sbt.intransitive")
 		def markModified(changed: Iterable[Source]) { for(c <- changed if !handled.contains(c)) markSourceModified(c) }
@@ -119,10 +121,10 @@ trait Conditional[Source, Product, External] extends NotNull
 		markModified(modified.toList)
 		if(transitive)
 			removedSources.foreach(markDependenciesModified)
-		
+
 		for(changed <- removedSources ++ modified)
 			analysis.removeSource(changed)
-		
+
 		new ConditionalAnalysis
 		{
 			def dirtySources = wrap.Wrappers.readOnly(modified)
@@ -138,7 +140,7 @@ trait Conditional[Source, Product, External] extends NotNull
 			}
 		}
 	}
-	
+
 	protected def checkLastModified = true
 	protected def noProductsImpliesModified = true
 	protected def isSourceModified(source: Source) =
@@ -155,7 +157,7 @@ trait Conditional[Source, Product, External] extends NotNull
 				val sourceModificationTime = sourceLastModified(source)
 				def isOutofdate(p: Product) =
 					!productExists(p) || (checkLastModified && productLastModified(p) < sourceModificationTime)
-				
+
 				sourceProducts.find(isOutofdate) match
 				{
 					case Some(modifiedProduct) =>
@@ -206,7 +208,7 @@ abstract class CompileConfiguration extends AbstractCompileConfiguration
 	def testDefinitionClassNames: Iterable[String]
 }
 import java.io.File
-class CompileConditional(override val config: CompileConfiguration) extends AbstractCompileConditional(config)
+class CompileConditional(override val config: CompileConfiguration, compiler: AnalyzingCompiler) extends AbstractCompileConditional(config, compiler)
 {
 	import config._
 	type AnalysisType = CompileAnalysis
@@ -220,7 +222,7 @@ class CompileConditional(override val config: CompileConfiguration) extends Abst
 			analysis.addTest(sourcePath, TestDefinition(isModule, subclassName, superclassName))
 	}
 }
-abstract class AbstractCompileConditional(val config: AbstractCompileConfiguration) extends Conditional[Path, Path, File]
+abstract class AbstractCompileConditional(val config: AbstractCompileConfiguration, val compiler: AnalyzingCompiler) extends Conditional[Path, Path, File]
 {
 	import config._
 	type AnalysisType <: BasicCompileAnalysis
@@ -232,31 +234,32 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 		a
 	}
 	protected def constructAnalysis(analysisPath: Path, projectPath: Path, log: Logger): AnalysisType
-	
+
 	protected def log = config.log
-	
+
 	protected def productType = "class"
 	protected def productTypePlural = "classes"
 	protected def sourcesToProcess = sources.get
-	
+
 	protected def sourceExists(source: Path) = source.asFile.exists
 	protected def sourceLastModified(source: Path) = source.asFile.lastModified
-	
+
 	protected def productExists(product: Path) = product.asFile.exists
 	protected def productLastModified(product: Path) = product.asFile.lastModified
-	
+
+	private def libraryJar = compiler.scalaInstance.libraryJar
 	protected def externalInfo(externals: Iterable[File]) =
 	{
 		val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get)
 		for(external <- externals) yield
 		{
-			val available = external.exists && ClasspathUtilities.onClasspath(classpathJars, classpathDirs, external)
+			val available = external.exists && (external == libraryJar || ClasspathUtilities.onClasspath(classpathJars, classpathDirs, external) )
 			if(!available)
 				log.debug("External " + external + (if(external.exists) " not on classpath." else " does not exist."))
 			(external, ExternalInfo(available, external.lastModified))
 		}
 	}
-	
+
 	import ChangeDetection.{LastModifiedOnly, HashOnly, HashAndLastModified, HashAndProductsExist}
 	protected def changeDetectionMethod: ChangeDetection.Value = HashAndProductsExist
 	override protected def checkLastModified = changeDetectionMethod != HashAndProductsExist
@@ -271,7 +274,7 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 			case HashOnly => hashModified(source)
 			case LastModifiedOnly => super.isSourceModified(source)
 		}
-	
+
 	import scala.collection.mutable.{Buffer, ListBuffer}
 	private val newHashes: Buffer[(Path, Option[Array[Byte]])] = new ListBuffer
 	private def warnHashError(source: Path, message: String)
@@ -312,22 +315,21 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 		log.info(executeAnalysis.toString)
 		finishHashes()
 		import executeAnalysis.dirtySources
-		
+
 		// the output directory won't show up in the classpath unless it exists, so do this before classpath.get
 		val outputDir = outputDirectory.asFile
 		FileUtilities.createDirectory(outputDir, log)
-		
+
 		val cp = classpath.get
 		if(!dirtySources.isEmpty)
 			checkClasspath(cp)
-		val classpathString = Path.makeString(cp)
-		val id = AnalysisCallback.register(analysisCallback)
-		val allOptions = (("-Xplugin:" + FileUtilities.sbtJar.getAbsolutePath) ::
-			("-P:sbt-analyzer:callback:" + id.toString) :: Nil) ++ options
-		def run = (new Compile(config.maxErrors))(label, dirtySources, classpathString, outputDirectory, allOptions, javaOptions, compileOrder, log)
+		def run =
+		{
+			val compile = new Compile(config.maxErrors, compiler, analysisCallback, projectPath)
+			compile(label, dirtySources, cp, outputDirectory, options, javaOptions, compileOrder, log)
+		}
 		val loader = ClasspathUtilities.toLoader(cp)
 		val r = classfile.Analyze(projectPath, outputDirectory, dirtySources, sourceRoots.get, log)(analysis.allProducts, analysisCallback, loader)(run)
-		AnalysisCallback.unregister(id)
 		if(log.atLevel(Level.Debug))
 		{
 			/** This checks that the plugin accounted for all classes in the output directory.*/
@@ -377,7 +379,7 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 			}
 		}
 	}
-	
+
 	protected def analysisCallback: AnalysisCallback
 }
 object ChangeDetection extends Enumeration
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 474cf11ac..649eb6070 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -43,8 +43,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def manifestClassPath: Option[String] = None
 	def dependencies = info.dependencies ++ subProjects.values.toList
 
-	val mainCompileConditional = new CompileConditional(mainCompileConfiguration)
-	val testCompileConditional = new CompileConditional(testCompileConfiguration)
+	val mainCompileConditional = new CompileConditional(mainCompileConfiguration, buildCompiler)
+	val testCompileConditional = new CompileConditional(testCompileConfiguration, buildCompiler)
 
 	def compileOrder = CompileOrder.Mixed
 
@@ -95,6 +95,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		TestFilter(new impl.TestQuickFilter(analysis, failedOnly, path, log))  :: TestListeners(new impl.TestStatusReporter(path, log) :: Nil) :: Nil
 	}
 
+	def consoleInit = ""
+
 	protected def includeTest(test: String): Boolean = true
 
 	/** This is called to create the initial directories when a user makes a new project from
@@ -212,31 +214,26 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 
 	/** Configures forking the compiler and runner.  Use ForkScalaCompiler, ForkScalaRun or mix together.*/
 	def fork: Option[ForkScala] = None
-	private def doCompile(conditional: CompileConditional) =
-	{
-		fork match
-		{
-			case Some(fc: ForkScalaCompiler) => ForkCompile(fc, conditional)
-			case _ => conditional.run
-		}
-	}
-	private def getRunner =
+	private def doCompile(conditional: CompileConditional) = conditional.run
+	implicit def defaultRunner: ScalaRun =
 	{
 		fork match
 		{
 			case Some(fr: ForkScalaRun) => new ForkRun(fr)
-			case _ => Run
+			case _ => new Run(buildCompiler)
 		}
 	}
 
+	def basicConsoleTask = consoleTask(consoleClasspath, consoleInit)
+
 	protected def runTask(mainClass: String): MethodTask = task { args => runTask(Some(mainClass), runClasspath, args) dependsOn(compile, copyResources) }
 
 	protected def compileAction = task { doCompile(mainCompileConditional) } describedAs MainCompileDescription
 	protected def testCompileAction = task { doCompile(testCompileConditional) } dependsOn compile describedAs TestCompileDescription
 	protected def cleanAction = cleanTask(outputPath, cleanOptions) describedAs CleanDescription
-	protected def runAction = task { args => runTask(getMainClass(true), runClasspath, args, getRunner) dependsOn(compile, copyResources) } describedAs RunDescription
-	protected def consoleQuickAction = consoleTask(consoleClasspath, Run) describedAs ConsoleQuickDescription
-	protected def consoleAction = consoleTask(consoleClasspath, Run).dependsOn(testCompile, copyResources, copyTestResources) describedAs ConsoleDescription
+	protected def runAction = task { args => runTask(getMainClass(true), runClasspath, args) dependsOn(compile, copyResources) } describedAs RunDescription
+	protected def consoleQuickAction = basicConsoleTask describedAs ConsoleQuickDescription
+	protected def consoleAction = basicConsoleTask.dependsOn(testCompile, copyResources, copyTestResources) describedAs ConsoleDescription
 	protected def docAction = scaladocTask(mainLabel, mainSources, mainDocPath, docClasspath, documentOptions).dependsOn(compile) describedAs DocDescription
 	protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription
 	protected def testAction = defaultTestTask(testOptions)
@@ -315,6 +312,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		mapScalaModule(snapshot.scalaCompiler, ScalaArtifacts.CompilerID)
 	}
 	override def watchPaths = mainSources +++ testSources +++ mainResources +++ testResources
+	private def mapScalaModule(in: Iterable[_], id: String) = in.map(jar => ModuleID(ScalaArtifacts.Organization, id, buildScalaVersion))
 }
 abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProject with WebScalaPaths
 { p =>
@@ -327,7 +325,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 
 	lazy val jettyInstance = new JettyRunner(jettyConfiguration)
 
-	def jettyConfiguration =
+	def jettyConfiguration: JettyConfiguration =
 		new DefaultJettyConfiguration
 		{
 			def classpath = jettyRunClasspath
@@ -335,6 +333,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 			def war = jettyWebappPath
 			def contextPath = jettyContextPath
 			def classpathName = "test"
+			def parentLoader = buildScalaInstance.loader
 			def scanDirectories = p.scanDirectories.map(_.asFile)
 			def scanInterval = p.scanInterval
 			def port = jettyPort
@@ -443,12 +442,6 @@ object BasicScalaProject
 		log.warn("Multiple classes with a main method were detected.  Specify main class explicitly with:")
 		log.warn("     override mainClass = Some(\"className\")")
 	}
-	private def mapScalaModule(in: Iterable[_], id: String) =
-	{
-		ScalaVersion.current.toList.flatMap { scalaVersion =>
-			in.map(jar => ModuleID(ScalaArtifacts.Organization, id, scalaVersion))
-		}
-	}
 }
 object BasicWebScalaProject
 {
diff --git a/src/main/scala/sbt/Environment.scala b/src/main/scala/sbt/Environment.scala
index 21060382d..fb1f10773 100644
--- a/src/main/scala/sbt/Environment.scala
+++ b/src/main/scala/sbt/Environment.scala
@@ -19,10 +19,10 @@ trait Environment
 		def get: Option[T] = resolve.toOption
 		/** Returns full information about this property's current value. */
 		def resolve: PropertyResolution[T]
-		
+
 		def foreach(f: T => Unit): Unit = resolve.foreach(f)
 	}
-	
+
 	/** Creates a system property with the given name and no default value.*/
 	def system[T](propName: String)(implicit format: Format[T]): Property[T]
 	/** Creates a system property with the given name and the given default value to use if no value is explicitly specified.*/
@@ -67,12 +67,12 @@ trait BasicEnvironment extends Environment
 	protected def parentEnvironment: Option[BasicEnvironment] = None
 	/** The identifier used in messages to refer to this environment. */
 	def environmentLabel = envBackingPath.absolutePath
-	
+
 	private[this] var isModified = false
 	private[sbt] def setEnvironmentModified(modified: Boolean) { synchronized { isModified = modified } }
 	private[this] def isEnvironmentModified = synchronized { isModified }
-	
-	
+
+
 	implicit val IntFormat: Format[Int] = new SimpleFormat[Int] { def fromString(s: String) = java.lang.Integer.parseInt(s) }
 	implicit val LongFormat: Format[Long] = new SimpleFormat[Long] { def fromString(s: String) = java.lang.Long.parseLong(s) }
 	implicit val DoubleFormat: Format[Double] = new SimpleFormat[Double] { def fromString(s: String) = java.lang.Double.parseDouble(s) }
@@ -94,8 +94,8 @@ trait BasicEnvironment extends Environment
 			def fromString(s: String) = Version.fromString(s).fold(msg => error(msg), x => x)
 		}
 	implicit val FileFormat = Format.file
-	
-	
+
+
 	/** Implementation of 'Property' for user-defined properties. */
 	private[sbt] class UserProperty[T](lazyDefaultValue: => Option[T], format: Format[T], inheritEnabled: Boolean,
 		inheritFirst: Boolean, private[BasicEnvironment] val manifest: Manifest[T]) extends Property[T]
@@ -126,22 +126,26 @@ trait BasicEnvironment extends Environment
 				case None =>
 					val inherited = inheritedValue
 					 // note that the following means the default value will not be used if an exception occurs inheriting
-					inherited orElse
-					{
-						defaultValue match
-						{
-							case Some(v) => DefinedValue(v, false, true)
-							case None => inherited
-						}
-					}
+					inherited orElse getDefault(inherited)
 			}
 		private def resolveDefaultFirst =
-			(explicitValue() orElse defaultValue) match
+			explicitValue() match
 			{
-				case Some(v) => DefinedValue(v, false, explicitValue().isEmpty)
-				case None => inheritedValue
+				case Some(v) => DefinedValue(v, false, false)
+				case None => getDefault(inheritedValue)
 			}
-		
+		private def getDefault(orElse: => PropertyResolution[T]): PropertyResolution[T] =
+			try
+			{
+				defaultValue match
+				{
+					case Some(v) => DefinedValue(v, false, true)
+					case None => orElse
+				}
+			} catch { case e: Exception =>
+				ResolutionException("Error while evaluating default value for property", Some(e))
+			}
+
 		private def inheritedValue: PropertyResolution[T] =
 		{
 			val propOption = if(inheritEnabled) parentProperty else None
@@ -152,7 +156,7 @@ trait BasicEnvironment extends Environment
 			}
 		}
 		private def parentProperty = for(parent <- parentEnvironment; n <- name; prop <- parent.propertyMap.get(n)) yield prop
-		
+
 		private def tryToInherit[R](prop: BasicEnvironment#UserProperty[R]): PropertyResolution[T] =
 		{
 			if(prop.manifest <:< manifest)
@@ -167,9 +171,9 @@ trait BasicEnvironment extends Environment
 				case DefinedValue(v, isInherited, isDefault) => DefinedValue(v, true, isDefault)
 				case x => x
 			}
-			
+
 		override def toString = nameString + "=" + resolve
-		
+
 		/** Gets the explicitly set value converted to a 'String'.*/
 		private[sbt] def getStringValue: Option[String] = explicitValue().map(format.toString)
 		/** Explicitly sets the value for this property by converting the given string value.*/
@@ -217,12 +221,12 @@ trait BasicEnvironment extends Environment
 		}
 		override def toString = name + "=" + resolve
 	}
-	
+
 	def system[T](propertyName: String)(implicit format: Format[T]): Property[T] =
 		new SystemProperty[T](propertyName, None, format)
 	def systemOptional[T](propertyName: String, defaultValue: => T)(implicit format: Format[T]): Property[T] =
 		new SystemProperty[T](propertyName, Some(defaultValue), format)
-	
+
 	def property[T](implicit manifest: Manifest[T], format: Format[T]): Property[T] =
 		new UserProperty[T](None, format, true, false, manifest)
 	def propertyLocal[T](implicit manifest: Manifest[T], format: Format[T]): Property[T] =
@@ -231,7 +235,7 @@ trait BasicEnvironment extends Environment
 		propertyOptional(defaultValue, false)(manifest, format)
 	def propertyOptional[T](defaultValue: => T, inheritFirst: Boolean)(implicit manifest: Manifest[T], format: Format[T]): Property[T] =
 		new UserProperty[T](Some(defaultValue), format, true, inheritFirst, manifest)
-	
+
 	private type AnyUserProperty = UserProperty[_]
 	/** Maps property name to property.  The map is constructed by reflecting vals defined on this object,
 	* so it should not be referenced during initialization or else subclass properties will be missed.**/
@@ -254,7 +258,7 @@ trait BasicEnvironment extends Environment
 			log.error("Error loading properties from " + environmentLabel + " : " + errorMsg)
 		map //.readOnly (not currently in 2.8)
 	}
-	
+
 	def propertyNames: Iterable[String] = propertyMap.keys.toList
 	def getPropertyNamed(name: String): Option[UserProperty[_]] = propertyMap.get(name)
 	def propertyNamed(name: String): UserProperty[_] = propertyMap(name)
diff --git a/src/main/scala/sbt/IntegrationTesting.scala b/src/main/scala/sbt/IntegrationTesting.scala
index eaff08c9e..2b7f3a283 100644
--- a/src/main/scala/sbt/IntegrationTesting.scala
+++ b/src/main/scala/sbt/IntegrationTesting.scala
@@ -28,30 +28,30 @@ trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTe
 	self: BasicScalaProject =>
 
 	import BasicScalaIntegrationTesting._
-	
+
 	lazy val integrationTestCompile = integrationTestCompileAction
 	lazy val integrationTest = integrationTestAction
 
-	val integrationTestCompileConditional = new CompileConditional(integrationTestCompileConfiguration)
+	val integrationTestCompileConditional = new CompileConditional(integrationTestCompileConfiguration, buildCompiler)
 
 	protected def integrationTestAction = integrationTestTask(integrationTestFrameworks, integrationTestClasspath, integrationTestCompileConditional.analysis, integrationTestOptions) dependsOn integrationTestCompile describedAs IntegrationTestCompileDescription
 	protected def integrationTestCompileAction = integrationTestCompileTask() dependsOn compile describedAs IntegrationTestDescription
 
 	protected def integrationTestCompileTask() = task{ integrationTestCompileConditional.run }
 
-	def integrationTestOptions: Seq[TestOption] = 
+	def integrationTestOptions: Seq[TestOption] =
 		TestSetup(() => pretests) ::
 		TestCleanup(() => posttests) ::
 		testOptions.toList
 	def integrationTestCompileOptions = testCompileOptions
 	def javaIntegrationTestCompileOptions: Seq[JavaCompileOption] = testJavaCompileOptions
-	
+
 	def integrationTestConfiguration = if(useIntegrationTestConfiguration) Configurations.IntegrationTest else Configurations.Test
 	def integrationTestClasspath = fullClasspath(integrationTestConfiguration) +++ optionalClasspath
-	
+
 	def integrationTestLabel = "integration-test"
 	def integrationTestCompileConfiguration = new IntegrationTestCompileConfig
-	
+
 	protected def integrationTestDependencies = new LibraryDependencies(this, integrationTestCompileConditional)
 
 	def integrationTestFrameworks = testFrameworks
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index 9941f6b65..78e2ad979 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -18,15 +18,16 @@ object ControlEvent extends Enumeration
 	val Start, Header, Finish = Value
 }
 
-abstract class Logger extends NotNull
+abstract class Logger extends xsbt.CompileLogger with xsbt.IvyLogger
 {
 	def getLevel: Level.Value
 	def setLevel(newLevel: Level.Value)
 	def enableTrace(flag: Boolean)
 	def traceEnabled: Boolean
-	
+
 	def atLevel(level: Level.Value) = level.id >= getLevel.id
 	def trace(t: => Throwable): Unit
+	final def verbose(message: => String): Unit = debug(message)
 	final def debug(message: => String): Unit = log(Level.Debug, message)
 	final def info(message: => String): Unit = log(Level.Info, message)
 	final def warn(message: => String): Unit = log(Level.Warn, message)
@@ -34,7 +35,7 @@ abstract class Logger extends NotNull
 	def success(message: => String): Unit
 	def log(level: Level.Value, message: => String): Unit
 	def control(event: ControlEvent.Value, message: => String): Unit
-	
+
 	def logAll(events: Seq[LogEvent]): Unit
 	/** Defined in terms of other methods in Logger and should not be called from them. */
 	final def log(event: LogEvent)
@@ -49,6 +50,14 @@ abstract class Logger extends NotNull
 			case c: ControlEvent => control(c.event, c.msg)
 		}
 	}
+
+	import xsbti.F0
+	def debug(msg: F0[String]): Unit = log(Level.Debug, msg)
+	def warn(msg: F0[String]): Unit = log(Level.Warn, msg)
+	def info(msg: F0[String]): Unit = log(Level.Info, msg)
+	def error(msg: F0[String]): Unit = log(Level.Error, msg)
+	def trace(msg: F0[Throwable]) = trace(msg.apply)
+	def log(level: Level.Value, msg: F0[String]): Unit = log(level, msg.apply)
 }
 
 /** Implements the level-setting methods of Logger.*/
@@ -68,7 +77,7 @@ final class SynchronizedLogger(delegate: Logger) extends Logger
 	def setLevel(newLevel: Level.Value) { synchronized { delegate.setLevel(newLevel) } }
 	def enableTrace(enabled: Boolean) { synchronized { delegate.enableTrace(enabled) } }
 	def traceEnabled: Boolean = { synchronized { delegate.traceEnabled } }
-	
+
 	def trace(t: => Throwable) { synchronized { delegate.trace(t) } }
 	def log(level: Level.Value, message: => String) { synchronized { delegate.log(level, message) } }
 	def success(message: => String) { synchronized { delegate.success(message) } }
@@ -139,12 +148,12 @@ final class BufferedLogger(delegate: Logger) extends Logger
 {
 	private[this] val buffers = wrap.Wrappers.weakMap[Thread, Buffer[LogEvent]]
 	private[this] var recordingAll = false
-	
+
 	private[this] def getOrCreateBuffer = buffers.getOrElseUpdate(key, createBuffer)
 	private[this] def buffer = if(recordingAll) Some(getOrCreateBuffer) else buffers.get(key)
 	private[this] def createBuffer = new ListBuffer[LogEvent]
 	private[this] def key = Thread.currentThread
-	
+
 	@deprecated def startRecording() = recordAll()
 	/** Enables buffering for logging coming from the current Thread. */
 	def record(): Unit = synchronized { buffers(key) = createBuffer }
@@ -162,7 +171,7 @@ final class BufferedLogger(delegate: Logger) extends Logger
 		try { f }
 		finally { Control.trap(stopAll()) }
 	}
-	
+
 	/** Flushes the buffer to the delegate logger for the current thread.  This method calls logAll on the delegate
 	* so that the messages are written consecutively. The buffer is cleared in the process. */
 	def play(): Unit =
@@ -194,7 +203,7 @@ final class BufferedLogger(delegate: Logger) extends Logger
 			playAll()
 			clearAll()
 		}
-	
+
 	def setLevel(newLevel: Level.Value): Unit =
 		synchronized
 		{
@@ -209,7 +218,7 @@ final class BufferedLogger(delegate: Logger) extends Logger
 			buffer.foreach{_  += new SetTrace(flag) }
 			delegate.enableTrace(flag)
 		}
-	
+
 	def trace(t: => Throwable): Unit =
 		doBufferableIf(traceEnabled, new Trace(t), _.trace(t))
 	def success(message: => String): Unit =
@@ -246,18 +255,18 @@ final class BufferedLogger(delegate: Logger) extends Logger
 object ConsoleLogger
 {
 	private val formatEnabled = ansiSupported && !formatExplicitlyDisabled
-	
+
 	private[this] def formatExplicitlyDisabled = java.lang.Boolean.getBoolean("sbt.log.noformat")
 	private[this] def ansiSupported =
 		try { jline.Terminal.getTerminal.isANSISupported }
 		catch { case e: Exception => !isWindows }
-	
+
 	private[this] def os = System.getProperty("os.name")
 	private[this] def isWindows = os.toLowerCase.indexOf("windows") >= 0
 }
 
 /** A logger that logs to the console.  On supported systems, the level labels are
-* colored. 
+* colored.
 *
 * This logger is not thread-safe.*/
 class ConsoleLogger extends BasicLogger
@@ -311,7 +320,7 @@ class ConsoleLogger extends BasicLogger
 				System.out.println()
 			}
 		}
-	
+
 	def logAll(events: Seq[LogEvent]) = System.out.synchronized { events.foreach(log) }
 	def control(event: ControlEvent.Value, message: => String)
 		{ log(labelColor(Level.Info), Level.Info.toString, Console.BLUE, message) }
@@ -329,7 +338,7 @@ object Level extends Enumeration with NotNull
 	* uses this label.  Because the label for levels is defined in this module, the success
 	* label is also defined here. */
 	val SuccessLabel = "success"
-	
+
 	// added because elements was renamed to iterator in 2.8.0 nightly
 	def levels = Debug :: Info :: Warn :: Error :: Nil
 	/** Returns the level with the given name wrapped in Some, or None if no level exists for that name. */
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 3176b02c7..c3db9ff0e 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -5,47 +5,56 @@ package sbt
 
 import scala.collection.immutable.TreeSet
 
-private trait RunCompleteAction extends NotNull
-private case class Exit(code: Int) extends RunCompleteAction
-private object Reload extends RunCompleteAction
+private case class Exit(code: Int) extends xsbti.Exit
+{
+	require(code >= 0)
+}
+private case class Reboot(val scalaVersion: String, argsList: List[String], configuration: xsbti.AppConfiguration) extends xsbti.Reboot
+{
+	def app = configuration.provider.id
+	def arguments = argsList.toArray
+	def baseDirectory = configuration.baseDirectory
+}
 
 /** This class is the entry point for sbt.  If it is given any arguments, it interprets them
 * as actions, executes the corresponding actions, and exits.  If there were no arguments provided,
 * sbt enters interactive mode.*/
 object Main
 {
-	/** The entry point for sbt.  If arguments are specified, they are interpreted as actions, executed,
-	* and then the program terminates.  If no arguments are specified, the program enters interactive
-	* mode. Call run if you need to run sbt in the same JVM.*/
-	def main(args: Array[String])
-	{
-		val exitCode = run(args)
-		if(exitCode == RebootExitCode)
-		{
-			println("Rebooting is not supported when the sbt loader is not used.")
-			println("Please manually restart sbt.")
-		}
-		System.exit(exitCode)
-	}
-	val RebootExitCode = -1
 	val NormalExitCode = 0
 	val SetupErrorExitCode = 1
 	val SetupDeclinedExitCode = 2
 	val LoadErrorExitCode = 3
 	val UsageErrorExitCode = 4
 	val BuildErrorExitCode = 5
-	def run(args: Array[String]): Int =
+	val ProgramErrorExitCode = 6
+}
+
+import Main._
+
+class xMain extends xsbti.AppMain
+{
+	final def run(configuration: xsbti.AppConfiguration): xsbti.MainResult =
+	{
+		def run0(remainingArguments: List[String], buildScalaVersion: Option[String]): xsbti.MainResult =
+		{
+			try { run(configuration, remainingArguments, buildScalaVersion) }
+			catch { case re: ReloadException => run0(re.remainingArguments, re.buildScalaVersion) }
+		}
+		run0(configuration.arguments.map(_.trim).toList, None)
+	}
+	final def run(configuration: xsbti.AppConfiguration, remainingArguments: List[String], buildScalaVersion: Option[String]): xsbti.MainResult =
 	{
 		val startTime = System.currentTimeMillis
-		Project.loadProject match
+		Project.loadProject(configuration.provider, buildScalaVersion) match
 		{
 			case err: LoadSetupError =>
 				println("\n" + err.message)
 				ExitHooks.runExitHooks(Project.bootLogger)
-				SetupErrorExitCode
+				Exit(SetupErrorExitCode)
 			case LoadSetupDeclined =>
 				ExitHooks.runExitHooks(Project.bootLogger)
-				SetupDeclinedExitCode
+				Exit(SetupDeclinedExitCode)
 			case err: LoadError =>
 			{
 				val log = Project.bootLogger
@@ -63,81 +72,138 @@ object Main
 					}
 				line match
 				{
-					case Some(l) => if(!isTerminateAction(l)) run(args) else NormalExitCode
-					case None => LoadErrorExitCode
+					case Some(l) => if(!isTerminateAction(l)) run(configuration, remainingArguments, buildScalaVersion) else Exit(NormalExitCode)
+					case None => Exit(LoadErrorExitCode)
 				}
 			}
 			case success: LoadSuccess =>
 			{
 				import success.project
-				val doNext: RunCompleteAction =
-					// in interactive mode, fill all undefined properties
-					if(args.length > 0 || fillUndefinedProjectProperties(project.projectClosure.toList.reverse))
-						startProject(project, args, startTime)
-					else
-						new Exit(NormalExitCode)
-				ExitHooks.runExitHooks(project.log)
-				doNext match
+				try
 				{
-					case Reload => run(args)
-					case x: Exit => x.code
+					// in interactive mode, fill all undefined properties
+					if(configuration.arguments.length > 0 || fillUndefinedProjectProperties(project.projectClosure.toList.reverse))
+						startProject(project, configuration, remainingArguments, startTime)
+					else
+						Exit(NormalExitCode)
 				}
+				finally { ExitHooks.runExitHooks(project.log) }
 			}
 		}
 	}
-	private def startProject(project: Project, args: Array[String], startTime: Long): RunCompleteAction =
-	{
-		project.log.info("Building project " + project.name + " " + project.version.toString + " using " + project.getClass.getName)
-		val scalaVersionOpt = ScalaVersion.current orElse project.scalaVersion.get
-		for(sbtVersion <- project.sbtVersion.get; scalaVersion <- scalaVersionOpt if !sbtVersion.isEmpty  && !scalaVersion.isEmpty)
-			project.log.info("   with sbt " + sbtVersion + " and Scala " + scalaVersion)
-		args match
+	private def initialize(args: List[String]): List[String] =
+		args.lastOption match
 		{
-			case Array() =>
-				CrossBuild.load() match
-				{
-					case None =>
-						project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
-						val doNext = interactive(project)
-						printTime(project, startTime, "session")
-						doNext
-					case Some(cross) =>
-						crossBuildNext(project, cross)
-						new Exit(RebootExitCode)
-				}
-			case CrossBuild(action) =>
-				val exitCode =
-					CrossBuild.load() match
-					{
-						case None => if(startCrossBuild(project, action)) RebootExitCode else BuildErrorExitCode
-						case Some(cross) => if(crossBuildNext(project, cross)) RebootExitCode else NormalExitCode
-					}
-				new Exit(exitCode)
-			case _ =>
-				val source = args.toList.elements
-				def nextCommand = if(source.hasNext) Right(source.next) else Left(new Exit(NormalExitCode) )
-				val result = loop(project, project, p => nextCommand, false)
-				result match
-				{
-					case Exit(NormalExitCode) => project.log.success("Build completed successfully.")
-					case Exit(_) => project.log.error("Error during build.")
-					case _ => ()
-				}
-				printTime(project, startTime, "build")
-				result
+			case None => InteractiveCommand :: Nil
+			case Some(InteractiveCommand | ExitCommand | QuitCommand) => args
+			case _ => args ::: ExitCommand :: Nil
+		}
+	private def startProject(project: Project, configuration: xsbti.AppConfiguration, remainingArguments: List[String], startTime: Long): xsbti.MainResult =
+	{
+		project.log.info("Building project " + project.name + " " + project.version.toString + " against Scala " + project.buildScalaVersion)
+		project.log.info("   using " + project.getClass.getName + " with sbt " + project.sbtVersion.value + " and Scala " + project.scalaVersion.value)
+
+		processArguments(project, initialize(remainingArguments), configuration, startTime) match
+		{
+			case e: xsbti.Exit =>
+				printTime(project, startTime, "session")
+				if(e.code == NormalExitCode)
+					project.log.success("Build completed successfully.")
+				else
+					project.log.error("Error during build.")
+				e
+			case r => r
 		}
 	}
-	private def crossBuildNext(project: Project, cross: CrossBuild) =
+	private def processArguments(baseProject: Project, arguments: List[String], configuration: xsbti.AppConfiguration, startTime: Long): xsbti.MainResult =
 	{
-		val setScalaVersion = (newVersion: String) => { System.setProperty(ScalaVersion.LiveKey, newVersion); () }
-		val complete =
-			if(handleAction(project, cross.command))
-				cross.versionComplete(setScalaVersion)
+		def process(project: Project, arguments: List[String], isInteractive: Boolean): xsbti.MainResult =
+		{
+			def saveProject(newArgs: List[String]) = if(baseProject.name != project.name) (ProjectAction + " " + project.name) :: newArgs else newArgs
+			arguments match
+			{
+				case "" :: tail => process(project, tail, isInteractive)
+				case (ExitCommand | QuitCommand) :: _ => Exit(NormalExitCode)
+				case RebootCommand :: tail => Reboot(project.scalaVersion.value, saveProject(tail), configuration)
+				case InteractiveCommand :: _ => process(project, prompt(baseProject, project) :: arguments, true)
+				case SpecificBuild(version, action) :: tail =>
+					if(Some(version) != baseProject.info.buildScalaVersion)
+						throw new ReloadException(saveProject(action :: tail), Some(version))
+					else
+						process(project, tail, isInteractive)
+				case CrossBuild(action) :: tail =>
+					if(checkAction(project, action)) process(project, CrossBuild(project, action) ::: tail, isInteractive)
+					else if(isInteractive) process(project, tail, isInteractive)
+					else Exit(UsageErrorExitCode)
+				case SetProject(name) :: tail =>
+					SetProject(baseProject, name, project) match
+					{
+						case Some(newProject) => process(newProject, tail, isInteractive)
+						case None => process(project, if(isInteractive) tail else ExitCommand :: tail, isInteractive)
+					}
+				case action :: tail =>
+					val success = processAction(baseProject, project, action, isInteractive)
+					if(success || isInteractive) process(project, tail, isInteractive) else Exit(BuildErrorExitCode)
+				case Nil => project.log.error("Invalid internal sbt state: no arguments"); Exit(ProgramErrorExitCode)
+			}
+		}
+		process(baseProject, arguments, false)
+	}
+	object SetProject
+	{
+		def unapply(s: String) =
+			if(s.startsWith(ProjectAction + " "))
+				Some(s.substring(ProjectAction.length + 1))
 			else
-				cross.error(setScalaVersion)
-		if(complete)
-			printTime(project, cross.startTime, "cross-build")
-		!complete
+				None
+		def apply(baseProject: Project, projectName: String, currentProject: Project) =
+		{
+			val found = baseProject.projectClosure.find(_.name == projectName)
+			found match
+			{
+				case Some(newProject) => printProject("Set current project to ", newProject)
+				case None => currentProject.log.error("Invalid project name '" + projectName + "' (type 'projects' to list available projects).")
+			}
+			found
+		}
+	}
+	object SpecificBuild
+	{
+		val pattern = """\+\+(\S+)\s*(.*)""".r.pattern
+		def unapply(s: String) =
+		{
+			val m = pattern.matcher(s)
+			if(m.matches)
+				Some(m.group(1).trim, m.group(2).trim)
+			else
+				None
+		}
+	}
+	object CrossBuild
+	{
+		def unapply(s: String) = if(s.startsWith("+") && !s.startsWith("++")) Some(s.substring(1)) else None
+		def apply(project: Project, action: String) =
+		{
+			val againstScalaVersions = project.crossScalaVersions
+			if(againstScalaVersions.isEmpty)
+			{
+				Console.println("Project does not declare any Scala versions to cross-build against, building against current version...")
+				action :: Nil
+			}
+			else
+				againstScalaVersions.toList.map("++" + _ + " " + action)
+		}
+	}
+	// todo:  project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
+	private def prompt(baseProject: Project, project: Project): String =
+	{
+		val projectNames = baseProject.projectClosure.map(_.name)
+		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
+		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), prefixes)
+		val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log)
+		val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
+		reader.setVariableCompletions(project.taskNames, project.propertyNames, methodCompletions)
+		reader.readLine("> ").getOrElse(ExitCommand)
 	}
 
 	/** The name of the command that loads a console with access to the current project through the variable 'project'.*/
@@ -150,18 +216,19 @@ object Main
 	val ProjectAction = "project"
 	/** The name of the command that shows all available projects.*/
 	val ShowProjectsAction = "projects"
+	val ExitCommand = "exit"
+	val QuitCommand = "quit"
+	val InteractiveCommand = "shell"
 	/** The list of lowercase command names that may be used to terminate the program.*/
-	val TerminateActions: Iterable[String] = "exit" :: "quit" :: Nil
+	val TerminateActions: Iterable[String] = ExitCommand :: QuitCommand :: Nil
 	/** The name of the command that sets the value of the property given as its argument.*/
 	val SetAction = "set"
 	/** The name of the command that gets the value of the property given as its argument.*/
 	val GetAction = "get"
 	/** The name of the command that displays the help message. */
 	val HelpAction = "help"
-	/** The command for rebooting sbt. Requires sbt to have been launched by the loader.*/
-	val RebootCommand = "reboot"
-	/** The name of the command that reloads a project.  This is useful for when the project definition has changed. */
-	val ReloadAction = "reload"
+	/** The command for reloading sbt.*/
+	val RebootCommand = "reload"
 	/** The name of the command that toggles logging stacktraces. */
 	val TraceCommand = "trace"
 	/** The name of the command that compiles all sources continuously when they are modified. */
@@ -170,8 +237,6 @@ object Main
 	val ContinuousExecutePrefix = "~"
 	/** The prefix used to identify a request to execute the remaining input across multiple Scala versions.*/
 	val CrossBuildPrefix = "+"
-	/** Error message for when the user tries to prefix an action with CrossBuildPrefix but the loader is not used.*/
-	val CrossBuildUnsupported = "Cross-building is not supported when the loader is not used."
 
 	/** The number of seconds between polling by the continuous compile command.*/
 	val ContinuousCompilePollDelaySeconds = 1
@@ -183,96 +248,24 @@ object Main
 	private def logLevels: Iterable[String] = TreeSet.empty[String] ++ Level.levels.map(_.toString)
 	/** The list of all interactive commands other than logging level.*/
 	private def basicCommands: Iterable[String] = TreeSet(ShowProjectsAction, ShowActions, ShowCurrent, HelpAction,
-		RebootCommand, ReloadAction, TraceCommand, ContinuousCompileCommand, ProjectConsoleAction)
+		RebootCommand, TraceCommand, ContinuousCompileCommand, ProjectConsoleAction)
 
-	/** Enters interactive mode for the given root project.  It uses JLine for tab completion and
-	* history.  It returns normally when the user terminates or reloads the interactive session.  That is,
-	* it does not call System.exit to quit.
-	**/
-	private def interactive(baseProject: Project): RunCompleteAction =
-	{
-		val projectNames = baseProject.projectClosure.map(_.name)
-		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
-		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), prefixes)
-		val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log)
-		def updateTaskCompletions(project: Project)
+	private def processAction(baseProject: Project, currentProject: Project, action: String, isInteractive: Boolean): Boolean =
+		action match
 		{
-			val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
-			reader.setVariableCompletions(project.taskNames, project.propertyNames, methodCompletions)
+			case HelpAction => displayHelp(isInteractive); true
+			case ShowProjectsAction => baseProject.projectClosure.foreach(listProject); true
+			case ProjectConsoleAction =>
+				showResult(Run.projectConsole(currentProject), currentProject.log)
+			case _ =>
+				if(action.startsWith(SetAction + " "))
+					setProperty(currentProject, action.substring(SetAction.length + 1))
+				else if(action.startsWith(GetAction + " "))
+					getProperty(currentProject, action.substring(GetAction.length + 1))
+				else
+							handleCommand(currentProject, action)
 		}
 
-		def readCommand(currentProject: Project) =
-		{
-			updateTaskCompletions(currentProject) // this is done before every command because the completions could change due to the action previously invoked
-			reader.readLine("> ").toRight(new Exit(NormalExitCode))
-		}
-
-		loop(baseProject, baseProject, readCommand, true)
-	}
-
-	/** Prompts the user for the next command using 'currentProject' as context.
-	* If the command indicates that the user wishes to terminate or reload the session,
-	*   the function returns the appropriate value.
-	* Otherwise, the command is handled and this function is called again
-	*   (tail recursively) to prompt for the next command. */
-	private def loop(baseProject: Project, currentProject: Project, nextCommand: Project => Either[RunCompleteAction, String], isInteractive: Boolean): RunCompleteAction =
-		nextCommand(currentProject).right.flatMap{ line => process(baseProject, currentProject, line, isInteractive) } match
-		{
-			case Left(complete) => complete
-			case Right(project) => loop(baseProject, project, nextCommand, isInteractive)
-		}
-	private def process(baseProject: Project, currentProject: Project, line: String, isInteractive: Boolean): Either[RunCompleteAction, Project] =
-	{
-		def keepCurrent(success: Boolean) =  if(success) Right(currentProject) else Left(new Exit(BuildErrorExitCode) )
-		def interactiveKeepCurrent(success: Boolean) = keepCurrent(success || isInteractive)
-		def keep(u: Unit) = Right(currentProject)
-
-		val trimmed = line.trim
-		if(trimmed.isEmpty)
-			Right(currentProject)
-		else if(isTerminateAction(trimmed))
-			Left(new Exit(NormalExitCode))
-		else if(ReloadAction == trimmed)
-			Left(Reload)
-		else if(RebootCommand == trimmed)
-		{
-			if(!isInteractive) currentProject.log.warn("'reboot' does not pick up changes to 'scala.version' in batch mode.")
-			System.setProperty(ScalaVersion.LiveKey, "")
-			Left(new Exit(RebootExitCode))
-		}
-		else if(trimmed.startsWith(CrossBuildPrefix))
-		{
-			if(startCrossBuild(currentProject, trimmed.substring(CrossBuildPrefix.length).trim))
-				Left(new Exit(RebootExitCode))
-			else
-				Right(currentProject)
-		}
-		else if(trimmed.startsWith(ProjectAction + " "))
-		{
-			val projectName = trimmed.substring(ProjectAction.length + 1)
-			baseProject.projectClosure.find(_.name == projectName) match
-			{
-				case Some(newProject) =>
-					printProject("Set current project to ", newProject)
-					Right(newProject)
-				case None =>
-					currentProject.log.error("Invalid project name '" + projectName + "' (type 'projects' to list available projects).")
-					keepCurrent(isInteractive)
-			}
-		}
-		else if(trimmed == HelpAction)
-			keep(displayHelp(isInteractive))
-		else if(trimmed == ShowProjectsAction)
-			keep(baseProject.projectClosure.foreach(listProject))
-		else if(trimmed.startsWith(SetAction + " "))
-			interactiveKeepCurrent( setProperty(currentProject, trimmed.substring(SetAction.length + 1)) )
-		else if(trimmed.startsWith(GetAction + " "))
-			interactiveKeepCurrent( getProperty(currentProject, trimmed.substring(GetAction.length + 1)) )
-		else if(trimmed == ProjectConsoleAction)
-			interactiveKeepCurrent(showResult(Run.projectConsole(currentProject), currentProject.log))
-		else
-			interactiveKeepCurrent( handleCommand(currentProject, trimmed) )
-	}
 	private def printCmd(name:String, desc:String) = Console.println("\t" + name + ": " + desc)
 	val BatchHelpHeader = "You may execute any project action or method or one of the commands described below."
 	val InteractiveHelpHeader = "You may execute any project action or one of the commands described below. Only one action " +
@@ -288,9 +281,8 @@ object Main
 		printCmd(ContinuousExecutePrefix + " <command>", "Executes the project specified action or method whenever source files change.")
 		printCmd(CrossBuildPrefix + " <command>", "Executes the project specified action or method for all versions of Scala defined in crossScalaVersions.")
 		printCmd(ShowActions, "Shows all available actions.")
-		printCmd(RebootCommand, "Changes to scala.version or sbt.version are processed and the project definition is reloaded.")
+		printCmd(RebootCommand, "Reloads sbt, picking up modifications to sbt.version or scala.version and recompiling modified project definitions.")
 		printCmd(HelpAction, "Displays this help message.")
-		printCmd(ReloadAction, "Reloads sbt, recompiling modified project definitions if necessary.")
 		printCmd(ShowCurrent, "Shows the current project and logging level of that project.")
 		printCmd(Level.levels.mkString(", "), "Set logging for the current project to the specified level.")
 		printCmd(TraceCommand, "Toggles whether logging stack traces is enabled.")
@@ -300,31 +292,13 @@ object Main
 		printCmd(SetAction + " <property> <value>", "Sets the value of the property given as its argument.")
 		printCmd(GetAction + " <property>", "Gets the value of the property given as its argument.")
 		printCmd(ProjectConsoleAction, "Enters the Scala interpreter with the current project bound to the variable 'current' and all members imported.")
+		if(!isInteractive)
+			printCmd(InteractiveCommand, "Enters the sbt interactive shell")
 	}
 	private def listProject(p: Project) = printProject("\t", p)
 	private def printProject(prefix: String, p: Project): Unit =
 		Console.println(prefix + p.name + " " + p.version)
 
-	private def startCrossBuild(project: Project, action: String) =
-	{
-		checkBooted && checkAction(project, action) &&
-		{
-			val againstScalaVersions = project.crossScalaVersions
-			val versionsDefined = !againstScalaVersions.isEmpty
-			if(versionsDefined)
-				CrossBuild(againstScalaVersions, action, System.currentTimeMillis)
-			else
-				Console.println("Project does not declare any Scala versions to cross-build against.")
-			versionsDefined
-		}
-	}
-	private def checkBooted =
-		Project.booted ||
-		{
-			Console.println(CrossBuildUnsupported)
-			false
-		}
-
 	/** Handles the given command string provided at the command line.  Returns false if there was an error*/
 	private def handleCommand(project: Project, command: String): Boolean =
 	{
@@ -530,7 +504,7 @@ object Main
 				val v = m.group(2)
 				if(v == null) "" else v.trim
 			}
-			def notePending(changed: String): Unit = Console.println(" Build will use " + changed + newValue + " after running 'reboot' command or restarting sbt.")
+			def notePending(changed: String): Unit = Console.println(" Build will use " + changed + newValue + " after running 'reload' command or restarting sbt.")
 			project.getPropertyNamed(name) match
 			{
 				case Some(property) =>
@@ -586,77 +560,9 @@ object Main
 	private def getArgumentError(log: Logger) = logError(log)("Invalid arguments for 'get': expected property name.")
 	private def setProjectError(log: Logger) = logError(log)("Invalid arguments for 'project': expected project name.")
 	private def logError(log: Logger)(s: String) = { log.error(s); false }
-}
-private class CrossBuild(val remainingScalaVersions: Set[String], val command: String, val startTime: Long)
-{
-	def error(setScalaVersion: String => Unit) = clearScalaVersion(setScalaVersion)
-	private def clearScalaVersion(setScalaVersion: String => Unit) =
+
+	private final class ReloadException(val remainingArguments: List[String], val buildScalaVersion: Option[String]) extends RuntimeException
 	{
-		CrossBuild.clear()
-		setScalaVersion("")
-		true
+		override def fillInStackTrace = this
 	}
-	def versionComplete(setScalaVersion: String => Unit) =
-	{
-		val remaining = remainingScalaVersions - ScalaVersion.currentString
-		if(remaining.isEmpty)
-			clearScalaVersion(setScalaVersion)
-		else
-		{
-			CrossBuild.setProperties(remaining, command, startTime.toString)
-			setScalaVersion(remaining.toSeq.first)
-			false
-		}
-	}
-}
-private object CrossBuild
-{
-	private val RemainingScalaVersionsKey = "sbt.remaining.scala.versions"
-	private val CrossCommandKey = "sbt.cross.build.command"
-	private val StartTimeKey = "sbt.cross.start.time"
-	private def setProperties(remainingScalaVersions: Set[String], command: String, startTime: String)
-	{
-		System.setProperty(RemainingScalaVersionsKey, remainingScalaVersions.mkString(" "))
-		System.setProperty(CrossCommandKey, command)
-		System.setProperty(StartTimeKey, startTime)
-	}
-	private def getProperty(key: String) =
-	{
-		val value = System.getProperty(key)
-		if(value == null)
-			""
-		else
-			value.trim
-	}
-	private def clear() { setProperties(Set.empty, "", "") }
-	def load() =
-	{
-		val command = getProperty(CrossCommandKey)
-		val remaining = getProperty(RemainingScalaVersionsKey)
-		val startTime = getProperty(StartTimeKey)
-		if(command.isEmpty || remaining.isEmpty || startTime.isEmpty)
-			None
-		else
-			Some(new CrossBuild(Set(remaining.split(" ") : _*), command, startTime.toLong))
-	}
-	def apply(remainingScalaVersions: Set[String], command: String, startTime: Long) =
-	{
-		setProperties(remainingScalaVersions, command, startTime.toString)
-		new CrossBuild(remainingScalaVersions, command, startTime)
-	}
-	import Main.CrossBuildPrefix
-	def unapply(s: String): Option[String] =
-	{
-		val trimmed = s.trim
-		if(trimmed.startsWith(CrossBuildPrefix))
-			Some(trimmed.substring(CrossBuildPrefix.length).trim)
-		else
-			None
-	}
-	def unapply(s: Array[String]): Option[String] =
-		s match
-		{
-			case Array(CrossBuild(crossBuildAction)) => Some(crossBuildAction)
-			case _ => None
-		}
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 36e91752b..a21eb438d 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -3,6 +3,8 @@
  */
 package sbt
 
+import xsbti.{AppProvider, ScalaProvider}
+import xsbt.{AnalyzingCompiler, ComponentManager, ScalaInstance}
 import java.io.File
 import java.net.URLClassLoader
 import scala.collection._
@@ -20,9 +22,9 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 		lg
 	}
 	protected def defaultLoggingLevel = Level.Info
-	
+
 	trait ActionOption extends NotNull
-	
+
 	/** Basic project information. */
 	def info: ProjectInfo
 	/** The project name. */
@@ -33,7 +35,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	final def organization: String = projectOrganization.value
 	/** True if the project should cater to a quick throwaway project setup.*/
 	def scratch = projectScratch.value
-	
+
 	final type ManagerType = Project
 	final type ManagedTask = Project#Task
 	/** The tasks declared on this project. */
@@ -51,7 +53,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	/** A description of all available tasks in this project and all dependencies.  If there
 	* are different tasks with the same name, only one will be included. */
 	def taskList: String = descriptionList(deepTasks)
-	
+
 	final def taskName(task: Task) = tasks.find( _._2 eq task ).map(_._1)
 	/** A description of all available tasks in this project and all dependencies and all
 	* available method tasks in this project, but not of dependencies.  If there
@@ -83,7 +85,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* main use within sbt is in ParentProject.*/
 	def subProjects: Map[String, Project] = immutable.Map.empty
 	def projectClosure: List[Project] = Dag.topologicalSort(this)(p => p.dependencies ++ p.subProjects.values.toList)
-	
+
 	def call(name: String, parameters: Array[String]): Option[String] =
 	{
 		methods.get(name) match
@@ -98,7 +100,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 			case Nil => None
 			case x => Some(Set(x: _*).mkString("\n"))
 		}
-		
+
 	/** Executes the task with the given name.  This involves executing the task for all
 	* project dependencies (transitive) and then for this project.  Not every dependency
 	* must define a task with the given name.  If this project and all dependencies
@@ -128,7 +130,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 			}
 		}
 	}
-	
+
 	/** Logs the list of projects at the debug level.*/
 	private def showBuildOrder(order: Iterable[Project])
 	{
@@ -136,22 +138,22 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 		order.foreach(x => log.debug("    " + x.name) )
 		log.debug("")
 	}
-	
+
 	/** Converts a String to a path relative to the project directory of this project. */
 	implicit def path(component: String): Path = info.projectPath / component
 	/** Converts a String to a simple name filter.  * has the special meaning: zero or more of any character */
 	implicit def filter(simplePattern: String): NameFilter = GlobFilter(simplePattern)
-	
+
 	/** Loads the project at the given path and declares the project to have the given
 	* dependencies.  This method will configure the project according to the
 	* project/ directory in the directory denoted by path.*/
-	def project(path: Path, deps: Project*): Project = getProject(Project.loadProject(path, deps, Some(this), log), path)
-	
+	def project(path: Path, deps: Project*): Project = getProject(Project.loadProject(path, deps, Some(this), log, info.app, info.buildScalaVersion), path)
+
 	/** Loads the project at the given path using the given name and inheriting this project's version.
 	* The builder class is the default builder class, sbt.DefaultProject. The loaded project is declared
 	* to have the given dependencies. Any project/build/ directory for the project is ignored.*/
 	def project(path: Path, name: String, deps: Project*): Project = project(path, name, Project.DefaultBuilderClass, deps: _*)
-	
+
 	/** Loads the project at the given path using the given name and inheriting it's version from this project.
 	* The Project implementation used is given by builderClass.  The dependencies are declared to be
 	* deps. Any project/build/ directory for the project is ignored.*/
@@ -164,8 +166,8 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* The construct function is used to obtain the Project instance. Any project/build/ directory for the project
 	* is ignored.  The project is declared to have the dependencies given by deps.*/
 	def project[P <: Project](path: Path, name: String, construct: ProjectInfo => P, deps: Project*): P =
-		initialize(construct(ProjectInfo(path.asFile, deps, Some(this))(log)), Some(new SetupInfo(name, None, None, false)), log)
-	
+		initialize(construct(ProjectInfo(path.asFile, deps, Some(this))(log, info.app, info.buildScalaVersion)), Some(new SetupInfo(name, None, None, false)), log)
+
 	/** Initializes the project directories when a user has requested that sbt create a new project.*/
 	def initializeDirectories() {}
 	/** True if projects should be run in parallel, false if they should run sequentially.
@@ -177,11 +179,11 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 			case Some(parent) => parent.parallelExecution
 			case None => false
 		}
-	
+
 	/** True if a project and its dependencies should be checked to ensure that their
 	* output directories are not the same, false if they should not be checked. */
 	def shouldCheckOutputDirectories = true
-	
+
 	/** The list of directories to which this project writes.  This is used to verify that multiple
 	* projects have not been defined with the same output directories. */
 	def outputDirectories: Iterable[Path] = outputPath :: Nil
@@ -193,7 +195,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	def outputPath = crossPath(outputRootPath)
 	def outputRootPath: Path = outputDirectoryName
 	def outputDirectoryName = DefaultOutputDirectoryName
-	
+
 	private def getProject(result: LoadResult, path: Path): Project =
 		result match
 		{
@@ -202,31 +204,50 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 			case err: LoadError => Predef.error("Error loading project at path " + path + " : " + err.message)
 			case success: LoadSuccess => success.project
 		}
-	
+
 	/** The property for the project's version. */
 	final val projectVersion = property[Version]
 	/** The property for the project's name. */
 	final val projectName = propertyLocalF[String](NonEmptyStringFormat)
 	/** The property for the project's organization.  Defaults to the parent project's organization or the project name if there is no parent. */
 	final val projectOrganization = propertyOptional[String](normalizedName, true)
-	/** The property that defines the version of Scala to build this project with by default.  This property is only
-	* ready by `sbt` on startup and reboot.  When cross-building, this value may be different from the actual
-	* version of Scala being used to build the project.  ScalaVersion.current and ScalaVersion.cross should be used
-	* to read the version of Scala building the project.  This should only be used to change the version of Scala used
-	* for normal development (not cross-building)*/
-	final val scalaVersion = propertyOptional[String]("", true)
-	final val sbtVersion = propertyOptional[String]("", true)
+	/** The property that defines the version of Scala to use with the project definition.  This can be different
+	* from the version of Scala used to build the project (defined initially by buildInitScalaVersion).
+	* This property is only read by `sbt` on startup and reload. It is the definitive source for the version of Scala
+	* that sbt and the project definition are using.*/
+	final val scalaVersion = property[String]
+	final val sbtVersion = property[String]
 	final val projectInitialize = propertyOptional[Boolean](false)
 	final val projectScratch = propertyOptional[Boolean](false, true)
+	/** The property that defines the version of Scala to build this project with by default.  This can be
+	* different from the version of Scala used to build and run the project definition (defined by scalaVersion).
+	* This property is only read by `sbt` on startup and reload.  When cross-building, this value may be different from the actual
+	* version of Scala being used to build the project.  info.scalaVersion is always the definitive source for the current Scala version.
+	* This property should only be used to change the version of Scala used for normal development (not cross-building).*/
+	final val buildInitScalaVersion = propertyOptional[String](scalaVersion.value, true)
+	/** The definitive source for the version of Scala being used to *build* the project.*/
+	def buildScalaVersion = info.buildScalaVersion.getOrElse(buildInitScalaVersion.value)
 
-	/** If this project is cross-building, returns `base` with an additional path component containing the scala version.
-	* Otherwise, this returns `base`.
+	def componentManager = new xsbt.ComponentManager(info.app.components, log)
+	def buildScalaInstance =
+		localScalaInstances.find(_.version == buildScalaVersion) getOrElse
+			xsbt.ScalaInstance(buildScalaVersion, info.launcher)
+	lazy val localScalaInstances: Seq[ScalaInstance] = localScala ++ info.parent.toList.flatMap(_.localScalaInstances)
+	def localScala: Seq[ScalaInstance] = Nil
+	def buildCompiler = new AnalyzingCompiler(buildScalaInstance, componentManager)
+	def defineScala(home: File): ScalaInstance = ScalaInstance(home, info.launcher)
+	def defineScala(version: String, home: File): ScalaInstance = ScalaInstance(version, home, info.launcher)
+
+	/** If this project is cross-building, returns `base` with an additional path component containing the scala version
+	* currently used to build the project.   Otherwise, this returns `base`.
 	* By default, cross-building is enabled when a project is loaded by the loader and crossScalaVersions is not empty.*/
-	def crossPath(base: Path) = ScalaVersion.withCross(disableCrossPaths)(base / ScalaVersion.crossString(_), base)
+	def crossPath(base: Path) = if(disableCrossPaths) base else base / crossString
 	/** If modifying paths for cross-building is enabled, this returns ScalaVersion.currentString.
 	* Otherwise, this returns the empty string. */
-	def crossScalaVersionString: String = if(disableCrossPaths) "" else ScalaVersion.currentString
-	
+	def crossScalaVersionString: String = if(disableCrossPaths) "" else buildScalaVersion
+	private def crossString = "scala_" + buildScalaVersion
+
+
 	/** True if crossPath should be the identity function.*/
 	protected def disableCrossPaths = crossScalaVersions.isEmpty
 	/** By default, this is empty and cross-building is disabled.  Overriding this to a Set of Scala versions
@@ -241,15 +262,15 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* project.  This project does not need to include the watched paths for projects that this project depends on.*/
 	def watchPaths: PathFinder = Path.emptyPathFinder
 	def terminateWatch(key: Int): Boolean = key == 10 || key == 13
-	
+
 	protected final override def parentEnvironment = info.parent
-	
+
 	// .* included because svn doesn't mark .svn hidden
 	def defaultExcludes: FileFilter = (".*"  - ".") || HiddenFileFilter
 	/** Short for parent.descendentsExcept(include, defaultExcludes)*/
 	def descendents(parent: PathFinder, include: FileFilter) = parent.descendentsExcept(include, defaultExcludes)
 	override def toString = "Project " + projectName.get.getOrElse("at " + environmentLabel)
-	
+
 	def normalizedName = StringUtilities.normalize(name)
 }
 private[sbt] sealed trait LoadResult extends NotNull
@@ -265,14 +286,14 @@ object Project
 	val DefaultEnvBackingName = "build.properties"
 	val DefaultBuilderClassName = "sbt.DefaultProject"
 	val DefaultBuilderClass = Class.forName(DefaultBuilderClassName).asSubclass(classOf[Project])
-	
+
 	/** The name of the directory for project definitions.*/
 	val BuilderProjectDirectoryName = "build"
 	/** The name of the directory for plugin definitions.*/
 	val PluginProjectDirectoryName = "plugins"
 	/** The name of the class that all projects must inherit from.*/
 	val ProjectClassName = classOf[Project].getName
-	
+
 	/** The logger that should be used before the root project definition is loaded.*/
 	private[sbt] def bootLogger =
 	{
@@ -283,20 +304,22 @@ object Project
 	}
 
 	private[sbt] def booted = java.lang.Boolean.getBoolean("sbt.boot")
-	
+
+	private[sbt] def loadProject(app: AppProvider): LoadResult = loadProject(app, None)
+	/** Loads the project in the current working directory. */
+	private[sbt] def loadProject(app: AppProvider, buildScalaVersion: Option[String]): LoadResult = loadProject(bootLogger, app, buildScalaVersion)
 	/** Loads the project in the current working directory.*/
-	private[sbt] def loadProject: LoadResult = loadProject(bootLogger)
-	/** Loads the project in the current working directory.*/
-	private[sbt] def loadProject(log: Logger): LoadResult = checkOutputDirectories(loadProject(new File("."), Nil, None, log))
+	private[sbt] def loadProject(log: Logger, app: AppProvider, buildScalaVersion: Option[String]): LoadResult =
+		checkOutputDirectories(loadProject(new File("."), Nil, None, log, app, buildScalaVersion))
 	/** Loads the project in the directory given by 'path' and with the given dependencies.*/
-	private[sbt] def loadProject(path: Path, deps: Iterable[Project], parent: Option[Project], log: Logger): LoadResult =
-		loadProject(path.asFile, deps, parent, log)
+	private[sbt] def loadProject(path: Path, deps: Iterable[Project], parent: Option[Project], log: Logger, app: AppProvider, buildScalaVersion: Option[String]): LoadResult =
+		loadProject(path.asFile, deps, parent, log, app, buildScalaVersion)
 	/** Loads the project in the directory given by 'projectDirectory' and with the given dependencies.*/
-	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], log: Logger): LoadResult =
-		loadProject(projectDirectory, deps, parent, getClass.getClassLoader, log)
-	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], additional: ClassLoader, log: Logger): LoadResult =
+	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], log: Logger, app: AppProvider, buildScalaVersion: Option[String]): LoadResult =
+		loadProject(projectDirectory, deps, parent, getClass.getClassLoader, log, app, buildScalaVersion)
+	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], additional: ClassLoader, log: Logger, app: AppProvider, buildScalaVersion: Option[String]): LoadResult =
 	{
-		val info = ProjectInfo(projectDirectory, deps, parent)(log)
+		val info = ProjectInfo(projectDirectory, deps, parent)(log, app, buildScalaVersion)
 		ProjectInfo.setup(info, log) match
 		{
 			case err: SetupError => new LoadSetupError(err.message)
@@ -377,7 +400,8 @@ object Project
 		{
 			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
 			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(FileUtilities.toFile(url))); case _ => Array[Path]() }
-			val builderProject = new BuilderProject(ProjectInfo(builderProjectPath.asFile, Nil, None)(buildLog), pluginProjectPath, additionalPaths, buildLog)
+			val builderInfo = ProjectInfo(builderProjectPath.asFile, Nil, None)(buildLog, info.app, Some(info.definitionScalaVersion))
+			val builderProject = new BuilderProject(builderInfo, pluginProjectPath, additionalPaths, buildLog)
 			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
 				builderProject.projectDefinition.right.map {
 					case Some(definition) => getProjectClass[Project](definition, builderProject.projectClasspath, additional)
@@ -447,7 +471,7 @@ object Project
 		require(projectClass.isAssignableFrom(builderClass), "Builder class '" + builderClass + "' does not extend " + projectClass.getName + ".")
 		builderClass.asSubclass(projectClass).asInstanceOf[Class[P]]
 	}
-	
+
 	/** Writes the project name and a separator to the project's log at the info level.*/
 	def showProjectHeader(project: Project)
 	{
@@ -456,7 +480,7 @@ object Project
 		project.log.info(projectHeader)
 		project.log.info("=" * projectHeader.length)
 	}
-	
+
 	def rootProject(p: Project): Project =
 		p.info.parent match
 		{
diff --git a/src/main/scala/sbt/ProjectInfo.scala b/src/main/scala/sbt/ProjectInfo.scala
index 316d3ff0f..9f518a97d 100644
--- a/src/main/scala/sbt/ProjectInfo.scala
+++ b/src/main/scala/sbt/ProjectInfo.scala
@@ -4,10 +4,16 @@
 package sbt
 
 import java.io.File
+import xsbti.{AppProvider, ScalaProvider}
 import FileUtilities._
 
-final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Project], parent: Option[Project])(log: Logger) extends NotNull
+// provider is for the build, not the build definition
+final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Project], parent: Option[Project])
+	(log: Logger, val app: AppProvider, val buildScalaVersion: Option[String]) extends NotNull
 {
+	def definitionScalaVersion = app.scalaProvider.version
+	def launcher = app.scalaProvider.launcher
+
 	val logger = new FilterLogger(log)
 	val projectPath: Path =
 	{
@@ -34,7 +40,7 @@ object ProjectInfo
 {
 	val MetadataDirectoryName = "project"
 	private val DefaultOrganization = "empty"
-	
+
 	def setup(info: ProjectInfo, log: Logger): SetupResult =
 	{
 		val builderDirectory = info.builderPath.asFile
@@ -81,7 +87,7 @@ object ProjectInfo
 	}
 	private def verifyCreateProject(name: String, version: Version, organization: String): Boolean =
 		confirmPrompt("Create new project " + name + " " + version + " with organization " + organization +" ?", true)
-	
+
 	private def confirmPrompt(question: String, defaultYes: Boolean) =
 	{
 		val choices = if(defaultYes) " (Y/n) " else " (y/N) "
@@ -89,7 +95,7 @@ object ProjectInfo
 		val yes = "y" :: "yes" :: (if(defaultYes) List("") else Nil)
 		yes.contains(answer.toLowerCase)
 	}
-	
+
 	private def readVersion(projectDirectory: File, log: Logger): Option[Version] =
 	{
 		val version = trim(SimpleReader.readLine("Version: "))
diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
index 13bb8e620..1aa906358 100644
--- a/src/main/scala/sbt/Resources.scala
+++ b/src/main/scala/sbt/Resources.scala
@@ -4,32 +4,34 @@
 package sbt
 
 import java.io.File
+import xsbti.AppProvider
 import FileUtilities._
 
 object Resources
 {
-	def apply(basePath: String) =
+	def apply(basePath: String, provider: AppProvider, buildScalaVersion: Option[String]) =
 	{
 		require(basePath.startsWith("/"))
 		val resource = getClass.getResource(basePath)
 		if(resource == null)
-			throw new Exception("Resource base directory '" + basePath + "' not on classpath.")
+			error("Resource base directory '" + basePath + "' not on classpath.")
 		else
 		{
 			val file = toFile(resource)
 			if(file.exists)
-				new Resources(file)
+				new Resources(file, provider, buildScalaVersion)
 			else
-				throw new Exception("Resource base directory '" + basePath + "' does not exist.")
+				error("Resource base directory '" + basePath + "' does not exist.")
 		}
 	}
 	private val LoadErrorPrefix = "Error loading initial project: "
 }
 
-class Resources(val baseDirectory: File, additional: ClassLoader)
+class Resources(val baseDirectory: File, additional: ClassLoader, app: AppProvider, buildScalaVersion: Option[String])
 {
-	def this(baseDirectory: File) = this(baseDirectory, getClass.getClassLoader)
-	
+	def this(baseDirectory: File, provider: AppProvider, buildScalaVersion: Option[String]) =
+		this(baseDirectory, getClass.getClassLoader, provider, buildScalaVersion)
+
 	import Resources._
 	// The returned directory is not actually read-only, but it should be treated that way
 	def readOnlyResourceDirectory(group: String, name: String): Either[String, File] =
@@ -62,7 +64,7 @@ class Resources(val baseDirectory: File, additional: ClassLoader)
 		}
 		doInTemporaryDirectory(log)(readWrite(readOnly))
 	}
-	
+
 	def withProject[T](projectDirectory: File, log: Logger)(f: Project => WithProjectResult[T]): Either[String, T] =
 		readWriteResourceDirectory(projectDirectory, log)(withProject(log)(f))
 	def withProject[T](group: String, name: String, log: Logger)(f: Project => WithProjectResult[T]): Either[String, T] =
@@ -87,7 +89,7 @@ class Resources(val baseDirectory: File, additional: ClassLoader)
 					Left(msg)
 				}
 				buffered.recordAll()
-				resultToEither(Project.loadProject(dir, Nil, None, additional, buffered)) match
+				resultToEither(Project.loadProject(dir, Nil, None, additional, buffered, app, buildScalaVersion)) match
 				{
 					case Left(msg) =>
 						reload match
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 7bfd9cc12..7ac46b85a 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -13,17 +13,10 @@ import java.net.{URL, URLClassLoader}
 
 trait ScalaRun
 {
-	def console(classpath: Iterable[Path], log: Logger): Option[String]
 	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger): Option[String]
 }
 class ForkRun(config: ForkScalaRun) extends ScalaRun
 {
-	def console(classpath: Iterable[Path], log: Logger): Option[String] =
-	{
-		error("Forking the interpreter is not implemented.")
-		//val exitCode = Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, classpathOption(classpath), config.workingDirectory, log)
-		//processExitCode(exitCode, "interpreter")
-	}
 	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger): Option[String] =
 	{
 		val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList
@@ -42,31 +35,21 @@ class ForkRun(config: ForkScalaRun) extends ScalaRun
 			Some("Nonzero exit code returned from " + label + ": " + exitCode)
 	}
 }
+class Run(compiler: xsbt.AnalyzingCompiler) extends ScalaRun
+{
+	/** Runs the class 'mainClass' using the given classpath and options using the scala runner.*/
+	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger) =
+	{
+		def execute = compiler.run(Set() ++ classpath.map(_.asFile), mainClass, options, log)
+		Run.executeTrapExit( execute, log )
+	}
+}
 
 /** This module is an interface to starting the scala interpreter or runner.*/
-object Run extends ScalaRun
+object Run
 {
-	/** Starts an interactive scala interpreter session with the given classpath.*/
-	def console(classpath: Iterable[Path], log: Logger) =
-		createSettings(log)
-		{
-			(settings: Settings) =>
-			{
-				settings.classpath.value = Path.makeString(classpath)
-				log.info("Starting scala interpreter...")
-				log.debug("  Classpath: " + settings.classpath.value)
-				log.info("")
-				Control.trapUnit("Error during session: ", log)
-				{
-					JLine.withJLine {
-						val loop = new InterpreterLoop
-						executeTrapExit(loop.main(settings), log)
-					}
-				}
-			}
-		}
 	/** Executes the given function, trapping calls to System.exit. */
-	private def executeTrapExit(f: => Unit, log: Logger): Option[String] =
+	private[sbt] def executeTrapExit(f: => Unit, log: Logger): Option[String] =
 	{
 		val exitCode = TrapExit(f, log)
 		if(exitCode == 0)
@@ -77,37 +60,6 @@ object Run extends ScalaRun
 		else
 			Some("Nonzero exit code: " + exitCode)
 	}
-	/** Runs the class 'mainClass' using the given classpath and options using the scala runner.*/
-	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger) =
-	{
-		createSettings(log) { (settings: Settings) =>
-			Control.trapUnit("Error during run: ", log)
-			{
-				val classpathURLs = classpath.map(_.asURL).toList
-				val bootClasspath = FileUtilities.pathSplit(settings.bootclasspath.value)
-				val extraURLs =
-					for(pathString <- bootClasspath if pathString.length > 0) yield
-						(new java.io.File(pathString)).toURI.toURL
-				log.info("Running " + mainClass + " ...")
-				log.debug("  Classpath:" + (classpathURLs ++ extraURLs).mkString("\n\t", "\n\t",""))
-				def execute =
-					try { ObjectRunner.run(classpathURLs ++ extraURLs, mainClass, options.toList) }
-					catch { case e: java.lang.reflect.InvocationTargetException => throw e.getCause }
-				executeTrapExit( execute, log )
-			}
-		}
-	}
-	/** If mainClassOption is None, then the interactive scala interpreter is started with the given classpath.
-	* Otherwise, the class wrapped by Some is run using the scala runner with the given classpath and
-	* options. */
-	def apply(mainClassOption: Option[String], classpath: Iterable[Path], options: Seq[String], log: Logger) =
-	{
-		mainClassOption match
-		{
-			case Some(mainClass) => run(mainClass, classpath, options, log)
-			case None => console(classpath, log)
-		}
-	}
 	/** Create a settings object and execute the provided function if the settings are created ok.*/
 	private def createSettings(log: Logger)(f: Settings => Option[String]) =
 	{
@@ -140,8 +92,9 @@ object Run extends ScalaRun
 		}}
 	}
 	/** A custom InterpreterLoop with the purpose of creating an interpreter with Project 'project' bound to the value 'current',
-	* and the following two lines interpreted:
+	* and the following three lines interpreted:
 	*   import sbt._
+	*   import Process._
 	*   import current._.
 	* To do this,
 	* 1)  The compiler uses a different settings instance: 'compilerSettings', which will have its classpath set to include the classpath
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 426bd439c..d03847568 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -11,14 +11,14 @@ import scala.collection.mutable.ListBuffer
 trait SimpleScalaProject extends ExecProject
 {
 	def errorTask(message: String) = task{ Some(message) }
-	
+
 	trait CleanOption extends ActionOption
 	case class ClearAnalysis(analysis: TaskAnalysis[_, _, _]) extends CleanOption
 	case class Preserve(paths: PathFinder) extends CleanOption
-	
+
 	case class CompileOption(val asString: String) extends ActionOption
 	case class JavaCompileOption(val asString: String) extends ActionOption
-	
+
 	val Deprecation = CompileOption("-deprecation")
 	val ExplainTypes = CompileOption("-explaintypes")
 	val Optimize = CompileOption("-optimise")
@@ -33,7 +33,7 @@ trait SimpleScalaProject extends ExecProject
 		val Java1_4 = Value("jvm-1.4")
 		val Msil = Value("msil")
 	}
-	
+
 	def cleanTask(paths: PathFinder, options: CleanOption*): Task =
 		cleanTask(paths, options)
 	def cleanTask(paths: PathFinder, options: => Seq[CleanOption]): Task =
@@ -57,17 +57,17 @@ trait SimpleScalaProject extends ExecProject
 trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProject with Exec
 {
 	import ScalaProject._
-	
+
 	final case class MaxCompileErrors(val value: Int) extends CompileOption("") with ScaladocOption { def asList = Nil }
 	trait PackageOption extends ActionOption
 	trait TestOption extends ActionOption
-	
+
 	case class TestSetup(setup: () => Option[String]) extends TestOption
 	case class TestCleanup(cleanup: () => Option[String]) extends TestOption
 	case class ExcludeTests(tests: Iterable[String]) extends TestOption
 	case class TestListeners(listeners: Iterable[TestReportListener]) extends TestOption
 	case class TestFilter(filterTest: String => Boolean) extends TestOption
-	
+
 	case class JarManifest(m: Manifest) extends PackageOption
 	{
 		assert(m != null)
@@ -80,8 +80,8 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		val converted = for( (name,value) <- attributes ) yield (new Attributes.Name(name), value)
 		new ManifestAttributes(converted : _*)
 	}
-	
-	
+
+
 	trait ScaladocOption extends ActionOption
 	{
 		def asList: List[String]
@@ -105,7 +105,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	def stylesheetFile(path: Path) = CompoundDocOption("-stylesheetfile", path.asFile.getAbsolutePath)
 	def documentTop(topText: String) = CompoundDocOption("-top", topText)
 	def windowTitle(title: String) = CompoundDocOption("-windowtitle", title)
-	
+
 	object Access extends Enumeration
 	{
 		val Public = Value("public")
@@ -123,17 +123,16 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		val classes = conditional.analysis.allProducts.flatMap(path => Path.relativize(compilePath.asFile, path.asFile))
 		classes.map(_.replace(java.io.File.separatorChar, '.').toList.dropRight(".class".length).mkString).toSeq
 	}
-	
-	def consoleTask(classpath : PathFinder): Task = 
-		consoleTask(classpath, Run)
-	def consoleTask(classpath : PathFinder, runner: ScalaRun): Task =
-		interactiveTask { runner.console(classpath.get, log) }
 
-	def runTask(mainClass: => Option[String], classpath: PathFinder, options: String*): Task =
+	def consoleTask(classpath: PathFinder): Task = consoleTask(classpath, "")
+	def consoleTask(classpath: PathFinder, initialCommands: => String): Task =
+		interactiveTask {
+			(new Console(buildCompiler))(classpath.get, initialCommands, log)
+		}
+
+	def runTask(mainClass: => Option[String], classpath: PathFinder, options: String*)(implicit runner: ScalaRun): Task =
 		runTask(mainClass, classpath, options)
-	def runTask(mainClass: => Option[String], classpath: PathFinder, options: => Seq[String]): Task =
-		runTask(mainClass, classpath, options, Run)
-	def runTask(mainClass: => Option[String], classpath: PathFinder, options: => Seq[String], runner: ScalaRun): Task =
+	def runTask(mainClass: => Option[String], classpath: PathFinder, options: => Seq[String])(implicit runner: ScalaRun): Task =
 		task
 		{
 			mainClass match
@@ -142,7 +141,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 				case None => Some("No main class specified.")
 			}
 		}
-		
+
 	def syncPathsTask(sources: PathFinder, destinationDirectory: Path): Task =
 		task { FileUtilities.syncPaths(sources, destinationDirectory, log) }
 	def syncTask(sourceDirectory: Path, destinationDirectory: Path): Task =
@@ -177,10 +176,9 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	def scaladocTask(label: String, sources: PathFinder, outputDirectory: Path, classpath: PathFinder, options: => Seq[ScaladocOption]): Task =
 		task
 		{
-			val classpathString = Path.makeString(classpath.get)
 			val optionsLocal = options
 			val maxErrors = maximumErrors(optionsLocal)
-			(new Scaladoc(maxErrors))(label, sources.get, classpathString, outputDirectory, optionsLocal.flatMap(_.asList), log)
+			(new Scaladoc(maxErrors, buildCompiler))(label, sources.get, classpath.get, outputDirectory, optionsLocal.flatMap(_.asList), log)
 		}
 
 	def packageTask(sources: PathFinder, outputDirectory: Path, jarName: => String, options: PackageOption*): Task =
@@ -206,7 +204,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			{
 				option match
 				{
-					case JarManifest(mergeManifest) => 
+					case JarManifest(mergeManifest) =>
 					{
 						mergeAttributes(manifest.getMainAttributes, mergeManifest.getMainAttributes)
 						val entryMap = new MutableMapWrapper(manifest.getEntries)
@@ -258,7 +256,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			val excludeTestsSet = new HashSet[String]
 			val setup, cleanup = new ListBuffer[() => Option[String]]
 			val testListeners = new ListBuffer[TestReportListener]
-			
+
 			for(option <- options)
 			{
 				option match
@@ -271,7 +269,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 				}
 				() // 2.8.0-SNAPSHOT bug in type inference
 			}
-			
+
 			if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))
 			{
 				log.debug("Excluding tests: ")
@@ -282,12 +280,12 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			TestFramework.testTasks(frameworks, classpath.get, tests, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly)
 	}
 	private def flatten[T](i: Iterable[Iterable[T]]) = i.flatMap(x => x)
-	
+
 	protected def testQuickMethod(testAnalysis: CompileAnalysis, options: => Seq[TestOption])(toRun: Seq[TestOption] => Task) =
 		multiTask(testAnalysis.allTests.map(_.testClassName).toList) { includeFunction =>
 			toRun(TestFilter(includeFunction) :: options.toList)
 		}
-		
+
 	protected final def maximumErrors[T <: ActionOption](options: Seq[T]) =
 		(for( MaxCompileErrors(maxErrors) <- options) yield maxErrors).firstOption.getOrElse(DefaultMaximumCompileErrors)
 }
@@ -301,12 +299,12 @@ trait WebScalaProject extends ScalaProject
 			val webInfPath = warPath / "WEB-INF"
 			val webLibDirectory = webInfPath / "lib"
 			val classesTargetDirectory = webInfPath / "classes"
-			
+
 			val (libs, directories) = classpath.get.toList.partition(ClasspathUtilities.isArchive)
 			val classesAndResources = descendents(Path.lazyPathFinder(directories) ##, "*")
 			if(log.atLevel(Level.Debug))
 				directories.foreach(d => log.debug(" Copying the contents of directory " + d + " to " + classesTargetDirectory))
-			
+
 			import FileUtilities.{copy, copyFlat, copyFilesFlat, clean}
 			(copy(webappContents.get, warPath, log).right flatMap { copiedWebapp =>
 			copy(classesAndResources.get, classesTargetDirectory, log).right flatMap { copiedClasses =>
@@ -370,7 +368,7 @@ trait MultiTaskProject extends Project
 					filterInclude
 			run(includeFunction)
 		} completeWith allTests
-	
+
 }
 trait ExecProject extends Project
 {
diff --git a/src/main/scala/sbt/ScalaVersion.scala b/src/main/scala/sbt/ScalaVersion.scala
deleted file mode 100644
index 6366359d2..000000000
--- a/src/main/scala/sbt/ScalaVersion.scala
+++ /dev/null
@@ -1,47 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
- */
-package sbt
-
-/** Provides access to the current version of Scala being used to build a project.  These methods typically
-* return None or the empty string when the loader is not used. */
-object ScalaVersion
-{
-	/** The name of the system property containing the Scala version used for this project.*/
-	private[sbt] val LiveKey = "sbt.scala.version"
-	private[sbt] def crossString(v: String) = "scala_" + v
-	/** Returns the current version of Scala being used to build the project, unless the sbt loader is not being used,
-	* in which case this is the empty string.*/
-	def currentString =
-	{
-		val v = System.getProperty(LiveKey)
-		if(v == null)
-			""
-		else
-			v.trim
-	}
-	/** Returns the current version of Scala being used to build the project.  If the sbt loader is not being
-	* used, this returns None.  Otherwise, the value returned by this method is fixed for the duration of
-	* a Project's existence.  It only changes on reboot (during which a Project is recreated).*/
-	val current: Option[String] =
-	{
-		val sv = currentString
-		if(sv.isEmpty)
-			None
-		else
-			Some(sv)
-	}
-	private[sbt] def withCross[T](crossDisabled: Boolean)(withVersion: String => T, disabled: => T): T =
-	{
-		if(crossDisabled)
-			disabled
-		else
-		{
-			current match
-			{
-				case Some(scalaV) => withVersion(scalaV)
-				case _ => disabled
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index 16d47f9de..29f38d357 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -15,7 +15,7 @@ object JettyRunner
 class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 {
 	ExitHooks.register(this)
-	
+
 	def name = "jetty-shutdown"
 	def runBeforeExiting() { stop() }
 	private var running: Option[Stoppable] = None
@@ -37,7 +37,7 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 			val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
 			runner(configuration)
 		}
-		
+
 		if(running.isDefined)
 			Some("This instance of Jetty is already running.")
 		else
@@ -55,7 +55,7 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 		}
 	}
 	private val implClassName = "sbt.LazyJettyRun"
-	
+
 	private def runError(e: Throwable, messageBase: String, log: Logger) =
 	{
 		log.trace(e)
@@ -78,8 +78,6 @@ sealed trait JettyConfiguration extends NotNull
 	def scanInterval: Int
 	/** The classpath to get Jetty from. */
 	def jettyClasspath: PathFinder
-	/** The classpath containing the classes, jars, and resources for the web application. */
-	def classpath: PathFinder
 	def classpathName: String
 	def log: Logger
 }
@@ -87,6 +85,9 @@ trait DefaultJettyConfiguration extends JettyConfiguration
 {
 	def contextPath: String
 	def port: Int
+	/** The classpath containing the classes, jars, and resources for the web application. */
+	def classpath: PathFinder
+	def parentLoader: ClassLoader
 }
 abstract class CustomJettyConfiguration extends JettyConfiguration
 {
@@ -108,17 +109,17 @@ private object LazyJettyRun extends JettyRun
 	import org.mortbay.log.Log
 	import org.mortbay.util.Scanner
 	import org.mortbay.xml.XmlConfiguration
-	
+
 	import java.lang.ref.{Reference, WeakReference}
-	
+
 	val DefaultMaxIdleTime = 30000
-	
+
 	def apply(configuration: JettyConfiguration): Stoppable =
 	{
 		val oldLog = Log.getLog
 		Log.setLog(new JettyLogger(configuration.log))
 		val server = new Server
-		
+
 		val listener =
 			configuration match
 			{
@@ -126,11 +127,11 @@ private object LazyJettyRun extends JettyRun
 					import c._
 					configureDefaultConnector(server, port)
 					def classpathURLs = classpath.get.map(_.asURL).toSeq
-					def createLoader = new URLClassLoader(classpathURLs.toArray, this.getClass.getClassLoader)
+					def createLoader = new URLClassLoader(classpathURLs.toArray, parentLoader)
 					val webapp = new WebAppContext(war.absolutePath, contextPath)
 					webapp.setClassLoader(createLoader)
 					server.setHandler(webapp)
-					
+
 					Some(new Scanner.BulkListener {
 						def filesChanged(files: java.util.List[_]) {
 							reload(server, webapp.setClassLoader(createLoader), log)
@@ -143,7 +144,7 @@ private object LazyJettyRun extends JettyRun
 						(new XmlConfiguration(file.toURI.toURL)).configure(server)
 					None
 			}
-		
+
 		def configureScanner() =
 		{
 			val scanDirectories = configuration.scanDirectories
@@ -164,7 +165,7 @@ private object LazyJettyRun extends JettyRun
 				Some(new WeakReference(scanner))
 			}
 		}
-		
+
 		try
 		{
 			server.start()
@@ -219,7 +220,7 @@ private object LazyJettyRun extends JettyRun
 	{
 		def isDebugEnabled = delegate.atLevel(Level.Debug)
 		def setDebugEnabled(enabled: Boolean) = delegate.setLevel(if(enabled) Level.Debug else Level.Info)
-	
+
 		def getLogger(name: String) = this
 		def info(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.info(format(msg, arg0, arg1)) }
 		def debug(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.debug(format(msg, arg0, arg1)) }

From 28b24ed3f95a0f07981d4f361851f1c7c32eeb65 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 11 Oct 2009 15:22:20 -0400
Subject: [PATCH 135/268] Only write 'info' tag if user has not provided one.

---
 src/main/scala/sbt/ManageDependencies.scala   |  7 +++-
 .../info/project/build.properties             |  3 ++
 .../info/project/build/InfoTest.scala         | 35 +++++++++++++++++++
 src/sbt-test/dependency-management/info/test  | 13 +++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 src/sbt-test/dependency-management/info/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/info/project/build/InfoTest.scala
 create mode 100644 src/sbt-test/dependency-management/info/test

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index d0ad1b205..6d865e443 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -235,10 +235,15 @@ object ManageDependencies
 		{
 			import module._
 			<ivy-module version="2.0">
-				<info organisation={organization} module={name} revision={revision}/>
+				{ if(hasInfo(dependencies))
+					scala.xml.NodeSeq.Empty
+				else
+					<info organisation={organization} module={name} revision={revision}/>
+				}
 				{dependencies}
 			</ivy-module>
 		}
+		def hasInfo(x: scala.xml.NodeSeq) = !(<g>{x}</g> \ "info").isEmpty
 		/** Performs checks/adds filters on Scala dependencies (if enabled in IvyScala). */
 		def checkModule(moduleAndConf: (ModuleDescriptor, String)): Either[String, (ModuleDescriptor, String)] =
 			ivyScala match
diff --git a/src/sbt-test/dependency-management/info/project/build.properties b/src/sbt-test/dependency-management/info/project/build.properties
new file mode 100644
index 000000000..54ea234fa
--- /dev/null
+++ b/src/sbt-test/dependency-management/info/project/build.properties
@@ -0,0 +1,3 @@
+project.name=test
+project.org=test
+project.version=1.0
diff --git a/src/sbt-test/dependency-management/info/project/build/InfoTest.scala b/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
new file mode 100644
index 000000000..fc4759671
--- /dev/null
+++ b/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
@@ -0,0 +1,35 @@
+import sbt._
+
+class InfoTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	
+	override def ivyXML =
+		if(customInfo)
+			(<info organisation="test" module="test" revision="1.0">
+				<license name="Two-clause BSD-style" url="http://github.com/szeiger/scala-query/blob/master/LICENSE.txt" />
+				<description homepage="http://github.com/szeiger/scala-query/">
+					ScalaQuery is a type-safe database query API for Scala.
+				</description>
+			</info>
+			<dependency org="org.scalacheck" name="scalacheck" rev="1.5"/>)
+		else
+			<dependency org="org.scalacheck" name="scalacheck" rev="1.5"/>
+
+	def customInfo = "info".asFile.exists
+
+	lazy val checkDownload = task { if(compileClasspath.get.isEmpty) Some("Dependency not downloaded") else None }
+	lazy val checkInfo = task {
+		if((delivered \ "info").isEmpty)
+			Some("No info tag generated")
+		else if(customInfo)
+			if( deliveredWithCustom ) None else Some("Expected 'license' and 'description' tags in info tag, got: \n" + (delivered \ "info"))
+		else
+			if( deliveredWithCustom ) Some("Expected empty 'info' tag, got: \n" + (delivered \ "info")) else None
+	}
+	def deliveredWithCustom = !(delivered \ "info" \ "license").isEmpty && !(delivered \ "info" \ "description").isEmpty
+	def delivered = scala.xml.XML.loadFile(ivyFile)
+
+	def ivyFile = (outputPath * "ivy*.xml").get.toList.head.asFile
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/info/test b/src/sbt-test/dependency-management/info/test
new file mode 100644
index 000000000..b301d8a4f
--- /dev/null
+++ b/src/sbt-test/dependency-management/info/test
@@ -0,0 +1,13 @@
+> update [success]
+> check-download [success]
+> deliver-local [success]
+> check-info [success]
+
+> clean [success]
+> clean-lib [success]
+$ touch info [success]
+
+> update [success]
+> check-download [success]
+> deliver-local [success]
+> check-info [success]
\ No newline at end of file

From 25952ce5bea51f0e1ba07f049f3fd28c3ead92c3 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 14 Oct 2009 18:02:37 -0400
Subject: [PATCH 136/268] Update Project to work with latest global lock
 interface in xsbt

---
 src/main/scala/sbt/Project.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index a21eb438d..a406bcb0a 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -228,7 +228,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	/** The definitive source for the version of Scala being used to *build* the project.*/
 	def buildScalaVersion = info.buildScalaVersion.getOrElse(buildInitScalaVersion.value)
 
-	def componentManager = new xsbt.ComponentManager(info.app.components, log)
+	def componentManager = new xsbt.ComponentManager(info.launcher.globalLock, info.app.components, log)
 	def buildScalaInstance =
 		localScalaInstances.find(_.version == buildScalaVersion) getOrElse
 			xsbt.ScalaInstance(buildScalaVersion, info.launcher)

From 0b4f24a301c919baf4f5312139fe0df309092e4b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 14 Oct 2009 18:03:24 -0400
Subject: [PATCH 137/268] ScalaCheck 1.6 support (workaround binary
 incompatibility in Pretty)

---
 .../scala/sbt/impl/TestFrameworkImpl.scala    | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/main/scala/sbt/impl/TestFrameworkImpl.scala b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
index 71599c574..b8562988f 100755
--- a/src/main/scala/sbt/impl/TestFrameworkImpl.scala
+++ b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
@@ -30,9 +30,25 @@ private[sbt] class ScalaCheckRunner(val log: Logger, val listeners: Seq[TestRepo
 	private def testReport(pName: String, res: Test.Result) =
 	{
 		if(res.passed)
-			fire(PassedEvent(pName, Pretty.pretty(res)))
+			fire(PassedEvent(pName, pretty(res)))
 		else
-			fire(FailedEvent(pName, Pretty.pretty(res)))
+			fire(FailedEvent(pName, pretty(res)))
+	}
+	private def pretty(res: Test.Result): String =
+	{
+		try { pretty1_5(res) }
+		catch { case e: NoSuchMethodError => pretty1_6(res) }
+	}
+	private def pretty1_5(res: Test.Result): String = Pretty.pretty(res)
+	private def pretty1_6(res: Test.Result): String =
+	{
+		// the following is equivalent to: (Pretty.prettyTestRes(res))(Pretty.defaultParams)
+		// and is necessary because of binary incompatibility in Pretty between ScalaCheck 1.5 and 1.6
+		val loader = getClass.getClassLoader
+		val prettyObj = ModuleUtilities.getObject("org.scalacheck.Pretty", loader)
+		val prettyInst = prettyObj.getClass.getMethod("prettyTestRes", classOf[Test.Result]).invoke(prettyObj, res)
+		val defaultParams = prettyObj.getClass.getMethod("defaultParams").invoke(prettyObj)
+		prettyInst.getClass.getMethod("apply", Class.forName("org.scalacheck.Pretty$Params", true, loader)).invoke(prettyInst, defaultParams).toString
 	}
 }
 /** The test runner for ScalaTest suites. */
@@ -51,7 +67,7 @@ private[sbt] class ScalaTestRunner(val log: Logger, val listeners: Seq[TestRepor
 		else
 			Result.Failed
 	}
-	
+
 	/** An implementation of Reporter for ScalaTest. */
 	private class ScalaTestReporter extends org.scalatest.Reporter with NotNull
 	{
@@ -68,13 +84,13 @@ private[sbt] class ScalaTestRunner(val log: Logger, val listeners: Seq[TestRepor
 			succeeded = false
 			error(report, "Test failed", Some(Result.Failed))
 		}
-		
+
 		override def infoProvided(report : Report) { info(report, "", None) }
-		
+
 		override def suiteStarting(report: Report) { info(report, "Suite starting", None) }
 		override def suiteCompleted(report: Report) { info(report, "Suite completed", None) }
 		override def suiteAborted(report: Report) { error(report, "Suite aborted", None) }
-		
+
 		override def runStarting(testCount: Int) { fire(MessageEvent("Run starting")) }
 		override def runStopped()
 		{
@@ -87,7 +103,7 @@ private[sbt] class ScalaTestRunner(val log: Logger, val listeners: Seq[TestRepor
 			error(report, "Run aborted", None)
 		}
 		override def runCompleted() { log.info("Run completed.") }
-		
+
 		private def error(report: Report, event: String, result: Option[Result.Value]) { logReport(report, event, result, Level.Error) }
 		private def info(report: Report, event: String, result: Option[Result.Value]) { logReport(report, event, result, Level.Info) }
 		private def logReport(report: Report, event: String, result: Option[Result.Value], level: Level.Value)
@@ -107,7 +123,7 @@ private[sbt] class ScalaTestRunner(val log: Logger, val listeners: Seq[TestRepor
 				case l => log.warn("Level not expected:" + l)
 			}
 		}
-		
+
 		var succeeded = true
 	}
 }
@@ -127,16 +143,16 @@ private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportLis
 		else
 			Result.Passed
 	}
-	
+
 	/* The following is closely based on org.specs.runner.OutputReporter,
 	* part of specs, which is Copyright 2007-2008 Eric Torreborre.
 	* */
-	
+
 	private def reportSpecification(spec: Specification): SpecificationReportEvent =
 	{
 		 // this is for binary compatibility between specs 1.4.x and 1.5.0: the ancestor of Specification containing these two methods changed
 		val reflectedSpec: { def systems: Seq[Sus]; def subSpecifications: Seq[Specification] } = spec
-		
+
 		return SpecificationReportEvent(spec.successes.size, spec.failures.size, spec.errors.size, spec.skipped.size, spec.pretty,
 			reportSystems(reflectedSpec.systems), reportSpecifications(reflectedSpec.subSpecifications))
 	}
@@ -156,7 +172,7 @@ private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportLis
 		{
 			class ElemDesc(e: Elem) { def desc = e.child }
 			implicit def elemToDesc(e: Elem): ElemDesc = new ElemDesc(e)
-			
+
 			for(description <- sus.literateDescription) yield
 			{
 				// for source compatibility between specs 1.4.x and 1.5.0:
@@ -166,7 +182,7 @@ private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportLis
 				// Elem.child is a Seq[Node]
 				// each has a map[T](f: Node => T): Seq[T] defined so we implicitly convert
 				// an Elem e to an intermediate object that has desc defined to be e.child
-				
+
 				//description.child.map(_.text) // Elem equivalent
 				description.desc.map(_.text)  // LiterateDescription
 			}

From 0273e9d2b1ef0166cdd0a921f3f62f4217f32a7c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 16 Oct 2009 22:43:41 -0400
Subject: [PATCH 138/268] Removing remaining uses of structural types

---
 src/main/scala/sbt/ManageDependencies.scala   |  3 --
 src/main/scala/sbt/Webstart.scala             | 28 +++++++++----------
 .../scala/sbt/impl/TestFrameworkImpl.scala    |  6 ++--
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
index 6d865e443..adfb6f208 100644
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ b/src/main/scala/sbt/ManageDependencies.scala
@@ -417,9 +417,6 @@ object ManageDependencies
 			newModule.addDependency(translated)
 		newModule
 	}
-	private def addConfigurations(configurations: Iterable[String], to: { def setConfs(c: Array[String]): AnyRef }): Unit =
-		to.setConfs(configurations.toList.toArray)
-
 	def install(ivyConfig: IvyConfiguration, from: String, to: String, validate: Boolean, overwrite: Boolean) =
 	{
 		def doInstall(ivy: Ivy, md: ModuleDescriptor, default: String) =
diff --git a/src/main/scala/sbt/Webstart.scala b/src/main/scala/sbt/Webstart.scala
index 3bb4c5727..9f4e414b4 100644
--- a/src/main/scala/sbt/Webstart.scala
+++ b/src/main/scala/sbt/Webstart.scala
@@ -60,7 +60,7 @@ trait WebstartScalaProject extends ScalaProject
 			import options._
 			FileUtilities.createDirectories(webstartOutputDirectory :: webstartLibDirectory :: Nil, log) // ignore errors
 			verifyOptions(options)
-			
+
 			def relativize(jar: Path) = Path.relativize(webstartOutputDirectory ##, jar) getOrElse
 				error("Jar (" + jar + ") was not in webstart output directory (" + webstartOutputDirectory + ").")
 			def signAndPack(jars: List[Path], targetDirectory: Path): Either[String, List[Path]] =
@@ -91,12 +91,12 @@ trait WebstartScalaProject extends ScalaProject
 					}
 				}
 			}
-		
+
 			import FileUtilities._
-			
+
 			val jars = (webstartLibraries +++ webstartExtraLibraries).get.filter(ClasspathUtilities.isArchive)
 			def process(jars: Iterable[Path]) = for(jar <- jars if jar.asFile.getName.endsWith(".jar")) yield relativize(jar)
-			
+
 			thread(signAndPack(webstartMainJar :: Nil, webstartOutputDirectory)) { mainJars =>
 				thread(signAndPack(jars.toList, webstartLibDirectory)) { libJars =>
 					writeXML(jnlpXML(jarResources(process(mainJars), process(libJars))), jnlpFile, log) orElse
@@ -114,7 +114,7 @@ trait WebstartScalaProject extends ScalaProject
 	/** Creates a default XML element for a JNLP file for the given resource.*/
 	protected def defaultElement(resource: WebstartJarResource): Elem =
 		<jar href={resource.href} main={resource.isMain.toString}/>
-		
+
 }
 private class Jars(val gzippable: List[Path], val nonGzippable: List[Path]) extends NotNull
 {
@@ -165,7 +165,7 @@ private object WebstartScalaProject
 		val signedJar = targetDirectory / jar.asFile.getName
 		val packedJar = packPath(signedJar)
 		import signConfiguration._
-		
+
 		runOption("sign and pack200", List(packedJar, signedJar) from jar, log) {
 			log.debug("Applying pack200 compression and signing " + jar)
 			signAndPack(jar, signedJar, packedJar, alias, options, log) orElse
@@ -214,10 +214,10 @@ private object WebstartScalaProject
 		val xmlString =
 		{
 			import scala.xml.Utility
-			implicit def another28Hack(any: AnyRef): { def toXML(xml: Elem, stripComments: Boolean): String } =
-				new {
-					def toXML(xml: Elem, stripComments: Boolean) = Utility.toXML(xml).toString // this will only be called for 2.8, which defaults to stripComments= false, unlike 2.7
-				}
+			object WithToXML {
+				def toXML(xml: Elem, stripComments: Boolean) = Utility.toXML(xml).toString // this will only be called for 2.8, which defaults to stripComments= false, unlike 2.7
+			}
+			implicit def another28Hack(any: AnyRef) = WithToXML
 			scala.xml.Utility.toXML(xml, false) // 2.8 doesn't have this method anymore, so the above implicit will kick in for 2.8 only
 		}
 		if(!outputPath.exists)
@@ -248,14 +248,14 @@ private object WebstartScalaProject
 		new WebstartJarResource(jar.asFile.getName, jar.relativePathString("/"), isMain)
 	private def jarResources(mainJars: Iterable[Path], libraries: Iterable[Path]): Seq[WebstartJarResource] =
 		mainJars.map(jarResource(true)).toList ::: libraries.map(jarResource(false)).toList
-	
+
 	/** True iff 'directory' is an ancestor (strictly) of 'check'.*/
 	private def isInDirectory(directory: Path, check: Path) = Path.relativize(directory, check).isDefined && directory != check
 	/** Checks the paths in the given options for validity.  See the documentation for WebstartOptions.*/
 	private def verifyOptions(options: WebstartOptions)
 	{
 		import options._
-		require(isInDirectory(webstartOutputDirectory, webstartLibDirectory), 
+		require(isInDirectory(webstartOutputDirectory, webstartLibDirectory),
 			"Webstart dependency directory (" + webstartLibDirectory + ") must be a subdirectory of webstart output directory (" +
 				webstartOutputDirectory + ").")
 		require(isInDirectory(webstartOutputDirectory, jnlpFile), "Webstart JNLP file output location (" + jnlpFile +
@@ -273,13 +273,13 @@ abstract class DefaultWebstartProject(val info: ProjectInfo) extends BasicWebsta
 abstract class BasicWebstartProject extends BasicScalaProject with WebstartScalaProject with WebstartOptions with WebstartPaths
 {
 	def webstartSignConfiguration: Option[SignConfiguration] = None
-	
+
 	def webstartExtraLibraries = mainDependencies.scalaJars
 	def webstartLibraries = publicClasspath +++ jarsOfProjectDependencies
 	def webstartResources = descendents(jnlpResourcesPath ##, AllPassFilter)
 
 	def webstartPack200 = true
 	def webstartGzip = true
-	
+
 	override def packageAction = super.packageAction && webstartTask(this)
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/impl/TestFrameworkImpl.scala b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
index b8562988f..63848250c 100755
--- a/src/main/scala/sbt/impl/TestFrameworkImpl.scala
+++ b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
@@ -151,10 +151,12 @@ private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportLis
 	private def reportSpecification(spec: Specification): SpecificationReportEvent =
 	{
 		 // this is for binary compatibility between specs 1.4.x and 1.5.0: the ancestor of Specification containing these two methods changed
-		val reflectedSpec: { def systems: Seq[Sus]; def subSpecifications: Seq[Specification] } = spec
+		def reflectSeq[T](name: String) = classOf[Specification].getMethod(name).invoke(spec).asInstanceOf[Seq[T]]
+		val systems = reflectSeq[Sus]("systems")
+		val subSpecifications = reflectSeq[Specification]("subSpecifications")
 
 		return SpecificationReportEvent(spec.successes.size, spec.failures.size, spec.errors.size, spec.skipped.size, spec.pretty,
-			reportSystems(reflectedSpec.systems), reportSpecifications(reflectedSpec.subSpecifications))
+			reportSystems(systems), reportSpecifications(subSpecifications))
 	}
 	private def reportSpecifications(specifications: Seq[Specification]): Seq[SpecificationReportEvent] =
 	{

From d57e6a8f1a5131e4a80f6750fbd2956b25fff697 Mon Sep 17 00:00:00 2001
From: dmharrah <dmharrah@d89573ee-9141-11dd-94d4-bdf5e562f29c>
Date: Fri, 16 Oct 2009 02:05:57 +0000
Subject: [PATCH 139/268] specs 1.6 support

git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@1090 d89573ee-9141-11dd-94d4-bdf5e562f29c
---
 .../scala/sbt/impl/TestFrameworkImpl.scala    | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/scala/sbt/impl/TestFrameworkImpl.scala b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
index 63848250c..06aa19699 100755
--- a/src/main/scala/sbt/impl/TestFrameworkImpl.scala
+++ b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
@@ -170,24 +170,28 @@ private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportLis
 	}
 	private def reportSystem(sus: Sus): SystemReportEvent =
 	{
-		def format =
+			// for source compatibility between specs 1.4.x and 1.5.0:
+			// in specs 1.5.0, description is LiterateDescription
+			// in specs < 1.5.0, description is Elem
+			// LiterateDescription.desc is a Node
+			// Elem.child is a Seq[Node]
+			// each has a map[T](f: Node => T): Seq[T] defined so we use reflection to call the right method
+
+			//description.child.map(_.text) // Elem equivalent
+			//description.desc.map(_.text)  // LiterateDescription
+		def formatDescription(a: AnyRef) =
 		{
-			class ElemDesc(e: Elem) { def desc = e.child }
-			implicit def elemToDesc(e: Elem): ElemDesc = new ElemDesc(e)
-
-			for(description <- sus.literateDescription) yield
-			{
-				// for source compatibility between specs 1.4.x and 1.5.0:
-				// in specs 1.5.0, description is LiterateDescription
-				// in specs < 1.5.0, description is Elem
-				// LiterateDescription.desc is a Node
-				// Elem.child is a Seq[Node]
-				// each has a map[T](f: Node => T): Seq[T] defined so we implicitly convert
-				// an Elem e to an intermediate object that has desc defined to be e.child
-
-				//description.child.map(_.text) // Elem equivalent
-				description.desc.map(_.text)  // LiterateDescription
-			}
+			val toMap = 
+				try { call(a, "desc") }
+				catch { case e: Exception => call(a, "child") }
+			val mapText = (a: AnyRef) => a.getClass.getMethod("text").invoke(a)
+			toMap.getClass.getMethod("map", Class.forName("scala.Function1")).invoke(toMap, mapText).asInstanceOf[Seq[String]]
+		}
+		def call(a: AnyRef, m: String) = a.getClass.getMethod(m).invoke(a)
+		def format: Option[Seq[String]] =
+		{
+			val litD = sus.literateDescription
+			if(litD.isEmpty) None else Some(formatDescription(litD.get))
 		}
 		// these are for 1.6 compatibility, which removed skippedSus (skipped still exists) and examples (moved to specification)
 		def skipped(sus: Sus) = classOf[Sus].getMethod("skipped").invoke(sus).asInstanceOf[Seq[Throwable]]

From e5b3b577d83a7a6a5ee7707540dcf374e5725700 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 18 Oct 2009 18:03:31 -0400
Subject: [PATCH 140/268] Fix some tests and open up some analysis-related
 classes

---
 src/main/scala/sbt/Analysis.scala                           | 6 +++---
 .../module-confs/project/build/Test.scala                   | 2 +-
 src/sbt-test/tests/specs-a/changes/BasicTest.scala          | 5 ++---
 src/sbt-test/tests/specs-a/changes/FailTest.scala           | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/sbt/Analysis.scala b/src/main/scala/sbt/Analysis.scala
index 898249b26..45fbee1e7 100644
--- a/src/main/scala/sbt/Analysis.scala
+++ b/src/main/scala/sbt/Analysis.scala
@@ -34,7 +34,7 @@ import BasicAnalysis._
 import impl.MapUtilities.{add, all, read, mark, readOnlyIterable, write}
 import scala.collection.mutable.{HashMap, HashSet, ListBuffer, Map, Set}
 
-sealed class BasicAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends TaskAnalysis[Path, Path, File]
+class BasicAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends TaskAnalysis[Path, Path, File]
 {
 	private val sourceDependencyMap: Map[Path, Set[Path]] = new HashMap
 	private val productMap: Map[Path, Set[Path]] = new HashMap
@@ -161,7 +161,7 @@ object CompileAnalysis
 }
 import CompileAnalysis._
 import Format._ // get implicits for data types
-sealed class BasicCompileAnalysis protected (analysisPath: Path, projectPath: Path, log: Logger) extends BasicAnalysis(analysisPath, projectPath, log)
+class BasicCompileAnalysis protected (analysisPath: Path, projectPath: Path, log: Logger) extends BasicAnalysis(analysisPath, projectPath, log)
 {
 	/*private */val hashesMap = new HashMap[Path, Array[Byte]]
 	
@@ -196,7 +196,7 @@ private[sbt] final class BuilderCompileAnalysis(analysisPath: Path, projectPath:
 		Backed(projectDefinitionMap, ProjectDefinitionsLabel, ProjectDefinitionsName) ::
 		super.backedMaps
 }
-final class CompileAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends BasicCompileAnalysis(analysisPath, projectPath, log)
+class CompileAnalysis(analysisPath: Path, projectPath: Path, log: Logger) extends BasicCompileAnalysis(analysisPath, projectPath, log)
 {
 	private val testMap = new HashMap[Path, Set[TestDefinition]]
 	private val applicationsMap = new HashMap[Path, Set[String]]
diff --git a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
index a19879906..c1ea79b6e 100644
--- a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
+++ b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
@@ -9,6 +9,6 @@ class Test(info: ProjectInfo) extends DefaultProject(info)
 	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
 	val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
 
-	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219"
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20091017.011744-240"
 	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
 }
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-a/changes/BasicTest.scala b/src/sbt-test/tests/specs-a/changes/BasicTest.scala
index fc0834d27..6c6d4ac8f 100755
--- a/src/sbt-test/tests/specs-a/changes/BasicTest.scala
+++ b/src/sbt-test/tests/specs-a/changes/BasicTest.scala
@@ -27,10 +27,9 @@ abstract class AbstractNotATest extends Specification
   }
 }
 
-class ClassNotATest extends Specification
+class ClassCanBeATest extends Specification
 {
-	// would fail if called
   "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 12
+     "hello world".size mustEqual 11
   }
 }
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-a/changes/FailTest.scala b/src/sbt-test/tests/specs-a/changes/FailTest.scala
index 8df53ef80..b55799891 100755
--- a/src/sbt-test/tests/specs-a/changes/FailTest.scala
+++ b/src/sbt-test/tests/specs-a/changes/FailTest.scala
@@ -27,10 +27,10 @@ object FailTest extends Specification
   }
 }
 
-class ClassNotATest extends Specification
+class ClassCanBeATest extends Specification
 {
 	// would fail if called
   "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 12
+     "hello world".size mustEqual 11
   }
 }
\ No newline at end of file

From 21bbe06f35dad3cb0aa0d87a705d01a9b52ba644 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 19 Oct 2009 11:14:27 -0400
Subject: [PATCH 141/268] Set version to 0.6.0

---
 project/build.properties       |  4 ++--
 project/build/SbtProject.scala | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 433d31217..55b9c6035 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Thu Oct 01 17:51:28 EDT 2009
+#Mon Oct 19 10:39:39 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.5
-project.version=0.5.6-SNAPSHOT
+project.version=0.6.0
 scala.version=2.7.5
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 77b689814..4bf40940b 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -7,14 +7,15 @@ import java.io.File
 
 class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.SbtScripted
 {
-	/** Additional resources to include in the produced jar.*/
+	/* Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
 	override def mainResources = super.mainResources +++ extraResources
-	override def mainClass = Some("sbt.Main")
-	override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: "sbt.ProcessSpecification" :: Nil) :: super.testOptions.toList
+
+	override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: Nil) :: super.testOptions.toList
 	override def normalizedName = "sbt"
 	//override def scriptedDependencies = testCompile :: `package` :: Nil
 
+	/* For Scala 2.8.0 nightlies, use a special resolver so that we can refer to a specific nightly and not just 2.8.0-SNAPSHOT*/
 	def specificSnapshotRepo =
 		Resolver.url("scala-nightly") artifacts("http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]") mavenStyle()
 	val nightlyScala = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", specificSnapshotRepo)
@@ -35,7 +36,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	val optional = Configurations.Optional
 	val provided = Configurations.Provided
 
-	/* The base configuration names for the versions of Scala*/
+	/* Versions of Scala to cross-build against. */
 	private val Version2_7_2 = "2.7.2"
 	private val Version2_7_3 = "2.7.3"
 	private val Version2_7_4 = "2.7.4"
@@ -52,8 +53,8 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
 
 	// xsbt components
-	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % "0.7.0_13" % "provided"
-	val compiler = "org.scala-tools.sbt" %% "compile" % "0.7.0_13"
+	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % projectVersion.value.toString % "provided"
+	val compiler = "org.scala-tools.sbt" %% "compile" % projectVersion.value.toString
 
 	override def libraryDependencies = super.libraryDependencies ++ getDependencies(scalaVersionString)
 

From 293730d11b03e0d41ba854eef6a49bbce959cfbf Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 19 Oct 2009 20:19:09 -0400
Subject: [PATCH 142/268] Remove 'final' from name,version,organization

---
 src/main/scala/sbt/Project.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index a406bcb0a..e9f8b1567 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -28,11 +28,11 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	/** Basic project information. */
 	def info: ProjectInfo
 	/** The project name. */
-	final def name: String = projectName.value
+	def name: String = projectName.value
 	/** The project version. */
-	final def version: Version = projectVersion.value
+	def version: Version = projectVersion.value
 	/** The project organization. */
-	final def organization: String = projectOrganization.value
+	def organization: String = projectOrganization.value
 	/** True if the project should cater to a quick throwaway project setup.*/
 	def scratch = projectScratch.value
 

From 72c1e72426bef67aafbdcf36b5e8002bef6e9182 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 19 Oct 2009 23:18:52 -0400
Subject: [PATCH 143/268] Fix Scala version checking done for dependency
 declarations

---
 src/main/scala/sbt/BasicProjectTypes.scala | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index fc8ecd6a4..4e48504d9 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -101,7 +101,7 @@ trait ManagedProject extends ClasspathProject
 				case ErrorIfNoConfiguration => errorIfNoConfiguration = true
 				case CacheDirectory(dir) => cacheDirectory = Some(dir)
 				case CheckScalaVersion(configs, checkExplicit, filterImplicit) =>
-					checkScalaVersion = getScalaVersion.map(version => new IvyScala(version, configs, checkExplicit, filterImplicit))
+					checkScalaVersion = Some(new IvyScala(buildScalaVersion, configs, checkExplicit, filterImplicit))
 				case _ => log.warn("Ignored unknown managed option " + option)
 			}
 		}
@@ -111,12 +111,6 @@ trait ManagedProject extends ClasspathProject
 		val updateConfiguration = new UpdateConfiguration(outputPattern, synchronize, quiet)
 		doWith(ivyConfiguration, updateConfiguration)
 	}
-	private def getScalaVersion =
-	{
-		val v = scalaVersion.value
-		if(v.isEmpty) None
-		else Some(v)
-	}
 	protected def withIvyTask(doTask: => Option[String]) =
 		task
 		{

From c6621d9a580d9226d1626b064c357d277229128c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 19 Oct 2009 23:19:27 -0400
Subject: [PATCH 144/268] scala.version -> (build.scala.versions,
 def.scala.version)

---
 src/main/scala/sbt/Compile.scala | 21 +++++++++++----------
 src/main/scala/sbt/Main.scala    |  6 +++---
 src/main/scala/sbt/Project.scala | 24 +++++++++++-------------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index c103e4e4b..49a04d209 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -27,8 +27,7 @@ sealed abstract class CompilerCore
 		val classpathSet = fileSet(classpath)
 		val scalaCompile = process("Scala", scalaSources, processScala(scalaSources, classpathSet, outputDirectory.asFile, scalaOptions, log) )
 		val javaCompile = process("Java", javaSources, processJava(javaSources, classpathSet, outputDirectory.asFile, javaOptions, log))
-		try { doCompile(label, sources, outputDirectory, order, log)(javaCompile, scalaCompile) }
-		catch { case e: xsbti.CompileFailed => log.trace(e); Some(e.toString) }
+		doCompile(label, sources, outputDirectory, order, log)(javaCompile, scalaCompile)
 	}
 	protected def doCompile(label: String, sources: Iterable[Path], outputDirectory: Path, order: CompileOrder.Value, log: Logger)(javaCompile: () => Unit, scalaCompile: () => Unit) =
 	{
@@ -40,14 +39,16 @@ sealed abstract class CompilerCore
 		}
 		else
 		{
-			FileUtilities.createDirectory(outputDirectory.asFile, log) orElse Control.trapUnit("Compiler error: ", log)
-			{
-				val (first, second) = if(order == CompileOrder.JavaThenScala) (javaCompile, scalaCompile) else (scalaCompile, javaCompile)
-				first()
-				second()
-				log.info(actionSuccessfulMessage)
-				None
-			}
+			FileUtilities.createDirectory(outputDirectory.asFile, log) orElse
+				(try
+				{
+					val (first, second) = if(order == CompileOrder.JavaThenScala) (javaCompile, scalaCompile) else (scalaCompile, javaCompile)
+					first()
+					second()
+					log.info(actionSuccessfulMessage)
+					None
+				}
+				catch { case e: xsbti.CompileFailed => Some(e.toString) })
 		}
 	}
 	def actionStartMessage(label: String): String
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index c3db9ff0e..846419578 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -101,7 +101,7 @@ class xMain extends xsbti.AppMain
 	private def startProject(project: Project, configuration: xsbti.AppConfiguration, remainingArguments: List[String], startTime: Long): xsbti.MainResult =
 	{
 		project.log.info("Building project " + project.name + " " + project.version.toString + " against Scala " + project.buildScalaVersion)
-		project.log.info("   using " + project.getClass.getName + " with sbt " + project.sbtVersion.value + " and Scala " + project.scalaVersion.value)
+		project.log.info("   using " + project.getClass.getName + " with sbt " + project.sbtVersion.value + " and Scala " + project.defScalaVersion.value)
 
 		processArguments(project, initialize(remainingArguments), configuration, startTime) match
 		{
@@ -124,7 +124,7 @@ class xMain extends xsbti.AppMain
 			{
 				case "" :: tail => process(project, tail, isInteractive)
 				case (ExitCommand | QuitCommand) :: _ => Exit(NormalExitCode)
-				case RebootCommand :: tail => Reboot(project.scalaVersion.value, saveProject(tail), configuration)
+				case RebootCommand :: tail => Reboot(project.defScalaVersion.value, saveProject(tail), configuration)
 				case InteractiveCommand :: _ => process(project, prompt(baseProject, project) :: arguments, true)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)
@@ -514,7 +514,7 @@ class xMain extends xsbti.AppMain
 						property.setStringValue(newValue)
 						property match
 						{
-							case project.scalaVersion => notePending("Scala ")
+							case project.defScalaVersion | project.buildScalaVersions => notePending("Scala ")
 							case project.sbtVersion => notePending("sbt ")
 							case _ =>  Console.println(" Set property '" + name + "' = '" + newValue + "'")
 						}
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index e9f8b1567..0f3d5b504 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -212,21 +212,20 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	/** The property for the project's organization.  Defaults to the parent project's organization or the project name if there is no parent. */
 	final val projectOrganization = propertyOptional[String](normalizedName, true)
 	/** The property that defines the version of Scala to use with the project definition.  This can be different
-	* from the version of Scala used to build the project (defined initially by buildInitScalaVersion).
+	* from the version of Scala used to build the project (current version used is buildScalaVersion, available are in buildScalaVersions).
 	* This property is only read by `sbt` on startup and reload. It is the definitive source for the version of Scala
 	* that sbt and the project definition are using.*/
-	final val scalaVersion = property[String]
+	final val defScalaVersion = property[String]
 	final val sbtVersion = property[String]
 	final val projectInitialize = propertyOptional[Boolean](false)
 	final val projectScratch = propertyOptional[Boolean](false, true)
-	/** The property that defines the version of Scala to build this project with by default.  This can be
-	* different from the version of Scala used to build and run the project definition (defined by scalaVersion).
-	* This property is only read by `sbt` on startup and reload.  When cross-building, this value may be different from the actual
-	* version of Scala being used to build the project.  info.scalaVersion is always the definitive source for the current Scala version.
-	* This property should only be used to change the version of Scala used for normal development (not cross-building).*/
-	final val buildInitScalaVersion = propertyOptional[String](scalaVersion.value, true)
+	/** The property that defines the versions of Scala to build this project against as a comma separated string.  This can be
+	* different from the version of Scala used to build and run the project definition (defined by defScalaVersion).
+	* This property is only read by `sbt` on startup and reload.  The definitive source for the version of Scala currently
+	* being used is buildScalaVersion.*/
+	final val buildScalaVersions = propertyOptional[String](defScalaVersion.value, true)
 	/** The definitive source for the version of Scala being used to *build* the project.*/
-	def buildScalaVersion = info.buildScalaVersion.getOrElse(buildInitScalaVersion.value)
+	def buildScalaVersion = info.buildScalaVersion.getOrElse(crossScalaVersions.first)
 
 	def componentManager = new xsbt.ComponentManager(info.launcher.globalLock, info.app.components, log)
 	def buildScalaInstance =
@@ -250,13 +249,12 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 
 	/** True if crossPath should be the identity function.*/
 	protected def disableCrossPaths = crossScalaVersions.isEmpty
-	/** By default, this is empty and cross-building is disabled.  Overriding this to a Set of Scala versions
-	* will enable cross-building against those versions.*/
-	def crossScalaVersions: immutable.Set[String] =
+	/** By default, this is the build.scala.versions property split around commas.  This can be overridden directly if preferred.*/
+	def crossScalaVersions: Seq[String] =
 		info.parent match
 		{
 			case Some(p) => p.crossScalaVersions
-			case None => immutable.Set.empty[String]
+			case None => buildScalaVersions.value.split("""\s*,\s*""").toList.reverse.removeDuplicates.reverse
 		}
 	/** A `PathFinder` that determines the files watched when an action is run with a preceeding ~ when this is the current
 	* project.  This project does not need to include the watched paths for projects that this project depends on.*/

From 8135c5bd55b4f680c44effec5c8a60a62b7c097d Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 20 Oct 2009 18:48:56 -0400
Subject: [PATCH 145/268] Fix console-project

---
 src/main/scala/sbt/Run.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 7ac46b85a..770789969 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -106,8 +106,10 @@ object Run
 	{
 		override def createInterpreter()
 		{
-			val loader = project.getClass.getClassLoader.asInstanceOf[URLClassLoader]
-			compilerSettings.classpath.value = loader.getURLs.flatMap(ClasspathUtilities.asFile).map(_.getAbsolutePath).mkString(File.pathSeparator)
+			def urlClassLoader(c: Class[_]) = c.getClassLoader.asInstanceOf[URLClassLoader]
+			val loader = urlClassLoader(project.getClass)
+			val urls = List(loader, urlClassLoader(classOf[xsbti.Launcher])).flatMap(_.getURLs) // TODO: this is fragile and should be done better
+			compilerSettings.classpath.value = urls.flatMap(ClasspathUtilities.asFile).map(_.getAbsolutePath).mkString(File.pathSeparator)
 			project.log.debug("  Compiler classpath: " + compilerSettings.classpath.value)
 
 			in = InteractiveReader.createDefault()

From 50776a69e534e05d4e0daa7bf41f7cb7f4a40ba6 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 20 Oct 2009 18:49:08 -0400
Subject: [PATCH 146/268] Cleanup/fixes related to cross-building

---
 src/main/scala/sbt/Main.scala | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 846419578..0c86b6dc6 100644
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -130,7 +130,7 @@ class xMain extends xsbti.AppMain
 					if(Some(version) != baseProject.info.buildScalaVersion)
 						throw new ReloadException(saveProject(action :: tail), Some(version))
 					else
-						process(project, tail, isInteractive)
+						process(project, action :: tail, isInteractive)
 				case CrossBuild(action) :: tail =>
 					if(checkAction(project, action)) process(project, CrossBuild(project, action) ::: tail, isInteractive)
 					else if(isInteractive) process(project, tail, isInteractive)
@@ -169,7 +169,8 @@ class xMain extends xsbti.AppMain
 	}
 	object SpecificBuild
 	{
-		val pattern = """\+\+(\S+)\s*(.*)""".r.pattern
+		import java.util.regex.Pattern.{compile,quote}
+		val pattern = compile(quote(SpecificBuildPrefix) + """(\S+)\s*(.*)""")
 		def unapply(s: String) =
 		{
 			val m = pattern.matcher(s)
@@ -181,7 +182,7 @@ class xMain extends xsbti.AppMain
 	}
 	object CrossBuild
 	{
-		def unapply(s: String) = if(s.startsWith("+") && !s.startsWith("++")) Some(s.substring(1)) else None
+		def unapply(s: String) = if(s.startsWith(CrossBuildPrefix) && !s.startsWith(SpecificBuildPrefix)) Some(s.substring(1)) else None
 		def apply(project: Project, action: String) =
 		{
 			val againstScalaVersions = project.crossScalaVersions
@@ -191,7 +192,9 @@ class xMain extends xsbti.AppMain
 				action :: Nil
 			}
 			else
-				againstScalaVersions.toList.map("++" + _ + " " + action)
+				againstScalaVersions.toList.map(SpecificBuildPrefix + _ + " " + action) ::: // build against all versions
+					(SpecificBuildPrefix + project.buildScalaVersion) :: // reset to the version before the cross-build
+					Nil
 		}
 	}
 	// todo:  project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
@@ -237,6 +240,10 @@ class xMain extends xsbti.AppMain
 	val ContinuousExecutePrefix = "~"
 	/** The prefix used to identify a request to execute the remaining input across multiple Scala versions.*/
 	val CrossBuildPrefix = "+"
+	/** The prefix used to identify a request to execute the remaining input after the next space against the
+	* Scala version between this prefix and the space (i.e. '++version action' means execute 'action' using
+	* Scala version 'version'. */
+	val SpecificBuildPrefix = "++"
 
 	/** The number of seconds between polling by the continuous compile command.*/
 	val ContinuousCompilePollDelaySeconds = 1
@@ -280,6 +287,7 @@ class xMain extends xsbti.AppMain
 		printCmd("<method name> <parameter>*", "Executes the project specified method.")
 		printCmd(ContinuousExecutePrefix + " <command>", "Executes the project specified action or method whenever source files change.")
 		printCmd(CrossBuildPrefix + " <command>", "Executes the project specified action or method for all versions of Scala defined in crossScalaVersions.")
+		printCmd(SpecificBuildPrefix + "<version> <command>", "Changes the version of Scala building the project and executes the provided command.  <command> is optional.")
 		printCmd(ShowActions, "Shows all available actions.")
 		printCmd(RebootCommand, "Reloads sbt, picking up modifications to sbt.version or scala.version and recompiling modified project definitions.")
 		printCmd(HelpAction, "Displays this help message.")

From 15b9c15e6a64806c169439f1a179de2843581d86 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 21 Oct 2009 19:05:28 -0400
Subject: [PATCH 147/268] Use the from() method for the automatically added
 Scala dependencies so that they are not resolved.

---
 src/main/scala/sbt/DefaultProject.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 649eb6070..d14acc354 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -312,7 +312,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		mapScalaModule(snapshot.scalaCompiler, ScalaArtifacts.CompilerID)
 	}
 	override def watchPaths = mainSources +++ testSources +++ mainResources +++ testResources
-	private def mapScalaModule(in: Iterable[_], id: String) = in.map(jar => ModuleID(ScalaArtifacts.Organization, id, buildScalaVersion))
+	private def mapScalaModule(in: Iterable[File], id: String) = in.map(jar => ModuleID(ScalaArtifacts.Organization, id, buildScalaVersion) from(jar.toURI.toURL.toString))
 }
 abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProject with WebScalaPaths
 { p =>

From edbdc7d7bca5737714e14477f5a44a594c812b38 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 21 Oct 2009 19:06:33 -0400
Subject: [PATCH 148/268] Better error message for when val initialization
 errors occur (properties, tasks,...)

---
 src/main/scala/sbt/ReflectUtilities.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/ReflectUtilities.scala b/src/main/scala/sbt/ReflectUtilities.scala
index e48ae6b0f..60d6fb2ab 100644
--- a/src/main/scala/sbt/ReflectUtilities.scala
+++ b/src/main/scala/sbt/ReflectUtilities.scala
@@ -44,7 +44,7 @@ object ReflectUtilities
 				for(field <- correspondingFields.get(method.getName) if field.getType == method.getReturnType)
 				{
 					val value = method.invoke(self).asInstanceOf[T]
-					assume(value != null, "val " + method.getName + " was null")
+					if(value == null) throw new UninitializedVal(method.getName, method.getDeclaringClass.getName)
 					mappings(method.getName) = value
 				}
 			}
@@ -54,3 +54,4 @@ object ReflectUtilities
 	def allVals[T](self: AnyRef)(implicit mt: scala.reflect.Manifest[T]): Map[String, T] =
 		allValsC(self, mt.erasure).asInstanceOf[Map[String,T]]
 }
+final class UninitializedVal(val valName: String, val className: String) extends RuntimeException("val " + valName + " in class " + className + " was null.\nThis is probably an initialization problem and a 'lazy val' should be used.")
\ No newline at end of file

From 75b8fb72086c014dfe5967778a4344b32266ef62 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 22 Oct 2009 08:15:34 -0400
Subject: [PATCH 149/268] split build.scala.versions around whitespace, not
 commas

---
 src/main/scala/sbt/Project.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 0f3d5b504..59e931711 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -249,12 +249,12 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 
 	/** True if crossPath should be the identity function.*/
 	protected def disableCrossPaths = crossScalaVersions.isEmpty
-	/** By default, this is the build.scala.versions property split around commas.  This can be overridden directly if preferred.*/
+	/** By default, this is the build.scala.versions property split around whitespace.  This can be overridden directly if preferred.*/
 	def crossScalaVersions: Seq[String] =
 		info.parent match
 		{
 			case Some(p) => p.crossScalaVersions
-			case None => buildScalaVersions.value.split("""\s*,\s*""").toList.reverse.removeDuplicates.reverse
+			case None => buildScalaVersions.value.split("""\s+""").toList.reverse.removeDuplicates.reverse
 		}
 	/** A `PathFinder` that determines the files watched when an action is run with a preceeding ~ when this is the current
 	* project.  This project does not need to include the watched paths for projects that this project depends on.*/

From e417e19b02c5d8ab6c45710df388b55fb89bf7e2 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 22 Oct 2009 19:10:54 -0400
Subject: [PATCH 150/268] Use test-interface for test support.

---
 project/build/SbtProject.scala                |   2 +
 src/main/scala/sbt/DefaultProject.scala       |  21 +-
 src/main/scala/sbt/IntegrationTesting.scala   |   4 +-
 src/main/scala/sbt/Logger.scala               |   9 +-
 src/main/scala/sbt/ScalaProject.scala         |   9 +-
 src/main/scala/sbt/TestFramework.scala        | 171 ++++-----
 src/main/scala/sbt/TestReportListener.scala   | 339 +++---------------
 .../scala/sbt/impl/TestFrameworkImpl.scala    | 222 ------------
 src/main/scala/sbt/impl/TestParser.scala      |   2 +-
 9 files changed, 147 insertions(+), 632 deletions(-)
 delete mode 100755 src/main/scala/sbt/impl/TestFrameworkImpl.scala

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 4bf40940b..4132e5e74 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -52,6 +52,8 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
 
+	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.1"
+
 	// xsbt components
 	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % projectVersion.value.toString % "provided"
 	val compiler = "org.scala-tools.sbt" %% "compile" % projectVersion.value.toString
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index d14acc354..2ee7efedb 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -12,6 +12,7 @@ class DefaultWebProject(val info: ProjectInfo) extends BasicWebScalaProject with
 import BasicScalaProject._
 import ScalaProject.{optionsAsString, javaOptionsAsString}
 import java.io.File
+import java.net.URLClassLoader
 import java.util.jar.Attributes
 
 /** This class defines concrete instances of actions from ScalaProject using overridable paths,
@@ -169,9 +170,13 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	/** The list of test frameworks to use for testing.  Note that adding frameworks to this list
 	* for an active project currently requires an explicit 'clean' to properly update the set of tests to
 	* run*/
-	def testFrameworks: Iterable[TestFramework] = ScalaCheckFramework :: SpecsFramework :: ScalaTestFramework :: Nil
+	def testFrameworks: Seq[TestFramework] = 
+	{
+		import TestFrameworks.{ScalaCheck, ScalaTest, Specs}
+		/*ScalaCheckFramework :: SpecsFramework ::*/ ScalaTest :: Nil
+	}
 	/** The list of listeners for testing. */
-	def testListeners: Seq[TestReportListener] = new LogTestReportListener(log) :: Nil
+	def testListeners: Seq[TestReportListener] = TestLogger(log) :: Nil
 
 	def mainLabel = "main"
 	def testLabel = "test"
@@ -186,6 +191,14 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def options = optionsAsString(baseCompileOptions.filter(!_.isInstanceOf[MaxCompileErrors]))
 		def maxErrors = maximumErrors(baseCompileOptions)
 		def compileOrder = BasicScalaProject.this.compileOrder
+		protected def testClassNames(frameworks: Seq[TestFramework]) = 
+		{
+			val loader = new URLClassLoader(classpath.get.map(_.asURL).toSeq.toArray)
+			def getTestNames(framework: TestFramework): Seq[String] =
+				try { framework.create(loader).tests.map(_.superClassName) }
+				catch { case e: ClassNotFoundException => log.debug("Framework implementation '" + framework.implClassName + "' not present."); Nil }
+			frameworks.flatMap(getTestNames)
+		}
 	}
 	class MainCompileConfig extends BaseCompileConfig
 	{
@@ -196,7 +209,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def outputDirectory = mainCompilePath
 		def classpath = compileClasspath
 		def analysisPath = mainAnalysisPath
-		def testDefinitionClassNames: Iterable[String] = Nil
+		def testDefinitionClassNames: Seq[String] = Nil
 		def javaOptions = javaOptionsAsString(javaCompileOptions)
 	}
 	class TestCompileConfig extends BaseCompileConfig
@@ -208,7 +221,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def outputDirectory = testCompilePath
 		def classpath = testClasspath
 		def analysisPath = testAnalysisPath
-		def testDefinitionClassNames: Iterable[String] = testFrameworks.map(_.testSuperClassName)
+		def testDefinitionClassNames: Seq[String] = testClassNames(testFrameworks)
 		def javaOptions = javaOptionsAsString(testJavaCompileOptions)
 	}
 
diff --git a/src/main/scala/sbt/IntegrationTesting.scala b/src/main/scala/sbt/IntegrationTesting.scala
index 2b7f3a283..f31797747 100644
--- a/src/main/scala/sbt/IntegrationTesting.scala
+++ b/src/main/scala/sbt/IntegrationTesting.scala
@@ -15,7 +15,7 @@ trait IntegrationTesting extends NotNull
 trait ScalaIntegrationTesting extends IntegrationTesting
 { self: ScalaProject =>
 
-	protected def integrationTestTask(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) =
+	protected def integrationTestTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) =
 		testTask(frameworks, classpath, analysis, options)
 }
 
@@ -83,7 +83,7 @@ trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTe
 		def analysisPath = integrationTestAnalysisPath
 		def baseCompileOptions = integrationTestCompileOptions
 		def javaOptions = javaOptionsAsString(javaCompileOptions)
-		def testDefinitionClassNames = integrationTestFrameworks.map(_.testSuperClassName)
+		def testDefinitionClassNames = testClassNames(integrationTestFrameworks)
 	}
 }
 
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index 78e2ad979..b4d9de0d3 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -24,6 +24,7 @@ abstract class Logger extends xsbt.CompileLogger with xsbt.IvyLogger
 	def setLevel(newLevel: Level.Value)
 	def enableTrace(flag: Boolean)
 	def traceEnabled: Boolean
+	def ansiCodesSupported = false
 
 	def atLevel(level: Level.Value) = level.id >= getLevel.id
 	def trace(t: => Throwable): Unit
@@ -73,6 +74,7 @@ abstract class BasicLogger extends Logger
 
 final class SynchronizedLogger(delegate: Logger) extends Logger
 {
+	override lazy val ansiCodesSupported = delegate.ansiCodesSupported
 	def getLevel = { synchronized { delegate.getLevel } }
 	def setLevel(newLevel: Level.Value) { synchronized { delegate.setLevel(newLevel) } }
 	def enableTrace(enabled: Boolean) { synchronized { delegate.enableTrace(enabled) } }
@@ -87,6 +89,7 @@ final class SynchronizedLogger(delegate: Logger) extends Logger
 
 final class MultiLogger(delegates: List[Logger]) extends BasicLogger
 {
+	override lazy val ansiCodesSupported = delegates.forall(_.ansiCodesSupported)
 	override def setLevel(newLevel: Level.Value)
 	{
 		super.setLevel(newLevel)
@@ -110,6 +113,7 @@ final class MultiLogger(delegates: List[Logger]) extends BasicLogger
 * */
 final class FilterLogger(delegate: Logger) extends BasicLogger
 {
+	override lazy val ansiCodesSupported = delegate.ansiCodesSupported
 	def trace(t: => Throwable)
 	{
 		if(traceEnabled)
@@ -146,6 +150,7 @@ final class FilterLogger(delegate: Logger) extends BasicLogger
 * */
 final class BufferedLogger(delegate: Logger) extends Logger
 {
+	override lazy val ansiCodesSupported = delegate.ansiCodesSupported
 	private[this] val buffers = wrap.Wrappers.weakMap[Thread, Buffer[LogEvent]]
 	private[this] var recordingAll = false
 
@@ -271,7 +276,7 @@ object ConsoleLogger
 * This logger is not thread-safe.*/
 class ConsoleLogger extends BasicLogger
 {
-	import ConsoleLogger.formatEnabled
+	override def ansiCodesSupported = ConsoleLogger.formatEnabled
 	def messageColor(level: Level.Value) = Console.RESET
 	def labelColor(level: Level.Value) =
 		level match
@@ -300,7 +305,7 @@ class ConsoleLogger extends BasicLogger
 	}
 	private def setColor(color: String)
 	{
-		if(formatEnabled)
+		if(ansiCodesSupported)
 			System.out.synchronized { System.out.print(color) }
 	}
 	private def log(labelColor: String, label: String, messageColor: String, message: String): Unit =
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index d03847568..dee6d3215 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -149,9 +149,9 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	def copyTask(sources: PathFinder, destinationDirectory: Path): Task =
 		task { FileUtilities.copy(sources.get, destinationDirectory, log).left.toOption }
 
-	def testTask(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: TestOption*): Task =
+	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: TestOption*): Task =
 		testTask(frameworks, classpath, analysis, options)
-	def testTask(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]): Task =
+	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]): Task =
 	{
 		def work =
 		{
@@ -249,7 +249,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		}
 	}
 	protected def incrementImpl(v: BasicVersion): Version = v.incrementMicro
-	protected def testTasks(frameworks: Iterable[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) = {
+	protected def testTasks(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) = {
 		import scala.collection.mutable.HashSet
 
 			val testFilters = new ListBuffer[String => Boolean]
@@ -267,7 +267,6 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 					case TestSetup(setupFunction) => setup += setupFunction
 					case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
 				}
-				() // 2.8.0-SNAPSHOT bug in type inference
 			}
 
 			if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))
@@ -277,7 +276,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			}
 			def includeTest(test: TestDefinition) = !excludeTestsSet.contains(test.testClassName) && testFilters.forall(filter => filter(test.testClassName))
 			val tests = HashSet.empty[TestDefinition] ++ analysis.allTests.filter(includeTest)
-			TestFramework.testTasks(frameworks, classpath.get, tests, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly)
+			TestFramework.testTasks(frameworks, classpath.get, tests.toSeq, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly)
 	}
 	private def flatten[T](i: Iterable[Iterable[T]]) = i.flatMap(x => x)
 
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index e5bbf1bb3..d1ba04985 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -3,62 +3,63 @@
  */
 package sbt
 
+	import java.net.URLClassLoader
+	import org.scalatools.testing.{TestFingerprint => Fingerprint, Framework, Runner, Logger=>TLogger}
+
 object Result extends Enumeration
 {
 	val Error, Passed, Failed = Value
 }
-object ClassType extends Enumeration
-{
-	val Module, Class = Value
-}
 
-trait TestFramework extends NotNull
+object TestFrameworks
 {
-	def name: String
-	def testSuperClassName: String
-	def testSubClassType: ClassType.Value
-	
-	def testRunner(classLoader: ClassLoader, listeners: Iterable[TestReportListener], log: Logger): TestRunner
+	val ScalaCheck = new TestFramework("org.scalacheck.FrameworkImpl")
+	val ScalaTest = new TestFramework("org.scalatest.FrameworkImpl")
+	val Specs = new TestFramework("org.specs.FrameworkImpl")
 }
-trait TestRunner extends NotNull
+class TestFramework(val implClassName: String) extends NotNull
 {
-	def run(testClassName: String): Result.Value
+	def create(loader: ClassLoader): Framework =
+		Class.forName(implClassName, true, loader).newInstance.asInstanceOf[Framework]
 }
-
-abstract class BasicTestRunner extends TestRunner
+final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq[TestReportListener], log: Logger) extends NotNull
 {
-	protected def log: Logger
-	protected def listeners: Seq[TestReportListener]
-
-	final def run(testClass: String): Result.Value =
+	private[this] val delegate = framework.testRunner(loader, listeners.flatMap(_.contentLogger).toArray)
+	final def run(testDefinition: TestDefinition, args: Seq[String]): Result.Value =
 	{
+		val testClass = testDefinition.testClassName
+		def runTest() =
+		{
+			val results = delegate.run(testClass, testDefinition, args.toArray)
+			val event = TestEvent(results)
+			safeListenersCall(_.testEvent( event ))
+			event.result
+		}
+
 		safeListenersCall(_.startGroup(testClass))
 		try
 		{
-			val result = runTest(testClass)
+			val result = runTest().getOrElse(Result.Passed)
 			safeListenersCall(_.endGroup(testClass, result))
 			result
 		}
 		catch
 		{
 			case e =>
-			{
 				safeListenersCall(_.endGroup(testClass, e))
 				Result.Error
-			}
 		}
 	}
-	def runTest(testClass: String): Result.Value
 
-	protected def fire(event: TestEvent) = safeListenersCall(_.testEvent(event))
-	protected def safeListenersCall(call: (TestReportListener) => Unit) = TestFramework.safeForeach(listeners, log)(call)
+	protected def safeListenersCall(call: (TestReportListener) => Unit): Unit =
+		TestFramework.safeForeach(listeners, log)(call)
 }
 
 final class NamedTestTask(val name: String, action: => Option[String]) extends NotNull { def run() = action }
 object TestFramework
 {
-	def runTests(frameworks: Iterable[TestFramework], classpath: Iterable[Path], tests: Iterable[TestDefinition], log: Logger,
-		listeners: Iterable[TestReportListener]) =
+	def runTests(frameworks: Seq[TestFramework], classpath: Iterable[Path], tests: Seq[TestDefinition], log: Logger,
+		listeners: Seq[TestReportListener]) =
 	{
 		val (start, runTests, end) = testTasks(frameworks, classpath, tests, log, listeners, true, Nil, Nil)
 		def run(tasks: Iterable[NamedTestTask]) = tasks.foreach(_.run())
@@ -72,49 +73,55 @@ object TestFramework
 	private val TestStartName = "test-start"
 	private val TestFinishName = "test-finish"
 	
-	private[sbt] def safeForeach[T](it: Iterable[T], log: Logger)(f: T => Unit): Unit = it.foreach(i => Control.trapAndLog(log){ f(i) } )
-	import scala.collection.{Map, Set}
-	def testTasks(frameworks: Iterable[TestFramework], classpath: Iterable[Path], tests: Iterable[TestDefinition], log: Logger,
-		listeners: Iterable[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
+	private[sbt] def safeForeach[T](it: Iterable[T], log: Logger)(f: T => Unit): Unit =
+		it.foreach(i => Control.trapAndLog(log){ f(i) } )
+
+		import scala.collection.{Map, Set}
+	
+	def testTasks(frameworks: Seq[TestFramework], classpath: Iterable[Path], tests: Seq[TestDefinition], log: Logger,
+		listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
 		cleanup: Iterable[() => Option[String]]): (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
 	{
-		val mappedTests = testMap(frameworks, tests)
+		val loader = createTestLoader(classpath)
+		val rawFrameworks = frameworks.map(_.create(loader))
+		val mappedTests = testMap(rawFrameworks, tests)
 		if(mappedTests.isEmpty)
 			(new NamedTestTask(TestStartName, None) :: Nil, Nil, new NamedTestTask(TestFinishName, { log.info("No tests to run."); None }) :: Nil )
 		else
-			createTestTasks(classpath, mappedTests, log, listeners, endErrorsEnabled, setup, cleanup)
+			createTestTasks(loader, mappedTests, log, listeners, endErrorsEnabled, setup, cleanup)
 	}
-	private def testMap(frameworks: Iterable[TestFramework], tests: Iterable[TestDefinition]): Map[TestFramework, Set[String]] =
+	private def testMap(frameworks: Seq[Framework], tests: Seq[TestDefinition]): Map[Framework, Set[TestDefinition]] =
 	{
 		import scala.collection.mutable.{HashMap, HashSet, Set}
-		val map = new HashMap[TestFramework, Set[String]]
-		if(!frameworks.isEmpty)
+		val map = new HashMap[Framework, Set[TestDefinition]]
+		def assignTests(): Unit =
 		{
-			for(test <- tests)
+			for(test <- tests if !map.values.exists(_.contains(test)))
 			{
-				def isTestForFramework(framework: TestFramework) =
-					(framework.testSubClassType == ClassType.Module) == test.isModule &&
-					framework.testSuperClassName == test.superClassName
+				def isTestForFramework(framework: Framework) = framework.tests.exists(matches)
+				def matches(fingerprint: Fingerprint) =
+					(fingerprint.isModule == test.isModule) &&
+					fingerprint.superClassName == test.superClassName
 				
 				for(framework <- frameworks.find(isTestForFramework))
-					map.getOrElseUpdate(framework, new HashSet[String]) += test.testClassName
+					map.getOrElseUpdate(framework, new HashSet[TestDefinition]) += test
 			}
 		}
+		if(!frameworks.isEmpty)
+			assignTests()
 		wrap.Wrappers.readOnly(map)
 	}
 	private def createTasks(work: Iterable[() => Option[String]], baseName: String) =
 		work.toList.zipWithIndex.map{ case (work, index) => new NamedTestTask(baseName + " " + (index+1), work()) }
 		
-	private def createTestTasks(classpath: Iterable[Path], tests: Map[TestFramework, Set[String]], log: Logger,
-		listeners: Iterable[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
+	private def createTestTasks(loader: ClassLoader, tests: Map[Framework, Set[TestDefinition]], log: Logger,
+		listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
 		cleanup: Iterable[() => Option[String]]) =
 	{
-		val filterCompilerLoader = new FilteredLoader(getClass.getClassLoader, ScalaCompilerJarPackages)
-		val loader: ClassLoader = new IntermediateLoader(classpath.map(_.asURL).toSeq.toArray, filterCompilerLoader)
 		val testsListeners = listeners.filter(_.isInstanceOf[TestsListener]).map(_.asInstanceOf[TestsListener])
 		def foreachListenerSafe(f: TestsListener => Unit): Unit = safeForeach(testsListeners, log)(f)
 		
-		import Result.{Error,Passed,Failed}
+			import Result.{Error,Passed,Failed}
 		object result
 		{
 			private[this] var value: Result.Value = Passed
@@ -123,17 +130,17 @@ object TestFramework
 		}
 		val startTask = new NamedTestTask(TestStartName, {foreachListenerSafe(_.doInit); None}) :: createTasks(setup, "Test setup")
 		val testTasks =
-			tests flatMap { case (framework, testClassNames) =>
+			tests flatMap { case (framework, testDefinitions) =>
 			
-					val runner = framework.testRunner(loader, listeners, log)
-					for(testClassName <- testClassNames) yield
+					val runner = new TestRunner(framework, loader, listeners, log)
+					for(testDefinition <- testDefinitions) yield
 					{
 						def runTest() =
 						{
 							val oldLoader = Thread.currentThread.getContextClassLoader
 							Thread.currentThread.setContextClassLoader(loader)
 							try {
-								runner.run(testClassName) match
+								runner.run(testDefinition, Nil) match
 								{
 									case Error => result() = Error; Some("ERROR occurred during testing.")
 									case Failed => result() = Failed; Some("Test FAILED")
@@ -144,7 +151,7 @@ object TestFramework
 								Thread.currentThread.setContextClassLoader(oldLoader)
 							}
 						}
-						new NamedTestTask(testClassName, runTest())
+						new NamedTestTask(testDefinition.testClassName, runTest())
 					}
 			}
 		def end() =
@@ -165,67 +172,9 @@ object TestFramework
 		val endTask = new NamedTestTask(TestFinishName, end() ) :: createTasks(cleanup, "Test cleanup")
 		(startTask, testTasks, endTask)
 	}
-}
-
-abstract class LazyTestFramework extends TestFramework
-{
-	/** The class name of the the test runner that executes
-	* tests for this framework.*/
-	protected def testRunnerClassName: String
-	
-	protected def bundledTestRunnerClassName: Option[String] = None
-	
-	/** Creates an instance of the runner given by 'testRunnerClassName'.*/
-	final def testRunner(projectLoader: ClassLoader, listeners: Iterable[TestReportListener], log: Logger): TestRunner =
+	private def createTestLoader(classpath: Iterable[Path]): ClassLoader = 
 	{
-		val frameworkClasspath = FileUtilities.classLocation(getClass)
-		val sbtURL = FileUtilities.sbtJar.toURI.toURL
-		val projectClasspath = projectLoader.asInstanceOf[java.net.URLClassLoader].getURLs
-		val loaderURLs = Array(frameworkClasspath, sbtURL) ++ projectClasspath
-		
-		def load(name: String): Option[Class[_]] =
-		{
-			val lazyLoader = new LazyFrameworkLoader(name, loaderURLs, projectLoader, getClass.getClassLoader)
-			try { Some(Class.forName(name, true, lazyLoader)) }
-			catch { case e: ClassNotFoundException => None }
-		}
-		val c = bundledTestRunnerClassName.flatMap(load).orElse(load(testRunnerClassName))
-		val runnerClass = c.getOrElse(error("Could not find test runner")).asSubclass(classOf[TestRunner])
-		runnerClass.getConstructor(classOf[Logger], classOf[Seq[TestReportListener]], classOf[ClassLoader]).newInstance(log, listeners, projectLoader)
+		val filterCompilerLoader = new FilteredLoader(getClass.getClassLoader, ScalaCompilerJarPackages)
+		new URLClassLoader(classpath.map(_.asURL).toSeq.toArray, filterCompilerLoader)
 	}
 }
-
-/** The test framework definition for ScalaTest.*/
-object ScalaTestFramework extends LazyTestFramework
-{
-	val name = "ScalaTest"
-	val SuiteClassName = "org.scalatest.Suite"
-	
-	def testSuperClassName = SuiteClassName
-	def testSubClassType = ClassType.Class
-	
-	def testRunnerClassName = "sbt.impl.ScalaTestRunner"
-	override def bundledTestRunnerClassName = Some("org.scalatest.sbt.ScalaTestRunner")
-}
-/** The test framework definition for ScalaCheck.*/
-object ScalaCheckFramework extends LazyTestFramework
-{
-	val name = "ScalaCheck"
-	val PropertiesClassName = "org.scalacheck.Properties"
-	
-	def testSuperClassName = PropertiesClassName
-	def testSubClassType = ClassType.Module
-	
-	def testRunnerClassName = "sbt.impl.ScalaCheckRunner"
-}
-/** The test framework definition for specs.*/
-object SpecsFramework extends LazyTestFramework
-{
-	val name = "specs"
-	val SpecificationClassName = "org.specs.Specification"
-	
-	def testSuperClassName = SpecificationClassName
-	def testSubClassType = ClassType.Module
-	
-	def testRunnerClassName = "sbt.impl.SpecsRunner"
-}
\ No newline at end of file
diff --git a/src/main/scala/sbt/TestReportListener.scala b/src/main/scala/sbt/TestReportListener.scala
index e60be1ddc..701f83563 100644
--- a/src/main/scala/sbt/TestReportListener.scala
+++ b/src/main/scala/sbt/TestReportListener.scala
@@ -4,6 +4,8 @@
 
 package sbt
 
+	import org.scalatools.testing.{Logger => TLogger, Event => TEvent, Result => TResult}
+
 trait TestReportListener
 {
 	/** called for each class or equivalent grouping */
@@ -14,6 +16,8 @@ trait TestReportListener
   def endGroup(name: String, t: Throwable)
 	/** called if test completed */
   def endGroup(name: String, result: Result.Value)
+  /** Used by the test framework for logging test results*/
+  def contentLogger: Option[TLogger] = None
 }
 
 trait TestsListener extends TestReportListener
@@ -24,317 +28,82 @@ trait TestsListener extends TestReportListener
   def doComplete(finalResult: Result.Value)
 }
 
-abstract class WriterReportListener(val log: Logger) extends TestsListener
-{
-	import java.io.{IOException, PrintWriter, Writer}
-	import scala.collection.mutable.{Buffer, ListBuffer}
-
-	protected case class Summary(count: Int, failures: Int, errors: Int, skipped: Int, message: Option[String], cause: Option[Throwable]) extends NotNull
-	private var out: Option[PrintWriter] = None
-	private var groupCount: Int = 0
-	private var groupFailures: Int = 0
-	private var groupErrors: Int = 0
-	private var groupSkipped: Int = 0
-	private var groupMessages: Seq[String] = Nil
-
-	protected val passedEventHandler: TestEvent => Summary = (event: TestEvent) => event match
-		{
-			case SpecificationReportEvent(successes, failures, errors, skipped, desc, systems, subSpecs) => Summary(successes, failures, errors, skipped, None, None)
-			case IgnoredEvent(name, Some(message)) => Summary(1, 0, 0, 1, Some(message), None)
-			case IgnoredEvent(name, None) => Summary(1, 0, 0, 1, None, None)
-			case _ => Summary(1, 0, 0, 0, None, None)
-		}
-	protected val failedEventHandler: TestEvent => Summary = (event: TestEvent) => event match
-		{
-			case FailedEvent(name, msg) => Summary(1, 1, 0, 0, Some("! " + name + ": " + msg), None)
-			case TypedErrorEvent(name, event, Some(msg), cause) => Summary(1, 1, 0, 0, Some(event + " - " + name + ": " + msg), cause)
-			case TypedErrorEvent(name, event, None, cause) => Summary(1, 1, 0, 0, Some(event + " - " + name), cause)
-			case ErrorEvent(msg) => Summary(1, 1, 0, 0, Some(msg), None)
-			case SpecificationReportEvent(successes, failures, errors, skipped, desc, systems, subSpecs) => Summary(successes + failures + errors + skipped, failures, errors, skipped, Some(desc), None)
-			case _ => {log.warn("Unrecognized failure: " + event); Summary(1, 1, 0, 0, None, None)}
-		}
-	protected val errorEventHandler: TestEvent => Summary = (event: TestEvent) => event match
-		{
-			case FailedEvent(name, msg) => Summary(1, 0, 1, 0, Some("! " + name + ": " + msg), None)
-			case TypedErrorEvent(name, event, Some(msg), cause) => Summary(1, 0, 1, 0, Some(event + " - " + name + ": " + msg), cause)
-			case TypedErrorEvent(name, event, None, cause) => Summary(1, 0, 1, 0, Some(event + " - " + name), cause)
-			case ErrorEvent(msg) => Summary(1, 0, 1, 0, Some(msg), None)
-			case SpecificationReportEvent(successes, failures, errors, skipped, desc, systems, subSpecs) => Summary(successes + failures + errors + skipped, failures, errors, skipped, Some(desc), None)
-			case _ => {log.warn("Unrecognized error: " + event); Summary(1, 0, 1, 0, None, None)}
-		}
-	protected def open: Writer
-	protected def close =
-	{
-		onOut(_.close())
-		out = None
-	}
-	def doInit = Control.trapAndLog(log){ out = Some(new PrintWriter(open)) }
-	def doComplete(finalResult: Result.Value) =
-	{
-		finalResult match
-		{
-			case Result.Error => println("Error during Tests")
-			case Result.Passed => println("All Tests Passed")
-			case Result.Failed => println("Tests Failed")
-		}
-		close
-	}
-	def doComplete(t: Throwable) =
-	{
-		println("Exception in Test Framework")
-		onOut(t.printStackTrace(_))
-		close
-	}
-	def startGroup(name: String) =
-	{
-		groupCount = 0
-		groupFailures = 0
-		groupErrors = 0
-		groupSkipped = 0
-		groupMessages = Nil
-	}
-	def testEvent(event: TestEvent) = event.result match
-		{
-			case Some(result) =>
-			{
-				val Summary(count, failures, errors, skipped, msg, cause) = result match
-				{
-					case Result.Passed => passedEventHandler(event)
-					case Result.Failed => failedEventHandler(event)
-					case Result.Error => errorEventHandler(event)
-				}
-				groupCount += count
-				groupFailures += failures
-				groupErrors += errors
-				groupSkipped += skipped
-				groupMessages ++= msg.toList
-			}
-			case None => {}
-		}
-	def endGroup(name: String, t: Throwable) =
-	{
-		groupMessages = Nil
-		println("Exception in " + name)
-		onOut(t.printStackTrace(_))
-	}
-	def endGroup(name: String, result: Result.Value) =
-	{
-		result match
-		{
-			case Result.Error => println("Error: " + name + " - Count " + groupCount + ", Failed " + groupFailures + ", Errors " + groupErrors)
-			case Result.Passed => println("Passed: " + name + " - Count " + groupCount + ", Failed " + groupFailures + ", Errors " + groupErrors)
-			case Result.Failed => println("Failed: " + name + " - Count " + groupCount + ", Failed " + groupFailures + ", Errors " + groupErrors)
-		}
-		if(!groupMessages.isEmpty)
-		{
-			groupMessages.foreach(println(_))
-			groupMessages = Nil
-			println("")
-		}
-	}
-	protected def onOut(f: PrintWriter => Unit) = Control.trapAndLog(log){
-			out match
-			{
-				case Some(pw) => f(pw)
-				case None => log.warn("Method called when output was not open")
-			}
-		}
-	protected def println(s: String) = onOut(_.println(s))
-}
-
-class FileReportListener(val file: Path, log: Logger) extends WriterReportListener(log)
-{
-	def open = new java.io.FileWriter(file.asFile)
-}
-
 abstract class TestEvent extends NotNull
 {
 	def result: Option[Result.Value]
+	def detail: Seq[TEvent] = Nil
 }
-
-sealed abstract class ScalaCheckEvent extends TestEvent
-final case class PassedEvent(name: String, msg: String) extends ScalaCheckEvent { def result = Some(Result.Passed) }
-final case class FailedEvent(name: String, msg: String) extends ScalaCheckEvent { def result = Some(Result.Failed) }
-
-sealed abstract class ScalaTestEvent(val result: Option[Result.Value]) extends TestEvent
-final case class TypedEvent(name: String, `type`: String, msg: Option[String])(result: Option[Result.Value]) extends ScalaTestEvent(result)
-final case class TypedErrorEvent(name: String, `type`: String, msg: Option[String], cause: Option[Throwable])(result: Option[Result.Value]) extends ScalaTestEvent(result)
-final case class MessageEvent(msg: String) extends ScalaTestEvent(None)
-final case class ErrorEvent(msg: String) extends ScalaTestEvent(None)
-final case class IgnoredEvent(name: String, msg: Option[String]) extends ScalaTestEvent(Some(Result.Passed))
-
-sealed abstract class SpecsEvent extends TestEvent
-final case class SpecificationReportEvent(successes: Int, failures: Int, errors: Int, skipped: Int, pretty: String, systems: Seq[SystemReportEvent], subSpecs: Seq[SpecificationReportEvent]) extends SpecsEvent
+object TestEvent
 {
-	def result = if(errors > 0) Some(Result.Error) else if(failures > 0) Some(Result.Failed) else Some(Result.Passed)
-}
-final case class SystemReportEvent(description: String, verb: String, skipped: Seq[Throwable], literateDescription: Option[Seq[String]], examples: Seq[ExampleReportEvent]) extends SpecsEvent { def result = None }
-final case class ExampleReportEvent(description: String, errors: Seq[Throwable], failures: Seq[RuntimeException], skipped: Seq[RuntimeException], subExamples: Seq[ExampleReportEvent]) extends SpecsEvent { def result = None }
-
-trait EventOutput[E <: TestEvent]
-{
-	def output(e: E): Unit
-}
-
-sealed abstract class LazyEventOutput[E <: TestEvent](val log: Logger) extends EventOutput[E]
-
-class ScalaCheckOutput(log: Logger) extends LazyEventOutput[ScalaCheckEvent](log)
-{
-	def output(event: ScalaCheckEvent) = event match
-		{
-			case PassedEvent(name, msg) => log.info("+ " + name + ": " + msg)
-			case FailedEvent(name, msg) => log.error("! " + name + ": " + msg)
+	def apply(events: Seq[TEvent]): TestEvent =
+	{
+		val overallResult = (Result.Passed /: events) { (sum, event) =>
+			val result = event.result
+			if(sum == Result.Error || result == TResult.Error) Result.Error
+			else if(sum == Result.Failed || result == TResult.Failure) Result.Failed
+			else Result.Passed
 		}
-}
-
-class ScalaTestOutput(log: Logger) extends LazyEventOutput[ScalaTestEvent](log)
-{
-	def output(event: ScalaTestEvent) = event match
-		{
-			case TypedEvent(name, event, Some(msg)) => log.info(event + " - " + name + ": " + msg)
-			case TypedEvent(name, event, None) => log.info(event + " - " + name)
-			case TypedErrorEvent(name, event, Some(msg), cause) => logError(event + " - " + name + ": " + msg, cause)
-			case TypedErrorEvent(name, event, None, cause) => logError(event + " - " + name, cause)
-			case MessageEvent(msg) => log.info(msg)
-			case ErrorEvent(msg) => logError(msg, None)
-			case IgnoredEvent(name, Some(msg)) => log.info("Test ignored - " + name + ": " + msg)
-			case IgnoredEvent(name, None) => log.info("Test ignored - " + name)
-		}
-	private def logError(message: String, cause: Option[Throwable])
-	{
-		cause.foreach(x => log.trace(x))
-		log.error(message)
-	}
-}
-
-class SpecsOutput(val log: Logger) extends EventOutput[SpecsEvent]
-{
-		private val Indent = "  "
-
-	def output(event: SpecsEvent) = event match
-		{
-			case sre: SpecificationReportEvent => reportSpecification(sre, "")
-			case sre: SystemReportEvent => reportSystem(sre, "")
-			case ere: ExampleReportEvent => reportExample(ere, "")
-		}
-
-	/* The following is closely based on org.specs.runner.OutputReporter,
-	* part of specs, which is Copyright 2007-2008 Eric Torreborre.
-	* */
-
-	private def reportSpecification(specification: SpecificationReportEvent, padding: String)
-	{
-		val newIndent = padding + Indent
-		reportSpecifications(specification.subSpecs, newIndent)
-		reportSystems(specification.systems, newIndent)
-	}
-	private def reportSpecifications(specifications: Iterable[SpecificationReportEvent], padding: String)
-	{
-		for(specification <- specifications)
-			reportSpecification(specification, padding)
-	}
-	private def reportSystems(systems: Iterable[SystemReportEvent], padding: String)
-	{
-		for(system <- systems)
-			reportSystem(system, padding)
-	}
-	private def reportSystem(sus: SystemReportEvent, padding: String)
-	{
-		val skipped = if(sus.skipped.isEmpty) "" else sus.skipped.map(_.getMessage).mkString(" (skipped: ", ", ", ")")
-		log.info(padding + sus.description + " " + sus.verb + skipped)
-		for(description <- sus.literateDescription)
-			log.info(padding + description.mkString)
-		reportExamples(sus.examples, padding)
-		log.info(" ")
-	}
-	private def reportExamples(examples: Iterable[ExampleReportEvent], padding: String)
-	{
-		for(example <- examples)
-		{
-			reportExample(example, padding)
-			reportExamples(example.subExamples, padding + Indent)
-		}
-	}
-	private def status(example: ExampleReportEvent) =
-	{
-		if (example.errors.size + example.failures.size > 0)
-			"x "
-		else if (example.skipped.size > 0)
-			"o "
-		else
-			"+ "
-	}
-	private def reportExample(example: ExampleReportEvent, padding: String)
-	{
-		log.info(padding + status(example) + example.description)
-		for(skip <- example.skipped)
-		{
-			log.trace(skip)
-			log.warn(padding + skip.toString)
-		}
-		for(e <- example.failures ++ example.errors)
-		{
-			log.trace(e)
-			log.error(padding + e.toString)
+		new TestEvent {
+			val result = Some(overallResult)
+			override val detail = events
 		}
 	}
 }
 
-class LogTestReportListener(val log: Logger) extends TestsListener
+object TestLogger
 {
-	lazy val scalaCheckOutput: EventOutput[ScalaCheckEvent] = createScalaCheckOutput
-	lazy val scalaTestOutput: EventOutput[ScalaTestEvent] = createScalaTestOutput
-	lazy val specsOutput: EventOutput[SpecsEvent] = createSpecsOutput
-
-	protected def createScalaCheckOutput = new ScalaCheckOutput(log)
-	protected def createScalaTestOutput = new ScalaTestOutput(log)
-	protected def createSpecsOutput = new SpecsOutput(log)
+	def apply(logger: sbt.Logger): TestLogger = new TestLogger(wrap(logger))
+	def wrap(logger: sbt.Logger): TLogger =
+		new TLogger
+		{
+			def error(s: String) = log(Level.Error, s)
+			def warn(s: String) = log(Level.Warn, s)
+			def info(s: String) = log(Level.Info, s)
+			def debug(s: String) = log(Level.Debug, s)
+			private def log(level: Level.Value, s: String) = logger.log(level, s)
+			def ansiCodesSupported() = logger.ansiCodesSupported
+		}
+}
+class TestLogger(val log: TLogger) extends TestsListener
+{
+	protected var skipped, errors, passed, failures = 0
 	
 	def startGroup(name: String) {}
-	def testEvent(event: TestEvent)
-	{
-		log.debug("in testEvent:" + event)
-		count(event)
-		event match
-		{
-			case sce: ScalaCheckEvent => scalaCheckOutput.output(sce)
-			case ste: ScalaTestEvent => scalaTestOutput.output(ste)
-			case se: SpecsEvent => specsOutput.output(se)
-			case e => handleOtherTestEvent(e)
-		}
-	}
-	protected def handleOtherTestEvent(event: TestEvent) {}
+	def testEvent(event: TestEvent): Unit = event.detail.foreach(count)
 	def endGroup(name: String, t: Throwable)
 	{
 		log.error("Could not run test " + name + ": " + t.toString)
-		log.trace(t)
+		//log.trace(t)
 	}
-	def endGroup(name: String, result: Result.Value)
+	def endGroup(name: String, result: Result.Value) {}
+	protected def count(event: TEvent): Unit =
 	{
-		log.debug("in endGroup:" + result)
-	}
-	protected def count(event: TestEvent): Unit =
-	{
-		for(result <- event.result)
+		event.result match
 		{
-			totalTests += 1
-			result match
-			{
-				case Result.Error => errors += 1
-				case Result.Failed => failed += 1
-				case Result.Passed => passed += 1
-			}
+			case TResult.Error => errors +=1
+			case TResult.Success => passed +=1 
+			case TResult.Failure => failures +=1 
+			case TResult.Skipped => skipped += 1
 		}
 	}
-	protected var totalTests, errors, passed, failed = 0
 	def doInit
 	{
-		totalTests = 0
+		failures = 0
 		errors = 0
 		passed = 0
-		failed = 0
+		skipped = 0
 	}
 		/** called once, at end. */
 	def doComplete(finalResult: Result.Value): Unit =
-		log.info(<x>Run: {totalTests.toString}, Passed: {passed.toString}, Errors: {errors.toString}, Failed: {failed.toString}</x>.text)
+	{
+		val totalCount = failures + errors + skipped + passed
+		val postfix = ": Total " + totalCount + ", Failed " + failures + ", Errors " + errors + ", Passed " + passed + ", Skipped " + skipped
+		finalResult match
+		{
+			case Result.Error => log.error("Error" + postfix)
+			case Result.Passed => log.info("Passed: " + postfix)
+			case Result.Failed => log.error("Failed: " + postfix)
+		}
+	}
+	override def contentLogger: Option[TLogger] = Some(log)
 }
diff --git a/src/main/scala/sbt/impl/TestFrameworkImpl.scala b/src/main/scala/sbt/impl/TestFrameworkImpl.scala
deleted file mode 100755
index 06aa19699..000000000
--- a/src/main/scala/sbt/impl/TestFrameworkImpl.scala
+++ /dev/null
@@ -1,222 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009  Steven Blundy, Mark Harrah
- */
-
-package sbt.impl
-
-import scala.xml.{Elem, Group}
-
-/* The following classes run tests for their associated test framework.
-* NOTE #1: DO NOT actively use these classes.  Only specify their names to LazyTestFramework
-*  for reflective loading.  This allows using the test libraries provided on the
-*  project classpath instead of requiring global versions.
-* NOTE #2: Keep all active uses of these test frameworks inside these classes so that sbt
-*  runs without error when a framework is not available at runtime and no tests for that
-*  framework are defined.*/
-
-/** The test runner for ScalaCheck tests. */
-private[sbt] class ScalaCheckRunner(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
-{
-	import org.scalacheck.{Pretty, Properties, Test}
-	def runTest(testClassName: String): Result.Value =
-	{
-		val test = ModuleUtilities.getObject(testClassName, testLoader).asInstanceOf[Properties]
-		if(Test.checkProperties(test, Test.defaultParams, propReport, testReport).find(!_._2.passed).isEmpty)
-			Result.Passed
-		else
-			Result.Failed
-	}
-	private def propReport(pName: String, s: Int, d: Int) {}
-	private def testReport(pName: String, res: Test.Result) =
-	{
-		if(res.passed)
-			fire(PassedEvent(pName, pretty(res)))
-		else
-			fire(FailedEvent(pName, pretty(res)))
-	}
-	private def pretty(res: Test.Result): String =
-	{
-		try { pretty1_5(res) }
-		catch { case e: NoSuchMethodError => pretty1_6(res) }
-	}
-	private def pretty1_5(res: Test.Result): String = Pretty.pretty(res)
-	private def pretty1_6(res: Test.Result): String =
-	{
-		// the following is equivalent to: (Pretty.prettyTestRes(res))(Pretty.defaultParams)
-		// and is necessary because of binary incompatibility in Pretty between ScalaCheck 1.5 and 1.6
-		val loader = getClass.getClassLoader
-		val prettyObj = ModuleUtilities.getObject("org.scalacheck.Pretty", loader)
-		val prettyInst = prettyObj.getClass.getMethod("prettyTestRes", classOf[Test.Result]).invoke(prettyObj, res)
-		val defaultParams = prettyObj.getClass.getMethod("defaultParams").invoke(prettyObj)
-		prettyInst.getClass.getMethod("apply", Class.forName("org.scalacheck.Pretty$Params", true, loader)).invoke(prettyInst, defaultParams).toString
-	}
-}
-/** The test runner for ScalaTest suites. */
-private[sbt] class ScalaTestRunner(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
-{
-	def runTest(testClassName: String): Result.Value =
-	{
-		import org.scalatest.{Stopper, Suite}
-		val testClass = Class.forName(testClassName, true, testLoader).asSubclass(classOf[Suite])
-		val test = testClass.newInstance
-		val reporter = new ScalaTestReporter
-		val stopper = new Stopper { override def stopRequested = false }
-		test.execute(None, reporter, stopper, Set.empty, Set("org.scalatest.Ignore"), Map.empty, None)
-		if(reporter.succeeded)
-			Result.Passed
-		else
-			Result.Failed
-	}
-
-	/** An implementation of Reporter for ScalaTest. */
-	private class ScalaTestReporter extends org.scalatest.Reporter with NotNull
-	{
-		import org.scalatest.Report
-		override def testIgnored(report: Report) =
-		{
-			if(report.message.trim.isEmpty) fire(IgnoredEvent(report.name, None))
-			else fire(IgnoredEvent(report.name, Some(report.message.trim)))
-		}
-		override def testStarting(report: Report) { info(report, "Test starting", None) }
-		override def testSucceeded(report: Report) { info(report, "Test succeeded", Some(Result.Passed)) }
-		override def testFailed(report: Report)
-		{
-			succeeded = false
-			error(report, "Test failed", Some(Result.Failed))
-		}
-
-		override def infoProvided(report : Report) { info(report, "", None) }
-
-		override def suiteStarting(report: Report) { info(report, "Suite starting", None) }
-		override def suiteCompleted(report: Report) { info(report, "Suite completed", None) }
-		override def suiteAborted(report: Report) { error(report, "Suite aborted", None) }
-
-		override def runStarting(testCount: Int) { fire(MessageEvent("Run starting")) }
-		override def runStopped()
-		{
-			succeeded = false
-			fire(ErrorEvent("Run stopped"))
-		}
-		override def runAborted(report: Report)
-		{
-			succeeded = false
-			error(report, "Run aborted", None)
-		}
-		override def runCompleted() { log.info("Run completed.") }
-
-		private def error(report: Report, event: String, result: Option[Result.Value]) { logReport(report, event, result, Level.Error) }
-		private def info(report: Report, event: String, result: Option[Result.Value]) { logReport(report, event, result, Level.Info) }
-		private def logReport(report: Report, event: String, result: Option[Result.Value], level: Level.Value)
-		{
-			level match
-			{
-				case Level.Error =>
-					if(report.message.trim.isEmpty)
-						fire(TypedErrorEvent(report.name, event, None, report.throwable)(result))
-					else
-						fire(TypedErrorEvent(report.name, event, Some(report.message.trim), report.throwable)(result))
-				case Level.Info =>
-					if(report.message.trim.isEmpty)
-						fire(TypedEvent(report.name, event, None)(result))
-					else
-						fire(TypedEvent(report.name, event, Some(report.message.trim))(result))
-				case l => log.warn("Level not expected:" + l)
-			}
-		}
-
-		var succeeded = true
-	}
-}
-/** The test runner for specs tests. */
-private[sbt] class SpecsRunner(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
-{
-	import org.specs.Specification
-	import org.specs.specification.{Example, Sus}
-
-	def runTest(testClassName: String): Result.Value =
-	{
-		val test = ModuleUtilities.getObject(testClassName, testLoader).asInstanceOf[Specification]
-		val event = reportSpecification(test)
-		fire(event)
-		if(test.isFailing)
-			Result.Failed
-		else
-			Result.Passed
-	}
-
-	/* The following is closely based on org.specs.runner.OutputReporter,
-	* part of specs, which is Copyright 2007-2008 Eric Torreborre.
-	* */
-
-	private def reportSpecification(spec: Specification): SpecificationReportEvent =
-	{
-		 // this is for binary compatibility between specs 1.4.x and 1.5.0: the ancestor of Specification containing these two methods changed
-		def reflectSeq[T](name: String) = classOf[Specification].getMethod(name).invoke(spec).asInstanceOf[Seq[T]]
-		val systems = reflectSeq[Sus]("systems")
-		val subSpecifications = reflectSeq[Specification]("subSpecifications")
-
-		return SpecificationReportEvent(spec.successes.size, spec.failures.size, spec.errors.size, spec.skipped.size, spec.pretty,
-			reportSystems(systems), reportSpecifications(subSpecifications))
-	}
-	private def reportSpecifications(specifications: Seq[Specification]): Seq[SpecificationReportEvent] =
-	{
-		for(specification <- specifications) yield
-			reportSpecification(specification)
-	}
-	private def reportSystems(systems: Seq[Sus]): Seq[SystemReportEvent] =
-	{
-		for(system <- systems) yield
-			reportSystem(system)
-	}
-	private def reportSystem(sus: Sus): SystemReportEvent =
-	{
-			// for source compatibility between specs 1.4.x and 1.5.0:
-			// in specs 1.5.0, description is LiterateDescription
-			// in specs < 1.5.0, description is Elem
-			// LiterateDescription.desc is a Node
-			// Elem.child is a Seq[Node]
-			// each has a map[T](f: Node => T): Seq[T] defined so we use reflection to call the right method
-
-			//description.child.map(_.text) // Elem equivalent
-			//description.desc.map(_.text)  // LiterateDescription
-		def formatDescription(a: AnyRef) =
-		{
-			val toMap = 
-				try { call(a, "desc") }
-				catch { case e: Exception => call(a, "child") }
-			val mapText = (a: AnyRef) => a.getClass.getMethod("text").invoke(a)
-			toMap.getClass.getMethod("map", Class.forName("scala.Function1")).invoke(toMap, mapText).asInstanceOf[Seq[String]]
-		}
-		def call(a: AnyRef, m: String) = a.getClass.getMethod(m).invoke(a)
-		def format: Option[Seq[String]] =
-		{
-			val litD = sus.literateDescription
-			if(litD.isEmpty) None else Some(formatDescription(litD.get))
-		}
-		// these are for 1.6 compatibility, which removed skippedSus (skipped still exists) and examples (moved to specification)
-		def skipped(sus: Sus) = classOf[Sus].getMethod("skipped").invoke(sus).asInstanceOf[Seq[Throwable]]
-		def examples(sus: Sus) =
-		{
-			try { sus.examples } // we compile against specs 1.4.x, which has examples directly on Sus  so this compiles
-			catch { case _: NoSuchMethodError =>  // It fails at runtime for specs 1.6 because examples is now on BaseSpecification
-				val spec = classOf[Sus].getMethod("specification").invoke(sus)
-				spec.getClass.getMethod("examples").invoke(spec).asInstanceOf[List[Example]]
-			}
-		}
-		SystemReportEvent(sus.description, sus.verb, skipped(sus), format, reportExamples(examples(sus)))
-	}
-	private def reportExamples(examples: Seq[Example]): Seq[ExampleReportEvent] =
-	{
-		for(example <- examples) yield
-			reportExample(example)
-	}
-	private def reportExample(example: Example): ExampleReportEvent =
-	{
-		def examples(example: Example) =
-			try { example.subExamples } // we compile against specs 1.4.x, which has subExamples defined on Example, so this compiles
-			catch { case _ : NoSuchMethodError =>  // It fails at runtime for specs 1.6 because examples is the new method
-				classOf[Example].getMethod("examples").invoke(example).asInstanceOf[Seq[Example]]
-			}
-		ExampleReportEvent(example.description, example.errors, example.failures, example.skipped, reportExamples(examples(example)))
-	}
-}
diff --git a/src/main/scala/sbt/impl/TestParser.scala b/src/main/scala/sbt/impl/TestParser.scala
index 69c7b5c72..d12bc9319 100644
--- a/src/main/scala/sbt/impl/TestParser.scala
+++ b/src/main/scala/sbt/impl/TestParser.scala
@@ -15,7 +15,7 @@ import scala.util.parsing.combinator._
 
 import TestParser._
 /** Represents a test implemented by 'testClassName' of type 'superClassName'.*/
-final case class TestDefinition(isModule: Boolean, testClassName: String, superClassName: String) extends NotNull
+final case class TestDefinition(isModule: Boolean, testClassName: String, superClassName: String) extends org.scalatools.testing.TestFingerprint with NotNull
 {
 	override def toString =
 		(if(isModule) IsModuleLiteral else "") + testClassName + SubSuperSeparator + superClassName

From ecea2f2ed6cbaba1a7636b3e3833cb51d0538d3c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 23 Oct 2009 08:10:52 -0400
Subject: [PATCH 151/268] Remove dependencies on test frameworks, fixes to make
 test interface work

---
 project/build/SbtProject.scala          | 35 +------------------------
 src/main/scala/sbt/DefaultProject.scala |  2 +-
 src/main/scala/sbt/TestFramework.scala  |  2 +-
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 4132e5e74..fa18be9c1 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -61,38 +61,5 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	override def libraryDependencies = super.libraryDependencies ++ getDependencies(scalaVersionString)
 
 	def getDependencies(scalaVersion: String) =
-		scalaVersion match
-		{
-			case Version2_7_2 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.3", /*Specs*/"1.4.0", false)
-			case Version2_7_3 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.4", /*Specs*/"1.4.3", true)
-			case Version2_7_4 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
-			case Version2_7_5 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
-			case Version2_7_6 => variableDependencies(false, scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
-			case Version2_8_0 => variableDependencies(true,  scalaVersion, /*ScalaTest*/"0.9.5", /*Specs*/"1.4.3", true)
-			case _ => error("Unsupported Scala version: " + scalaVersion)
-		}
-
-	/** Defines the dependencies for the given version of Scala, ScalaTest, and Specs.  If uniformTestOrg is true,
-	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name. */
-	private def variableDependencies(is28: Boolean, scalaVersion: String, scalaTestVersion: String, specsVersion: String, uniformTestOrg: Boolean) =
-	{
-		( if(is28) Nil else testDependencies(scalaTestVersion, specsVersion, uniformTestOrg)) ++
-			( if(is28) Seq("jline" % "jline" % "0.9.94" intransitive()) else Nil)
-	}
-	private def testDependencies(scalaTestVersion: String, specsVersion: String, uniformTestOrg: Boolean) =
-	{
-		testDependency("scalatest", scalaTestVersion, uniformTestOrg) ::
-		testDependency("specs", specsVersion, uniformTestOrg) ::
-		testDependency("scalacheck", "1.5", false) ::
-		Nil
-	}
-
-	/** Creates a dependency element for a test.  See 'testOrg' for a description of uniformTestOrg.*/
-
-	private def testDependency(name: String, version: String, uniformTestOrg: Boolean) =
-		testOrg(name, uniformTestOrg) % name % version % "optional" intransitive()
-
-	/** Returns the organization for the given test library.  If uniform is true,
-	* the 'org.scala-tools.testing' organization is used.  Otherwise, 'org.' is prefixed to the module name.*/
-	private def testOrg(name: String, uniform: Boolean) = if(uniform) "org.scala-tools.testing" else "org." + name
+		if(scalaVersion == Version2_8_0) Seq("jline" % "jline" % "0.9.94" intransitive()) else Nil
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 2ee7efedb..6b3b2057b 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -193,7 +193,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def compileOrder = BasicScalaProject.this.compileOrder
 		protected def testClassNames(frameworks: Seq[TestFramework]) = 
 		{
-			val loader = new URLClassLoader(classpath.get.map(_.asURL).toSeq.toArray)
+			val loader = new URLClassLoader(classpath.get.map(_.asURL).toSeq.toArray, getClass.getClassLoader)
 			def getTestNames(framework: TestFramework): Seq[String] =
 				try { framework.create(loader).tests.map(_.superClassName) }
 				catch { case e: ClassNotFoundException => log.debug("Framework implementation '" + framework.implClassName + "' not present."); Nil }
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index d1ba04985..c653ae822 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -14,7 +14,7 @@ object Result extends Enumeration
 object TestFrameworks
 {
 	val ScalaCheck = new TestFramework("org.scalacheck.FrameworkImpl")
-	val ScalaTest = new TestFramework("org.scalatest.FrameworkImpl")
+	val ScalaTest = new TestFramework("org.scalatest.tools.ScalaTestFramework")
 	val Specs = new TestFramework("org.specs.FrameworkImpl")
 }
 class TestFramework(val implClassName: String) extends NotNull

From 308bbc47241c02e8eb1db3003bdffbabf4a70f0c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 23 Oct 2009 08:45:58 -0400
Subject: [PATCH 152/268] Fix interactive detection in Main

---
 src/main/scala/sbt/Main.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/main/scala/sbt/Main.scala

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
old mode 100644
new mode 100755
index 0c86b6dc6..852cc3f3e
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -119,16 +119,16 @@ class xMain extends xsbti.AppMain
 	{
 		def process(project: Project, arguments: List[String], isInteractive: Boolean): xsbti.MainResult =
 		{
-			def saveProject(newArgs: List[String]) = if(baseProject.name != project.name) (ProjectAction + " " + project.name) :: newArgs else newArgs
+			def rememberCurrent(newArgs: List[String]) = if(baseProject.name != project.name) (ProjectAction + " " + project.name) :: newArgs else newArgs
 			arguments match
 			{
 				case "" :: tail => process(project, tail, isInteractive)
 				case (ExitCommand | QuitCommand) :: _ => Exit(NormalExitCode)
-				case RebootCommand :: tail => Reboot(project.defScalaVersion.value, saveProject(tail), configuration)
+				case RebootCommand :: tail => Reboot(project.defScalaVersion.value, rememberCurrent(tail), configuration)
 				case InteractiveCommand :: _ => process(project, prompt(baseProject, project) :: arguments, true)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)
-						throw new ReloadException(saveProject(action :: tail), Some(version))
+						throw new ReloadException(rememberCurrent(action :: tail), Some(version))
 					else
 						process(project, action :: tail, isInteractive)
 				case CrossBuild(action) :: tail =>
@@ -147,7 +147,7 @@ class xMain extends xsbti.AppMain
 				case Nil => project.log.error("Invalid internal sbt state: no arguments"); Exit(ProgramErrorExitCode)
 			}
 		}
-		process(baseProject, arguments, false)
+		process(baseProject, arguments, arguments.lastOption == Some(InteractiveCommand))
 	}
 	object SetProject
 	{

From 571df2ac796d2bf369c5f27aa99277599af01f9a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 23 Oct 2009 09:18:00 -0400
Subject: [PATCH 153/268] Cleanup test framework creation

---
 src/main/scala/sbt/DefaultProject.scala | 3 +--
 src/main/scala/sbt/TestFramework.scala  | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 6b3b2057b..21d7be00f 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -195,8 +195,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		{
 			val loader = new URLClassLoader(classpath.get.map(_.asURL).toSeq.toArray, getClass.getClassLoader)
 			def getTestNames(framework: TestFramework): Seq[String] =
-				try { framework.create(loader).tests.map(_.superClassName) }
-				catch { case e: ClassNotFoundException => log.debug("Framework implementation '" + framework.implClassName + "' not present."); Nil }
+				framework.create(loader, log).toList.flatMap(_.tests.map(_.superClassName))
 			frameworks.flatMap(getTestNames)
 		}
 	}
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index c653ae822..84368661f 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -19,8 +19,11 @@ object TestFrameworks
 }
 class TestFramework(val implClassName: String) extends NotNull
 {
-	def create(loader: ClassLoader): Framework =
-		Class.forName(implClassName, true, loader).newInstance.asInstanceOf[Framework]
+	def create(loader: ClassLoader, log: Logger): Option[Framework] =
+	{
+		try { Some(Class.forName(implClassName, true, loader).newInstance.asInstanceOf[Framework]) }
+		catch { case e: ClassNotFoundException => log.debug("Framework implementation '" + implClassName + "' not present."); None }
+	}
 }
 final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq[TestReportListener], log: Logger) extends NotNull
 {
@@ -83,7 +86,7 @@ object TestFramework
 		cleanup: Iterable[() => Option[String]]): (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
 	{
 		val loader = createTestLoader(classpath)
-		val rawFrameworks = frameworks.map(_.create(loader))
+		val rawFrameworks = frameworks.flatMap(_.create(loader, log))
 		val mappedTests = testMap(rawFrameworks, tests)
 		if(mappedTests.isEmpty)
 			(new NamedTestTask(TestStartName, None) :: Nil, Nil, new NamedTestTask(TestFinishName, { log.info("No tests to run."); None }) :: Nil )

From a742f9c8a276cddb8f47fd240312927da2109824 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 23 Oct 2009 22:03:53 -0400
Subject: [PATCH 154/268] Add test repository to publish to.

---
 project/build/SbtProject.scala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index fa18be9c1..589b5625e 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -20,6 +20,9 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 		Resolver.url("scala-nightly") artifacts("http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]") mavenStyle()
 	val nightlyScala = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", specificSnapshotRepo)
 
+	override def managedStyle = ManagedStyle.Ivy
+	val publishTo = Resolver.file("test-repo", (Path.userHome / ".ivy2" / "test").asFile)
+
 	override def compileOptions = Nil
 
 	def scalaVersionString = ScalaVersion.current.getOrElse(scalaVersion.value)

From 3bd8446a015b92728234ca5221e8422d08c7ca27 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 2 Nov 2009 20:21:19 -0500
Subject: [PATCH 155/268] Bump version

---
 project/build.properties | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 55b9c6035..3cdfb696b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,5 @@
-#Project properties
-#Mon Oct 19 10:39:39 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.5
-project.version=0.6.0
+project.version=0.6.1
 scala.version=2.7.5

From 8a4a35f4fd1f138a2b82be09babbfec2f31a773b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 4 Nov 2009 21:55:37 -0500
Subject: [PATCH 156/268] version bumps

---
 project/build.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 3cdfb696b..3fc502cb8 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
-sbt.version=0.5.5
-project.version=0.6.1
+sbt.version=0.5.6
+project.version=0.6.2
 scala.version=2.7.5

From 1e30cb820363b0876eb72c50626dfe24ce5ade99 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 9 Nov 2009 23:29:19 -0500
Subject: [PATCH 157/268] Use correct ClassLoader for tests (build Scala
 version not definition Scala version)

---
 src/main/scala/sbt/DefaultProject.scala |  2 +-
 src/main/scala/sbt/ScalaProject.scala   |  2 +-
 src/main/scala/sbt/TestFramework.scala  | 17 ++++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 21d7be00f..d0f9b9e93 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -193,7 +193,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		def compileOrder = BasicScalaProject.this.compileOrder
 		protected def testClassNames(frameworks: Seq[TestFramework]) = 
 		{
-			val loader = new URLClassLoader(classpath.get.map(_.asURL).toSeq.toArray, getClass.getClassLoader)
+			val loader = TestFramework.createTestLoader(classpath.get, buildScalaInstance.loader)
 			def getTestNames(framework: TestFramework): Seq[String] =
 				framework.create(loader, log).toList.flatMap(_.tests.map(_.superClassName))
 			frameworks.flatMap(getTestNames)
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index dee6d3215..31d7101bb 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -276,7 +276,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			}
 			def includeTest(test: TestDefinition) = !excludeTestsSet.contains(test.testClassName) && testFilters.forall(filter => filter(test.testClassName))
 			val tests = HashSet.empty[TestDefinition] ++ analysis.allTests.filter(includeTest)
-			TestFramework.testTasks(frameworks, classpath.get, tests.toSeq, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly)
+			TestFramework.testTasks(frameworks, classpath.get, buildScalaInstance.loader, tests.toSeq, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly)
 	}
 	private def flatten[T](i: Iterable[Iterable[T]]) = i.flatMap(x => x)
 
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index 84368661f..8c36acc8a 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -61,10 +61,10 @@ final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq
 final class NamedTestTask(val name: String, action: => Option[String]) extends NotNull { def run() = action }
 object TestFramework
 {
-	def runTests(frameworks: Seq[TestFramework], classpath: Iterable[Path], tests: Seq[TestDefinition], log: Logger,
+	def runTests(frameworks: Seq[TestFramework], classpath: Iterable[Path], scalaLoader: ClassLoader, tests: Seq[TestDefinition], log: Logger,
 		listeners: Seq[TestReportListener]) =
 	{
-		val (start, runTests, end) = testTasks(frameworks, classpath, tests, log, listeners, true, Nil, Nil)
+		val (start, runTests, end) = testTasks(frameworks, classpath, scalaLoader, tests, log, listeners, true, Nil, Nil)
 		def run(tasks: Iterable[NamedTestTask]) = tasks.foreach(_.run())
 		run(start)
 		run(runTests)
@@ -81,11 +81,11 @@ object TestFramework
 
 		import scala.collection.{Map, Set}
 	
-	def testTasks(frameworks: Seq[TestFramework], classpath: Iterable[Path], tests: Seq[TestDefinition], log: Logger,
+	def testTasks(frameworks: Seq[TestFramework], classpath: Iterable[Path], scalaLoader: ClassLoader, tests: Seq[TestDefinition], log: Logger,
 		listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
 		cleanup: Iterable[() => Option[String]]): (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
 	{
-		val loader = createTestLoader(classpath)
+		val loader = createTestLoader(classpath, scalaLoader)
 		val rawFrameworks = frameworks.flatMap(_.create(loader, log))
 		val mappedTests = testMap(rawFrameworks, tests)
 		if(mappedTests.isEmpty)
@@ -175,9 +175,12 @@ object TestFramework
 		val endTask = new NamedTestTask(TestFinishName, end() ) :: createTasks(cleanup, "Test cleanup")
 		(startTask, testTasks, endTask)
 	}
-	private def createTestLoader(classpath: Iterable[Path]): ClassLoader = 
+	def createTestLoader(classpath: Iterable[Path], scalaLoader: ClassLoader): ClassLoader =
 	{
-		val filterCompilerLoader = new FilteredLoader(getClass.getClassLoader, ScalaCompilerJarPackages)
-		new URLClassLoader(classpath.map(_.asURL).toSeq.toArray, filterCompilerLoader)
+		val filterCompilerLoader = new FilteredLoader(scalaLoader, ScalaCompilerJarPackages)
+		val interfaceFilter = (name: String) => name.startsWith("org.scalatools.testing.")
+		val notInterfaceFilter = (name: String) => !interfaceFilter(name)
+		val dual = new xsbt.DualLoader(filterCompilerLoader, notInterfaceFilter, x => true, getClass.getClassLoader, interfaceFilter, x => false)
+		new URLClassLoader(classpath.map(_.asURL).toSeq.toArray, dual)
 	}
 }

From 6c45fe1b2f5b8a650e3979672e9bcfbc3a509366 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 10 Nov 2009 18:51:18 -0500
Subject: [PATCH 158/268] Add timestamp when command completes.  Show stack
 trace for test framework errors.

---
 src/main/scala/sbt/Main.scala               | 8 +++++++-
 src/main/scala/sbt/TestReportListener.scala | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 852cc3f3e..d34e841dd 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -398,7 +398,13 @@ class xMain extends xsbti.AppMain
 		val endTime = System.currentTimeMillis()
 		project.log.info("")
 		val ss = if(s.isEmpty) "" else s + " "
-		project.log.info("Total " + ss + "time: " + (endTime - startTime + 500) / 1000 + " s")
+		project.log.info("Total " + ss + "time: " + (endTime - startTime + 500) / 1000 + " s, completed " + nowString)
+	}
+	private def nowString =
+	{
+		import java.text.DateFormat
+		val format = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT)
+		format.format(new java.util.Date)
 	}
 	/** Provides a partial message describing why the given property is undefined. */
 	private def undefinedMessage(property: Project#UserProperty[_]): String =
diff --git a/src/main/scala/sbt/TestReportListener.scala b/src/main/scala/sbt/TestReportListener.scala
index 701f83563..938b008f9 100644
--- a/src/main/scala/sbt/TestReportListener.scala
+++ b/src/main/scala/sbt/TestReportListener.scala
@@ -60,6 +60,7 @@ object TestLogger
 			def warn(s: String) = log(Level.Warn, s)
 			def info(s: String) = log(Level.Info, s)
 			def debug(s: String) = log(Level.Debug, s)
+			def trace(t: Throwable) = logger.trace(t)
 			private def log(level: Level.Value, s: String) = logger.log(level, s)
 			def ansiCodesSupported() = logger.ansiCodesSupported
 		}
@@ -72,8 +73,9 @@ class TestLogger(val log: TLogger) extends TestsListener
 	def testEvent(event: TestEvent): Unit = event.detail.foreach(count)
 	def endGroup(name: String, t: Throwable)
 	{
+		// log.trace(t) : need to add a trace method to org.scalatools.testing.Logger
+		try { log.getClass.getMethod("trace", classOf[Throwable]).invoke(log, t) } catch { case e: Exception => () }
 		log.error("Could not run test " + name + ": " + t.toString)
-		//log.trace(t)
 	}
 	def endGroup(name: String, result: Result.Value) {}
 	protected def count(event: TEvent): Unit =

From 77a40bf59a31d948c0f8629d14f05521916eeabe Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 11 Nov 2009 21:02:26 -0500
Subject: [PATCH 159/268] Include seconds in timestamp printed after running
 command

---
 src/main/scala/sbt/Main.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index d34e841dd..224644027 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -403,7 +403,7 @@ class xMain extends xsbti.AppMain
 	private def nowString =
 	{
 		import java.text.DateFormat
-		val format = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT)
+		val format = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM)
 		format.format(new java.util.Date)
 	}
 	/** Provides a partial message describing why the given property is undefined. */

From fb9fbc10a0a4798f126c478ec9761f662d4554f0 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 11 Nov 2009 21:03:03 -0500
Subject: [PATCH 160/268] Cleanup Scala versions in project definition

---
 project/build/SbtProject.scala | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 589b5625e..04329f866 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -15,11 +15,6 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	override def normalizedName = "sbt"
 	//override def scriptedDependencies = testCompile :: `package` :: Nil
 
-	/* For Scala 2.8.0 nightlies, use a special resolver so that we can refer to a specific nightly and not just 2.8.0-SNAPSHOT*/
-	def specificSnapshotRepo =
-		Resolver.url("scala-nightly") artifacts("http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]") mavenStyle()
-	val nightlyScala = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", specificSnapshotRepo)
-
 	override def managedStyle = ManagedStyle.Ivy
 	val publishTo = Resolver.file("test-repo", (Path.userHome / ".ivy2" / "test").asFile)
 
@@ -40,16 +35,12 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	val provided = Configurations.Provided
 
 	/* Versions of Scala to cross-build against. */
-	private val Version2_7_2 = "2.7.2"
-	private val Version2_7_3 = "2.7.3"
-	private val Version2_7_4 = "2.7.4"
 	private val Version2_7_5 = "2.7.5"
-	private val Version2_7_6 = "2.7.6"
 	private val Version2_8_0 = "2.8.0-20090929.004247-+"
 	// the list of all supported versions
-	private def allVersions = Version2_7_2 :: Version2_7_3 :: Version2_7_4 :: Version2_7_5 :: Version2_7_6 :: Version2_8_0 :: Nil
+	private def allVersions = Version2_7_5 :: Version2_8_0 :: Nil
 
-	override def crossScalaVersions = Set(Version2_7_2, Version2_7_5)//, Version2_8_0)
+	override def crossScalaVersions = Set(Version2_7_5)
 
 	val ivy = "org.apache.ivy" % "ivy" % "2.0.0" intransitive()
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()

From 31c577a8d42caca25071ecd5a2df9bd8c9fde7ce Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 11 Nov 2009 21:03:28 -0500
Subject: [PATCH 161/268] 0.6.3

---
 project/build.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 3fc502cb8..849b509fb 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,7 @@
+#Project properties
+#Mon Nov 09 21:08:39 EST 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.2
+project.version=0.6.3
 scala.version=2.7.5

From c192a148a8388621d85b83c71a861ff683c5556f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 18 Nov 2009 21:49:35 -0500
Subject: [PATCH 162/268] Jeremy's patch to set current working directory and
 environment variables on processes

---
 src/main/scala/sbt/Process.scala | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index f4db37ccc..fda7b593c 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -3,6 +3,7 @@
  */
 package sbt
 
+import sbt.impl.CommandParser
 import java.lang.{Process => JProcess, ProcessBuilder => JProcessBuilder}
 import java.io.{Closeable, File, IOException}
 import java.io.{BufferedReader, InputStream, InputStreamReader, OutputStream, PipedInputStream, PipedOutputStream}
@@ -11,9 +12,28 @@ import java.net.URL
 /** Methods for constructing simple commands that can then be combined. */
 object Process
 {
-	implicit def apply(command: String): ProcessBuilder = apply(command.split("""\s+""")) // TODO: use CommandParser
-	implicit def apply(command: Seq[String]): ProcessBuilder = apply(new JProcessBuilder(command.toArray : _*))
-	def apply(command: String, arguments: Seq[String]): ProcessBuilder = apply(new JProcessBuilder((command :: arguments.toList).toArray : _*))
+	implicit def apply(command: String): ProcessBuilder = apply(command, None)
+	implicit def apply(command: Seq[String]): ProcessBuilder = apply (command.toArray, None)
+	def apply(command: String, arguments: Seq[String]): ProcessBuilder = apply(command :: arguments.toList, None)
+	/** create ProcessBuilder with working dir set to path and extra environment variables */
+	def apply(command: String, cwd: Path, extraEnv: (String,String)*): ProcessBuilder = apply(command, cwd.asFile, extraEnv : _*)
+	/** create ProcessBuilder with working dir set to File and extra environment variables */
+	def apply(command: String, cwd: File, extraEnv: (String,String)*): ProcessBuilder =
+		apply(command, Some(cwd), extraEnv : _*)
+	/** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
+	def apply(command: String, cwd: Option[File], extraEnv: (String,String)*): ProcessBuilder = {
+		CommandParser.parse(command) match {
+			case Left(errorMsg) => error(errorMsg)
+			case Right((cmd, args)) => apply(cmd :: args, cwd, extraEnv : _*)
+		}
+	}
+	/** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
+	def apply(command: Seq[String], cwd: Option[File], extraEnv: (String,String)*): ProcessBuilder = {
+		val jpb = new JProcessBuilder(command.toArray : _*)
+		cwd.foreach(jpb directory _)
+		extraEnv.foreach { case (k, v) => jpb.environment.put(k, v) }
+		apply(jpb)
+	}
 	implicit def apply(builder: JProcessBuilder): ProcessBuilder = new SimpleProcessBuilder(builder)
 	implicit def apply(file: File): FilePartialBuilder = new FileBuilder(file)
 	implicit def apply(url: URL): URLPartialBuilder = new URLBuilder(url)

From 4f808aad2beb36f49c210dd8ad5296e770412b49 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 19 Nov 2009 20:08:40 -0500
Subject: [PATCH 163/268] stevej's patch to fix main class message

---
 src/main/scala/sbt/DefaultProject.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index d0f9b9e93..b3873ff81 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -452,7 +452,7 @@ object BasicScalaProject
 	{
 		log.warn("No Main-Class attribute will be added automatically added:")
 		log.warn("Multiple classes with a main method were detected.  Specify main class explicitly with:")
-		log.warn("     override mainClass = Some(\"className\")")
+		log.warn("     override def mainClass = Some(\"className\")")
 	}
 }
 object BasicWebScalaProject
@@ -512,4 +512,4 @@ private object LibraryDependencies
 	private def isScalaLibraryJar(file: File) = isNamed(file)(ScalaLibraryPrefix)
 	private def isNamed(file: File)(name: String) = file.getName.startsWith(name)
 
-}
\ No newline at end of file
+}

From e988b0e51e6be61d818a80c2fdc4ce3d524283ab Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 22 Nov 2009 22:57:08 -0500
Subject: [PATCH 164/268] Transient access to API structure from xsbt compiler
 interface

---
 project/build.properties                  | 4 ++--
 src/main/scala/sbt/Analysis.scala         | 7 +++++--
 src/main/scala/sbt/AnalysisCallback.scala | 4 ++++
 src/main/scala/sbt/Compile.scala          | 1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 849b509fb..da1b182f1 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Mon Nov 09 21:08:39 EST 2009
+#Thu Nov 19 22:26:26 EST 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.3
+project.version=0.6.4-p1
 scala.version=2.7.5
diff --git a/src/main/scala/sbt/Analysis.scala b/src/main/scala/sbt/Analysis.scala
index 45fbee1e7..1de5a403b 100644
--- a/src/main/scala/sbt/Analysis.scala
+++ b/src/main/scala/sbt/Analysis.scala
@@ -164,14 +164,17 @@ import Format._ // get implicits for data types
 class BasicCompileAnalysis protected (analysisPath: Path, projectPath: Path, log: Logger) extends BasicAnalysis(analysisPath, projectPath, log)
 {
 	/*private */val hashesMap = new HashMap[Path, Array[Byte]]
+	val apiMap = new HashMap[Path, xsbti.api.Source]
 	
-	override protected def mapsToClear = hashesMap :: super.mapsToClear
-	override protected def mapsToRemoveSource = hashesMap :: super.mapsToRemoveSource
+	override protected def mapsToClear = apiMap :: hashesMap :: super.mapsToClear
+	override protected def mapsToRemoveSource = apiMap :: hashesMap :: super.mapsToRemoveSource
 	
 	def setHash(source: Path, hash: Array[Byte]) { hashesMap(source) = hash }
 	def clearHash(source: Path) { hashesMap.removeKey(source) }
 	def hash(source: Path) = hashesMap.get(source)
 	def clearHashes() { hashesMap.clear() }
+
+	def setAPI(source: Path, a: xsbti.api.Source) { apiMap(source) = a }
 	
 	def getClasses(sources: PathFinder, outputDirectory: Path): PathFinder =
 		Path.lazyPathFinder
diff --git a/src/main/scala/sbt/AnalysisCallback.scala b/src/main/scala/sbt/AnalysisCallback.scala
index 51b5618c5..6ac5d606b 100644
--- a/src/main/scala/sbt/AnalysisCallback.scala
+++ b/src/main/scala/sbt/AnalysisCallback.scala
@@ -58,6 +58,7 @@ trait AnalysisCallback extends NotNull
 	def endSource(sourcePath: Path): Unit
 	/** Called when a module with a public 'main' method with the right signature is found.*/
 	def foundApplication(sourcePath: Path, className: String): Unit
+	def api(sourcePath: Path, source: xsbti.api.Source): Unit
 }
 abstract class BasicAnalysisCallback[A <: BasicCompileAnalysis](val basePath: Path, protected val analysis: A) extends AnalysisCallback
 {
@@ -84,6 +85,9 @@ abstract class BasicAnalysisCallback[A <: BasicCompileAnalysis](val basePath: Pa
 	
 	def endSource(sourcePath: Path): Unit =
 		analysis.removeSelfDependency(sourcePath)
+
+	def api(sourcePath: Path, source: xsbti.api.Source): Unit =
+		analysis.setAPI(sourcePath, source)
 }
 abstract class BasicCompileAnalysisCallback(basePath: Path, analysis: CompileAnalysis)
 	extends BasicAnalysisCallback(basePath, analysis)
diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index 49a04d209..f6991eaae 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -134,4 +134,5 @@ private final class AnalysisInterface(delegate: AnalysisCallback, basePath: Path
 	def relativizeOrAbs(base: Path, file: File) = Path.relativize(base, file).getOrElse(Path.fromFile(file))
 	def classPath(file: File) = relativizeOrAbs(outputPath, file)
 	def srcPath(file: File) = relativizeOrAbs(basePath, file)
+	def api(file: File, source: xsbti.api.Source) = delegate.api(srcPath(file), source)
 }
\ No newline at end of file

From 2e942915aac326b9c3585bf2cbd5cf242c549998 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 25 Nov 2009 13:05:14 -0500
Subject: [PATCH 165/268] Read commands from a file using <file

---
 src/main/scala/sbt/Main.scala | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 224644027..cbdc9eca1 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -3,6 +3,7 @@
  */
 package sbt
 
+import java.io.File
 import scala.collection.immutable.TreeSet
 
 private case class Exit(code: Int) extends xsbti.Exit
@@ -141,6 +142,13 @@ class xMain extends xsbti.AppMain
 						case Some(newProject) => process(newProject, tail, isInteractive)
 						case None => process(project, if(isInteractive) tail else ExitCommand :: tail, isInteractive)
 					}
+				case action :: tail if action.startsWith(FileCommandsPrefix) =>
+					val file = new File(baseProject.info.projectDirectory, action.substring(FileCommandsPrefix.length).trim)
+					readLines(project, file) match
+					{
+						case Some(lines) => process(project, lines ::: tail , isInteractive)
+						case None => process(project, if(isInteractive) tail else ExitCommand :: tail, isInteractive)
+					}
 				case action :: tail =>
 					val success = processAction(baseProject, project, action, isInteractive)
 					if(success || isInteractive) process(project, tail, isInteractive) else Exit(BuildErrorExitCode)
@@ -197,6 +205,15 @@ class xMain extends xsbti.AppMain
 					Nil
 		}
 	}
+	private def readLines(project: Project, file: File): Option[List[String]] =
+	{
+		try { Some(xsbt.FileUtilities.readLines(file)) }
+		catch { case e: Exception =>
+			project.log.trace(e)
+			project.log.error("Error reading commands from file " + file.getAbsolutePath + ": " + e.toString)
+			None
+		}
+	}
 	// todo:  project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
 	private def prompt(baseProject: Project, project: Project): String =
 	{
@@ -244,6 +261,8 @@ class xMain extends xsbti.AppMain
 	* Scala version between this prefix and the space (i.e. '++version action' means execute 'action' using
 	* Scala version 'version'. */
 	val SpecificBuildPrefix = "++"
+	/** The prefix used to identify a file to read commands from. */
+	val FileCommandsPrefix = "<"
 
 	/** The number of seconds between polling by the continuous compile command.*/
 	val ContinuousCompilePollDelaySeconds = 1
@@ -270,10 +289,10 @@ class xMain extends xsbti.AppMain
 				else if(action.startsWith(GetAction + " "))
 					getProperty(currentProject, action.substring(GetAction.length + 1))
 				else
-							handleCommand(currentProject, action)
+					handleCommand(currentProject, action)
 		}
 
-	private def printCmd(name:String, desc:String) = Console.println("\t" + name + ": " + desc)
+	private def printCmd(name:String, desc:String) = Console.println("\t" + name + " : " + desc)
 	val BatchHelpHeader = "You may execute any project action or method or one of the commands described below."
 	val InteractiveHelpHeader = "You may execute any project action or one of the commands described below. Only one action " +
 			"may be executed at a time in interactive mode and is entered by name, as it would be at the command line." +
@@ -286,6 +305,7 @@ class xMain extends xsbti.AppMain
 		printCmd("<action name>", "Executes the project specified action.")
 		printCmd("<method name> <parameter>*", "Executes the project specified method.")
 		printCmd(ContinuousExecutePrefix + " <command>", "Executes the project specified action or method whenever source files change.")
+		printCmd(FileCommandsPrefix + " file", "Executes the commands in the given file.  Each command should be on its own line.  Empty lines and lines beginning with '#' are ignored")
 		printCmd(CrossBuildPrefix + " <command>", "Executes the project specified action or method for all versions of Scala defined in crossScalaVersions.")
 		printCmd(SpecificBuildPrefix + "<version> <command>", "Changes the version of Scala building the project and executes the provided command.  <command> is optional.")
 		printCmd(ShowActions, "Shows all available actions.")

From 1e0424153ae32c67ca2b33e1ef819251a0f6d267 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 26 Nov 2009 20:53:28 -0500
Subject: [PATCH 166/268] Josh's patches for test-interface 0.2

---
 src/main/scala/sbt/TestFramework.scala | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index 8c36acc8a..ece4455e7 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -4,7 +4,8 @@
 package sbt
 
 	import java.net.URLClassLoader
-	import org.scalatools.testing.{TestFingerprint => Fingerprint, Framework, Runner, Logger=>TLogger}
+	import org.scalatools.testing.{TestFingerprint => Fingerprint, Framework,
+    Runner, Logger=>TLogger, EventHandler, Event}
 
 object Result extends Enumeration
 {
@@ -13,10 +14,11 @@ object Result extends Enumeration
 
 object TestFrameworks
 {
-	val ScalaCheck = new TestFramework("org.scalacheck.FrameworkImpl")
+	val ScalaCheck = new TestFramework("org.scalacheck.ScalaCheckFramework")
 	val ScalaTest = new TestFramework("org.scalatest.tools.ScalaTestFramework")
 	val Specs = new TestFramework("org.specs.FrameworkImpl")
 }
+
 class TestFramework(val implClassName: String) extends NotNull
 {
 	def create(loader: ClassLoader, log: Logger): Option[Framework] =
@@ -25,6 +27,7 @@ class TestFramework(val implClassName: String) extends NotNull
 		catch { case e: ClassNotFoundException => log.debug("Framework implementation '" + implClassName + "' not present."); None }
 	}
 }
+
 final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq[TestReportListener], log: Logger) extends NotNull
 {
 	private[this] val delegate = framework.testRunner(loader, listeners.flatMap(_.contentLogger).toArray)
@@ -33,7 +36,10 @@ final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq
 		val testClass = testDefinition.testClassName
 		def runTest() =
 		{
-			val results = delegate.run(testClass, testDefinition, args.toArray)
+			// here we get the results! here is where we'd pass in the event listener
+			val results = new scala.collection.mutable.ListBuffer[Event]
+			val handler = new EventHandler { def handle(e:Event){ results += e } }
+			delegate.run(testClass, testDefinition, handler, args.toArray)
 			val event = TestEvent(results)
 			safeListenersCall(_.testEvent( event ))
 			event.result
@@ -59,6 +65,7 @@ final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq
 }
 
 final class NamedTestTask(val name: String, action: => Option[String]) extends NotNull { def run() = action }
+
 object TestFramework
 {
 	def runTests(frameworks: Seq[TestFramework], classpath: Iterable[Path], scalaLoader: ClassLoader, tests: Seq[TestDefinition], log: Logger,

From e6125354d68cbeea403d6c4c32718fad36956fcb Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 27 Nov 2009 10:31:44 -0500
Subject: [PATCH 167/268] Fix from Josh to enable ScalaCheck support

---
 src/main/scala/sbt/DefaultProject.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index b3873ff81..d48449d69 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -173,7 +173,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def testFrameworks: Seq[TestFramework] = 
 	{
 		import TestFrameworks.{ScalaCheck, ScalaTest, Specs}
-		/*ScalaCheckFramework :: SpecsFramework ::*/ ScalaTest :: Nil
+		ScalaCheckFramework :: 	/*SpecsFramework ::*/ ScalaTest :: Nil
 	}
 	/** The list of listeners for testing. */
 	def testListeners: Seq[TestReportListener] = TestLogger(log) :: Nil

From 9e6c14f200acbf98547e12ee188ed5e5d5e256bd Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 27 Nov 2009 10:42:16 -0500
Subject: [PATCH 168/268] Use test-interface 0.2

---
 project/build/SbtProject.scala          | 2 +-
 src/main/scala/sbt/DefaultProject.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 04329f866..9514be1ef 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -46,7 +46,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
 
-	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.1"
+	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.2"
 
 	// xsbt components
 	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % projectVersion.value.toString % "provided"
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index d48449d69..cbe62b968 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -173,7 +173,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def testFrameworks: Seq[TestFramework] = 
 	{
 		import TestFrameworks.{ScalaCheck, ScalaTest, Specs}
-		ScalaCheckFramework :: 	/*SpecsFramework ::*/ ScalaTest :: Nil
+		ScalaCheck :: 	/*SpecsFramework ::*/ ScalaTest :: Nil
 	}
 	/** The list of listeners for testing. */
 	def testListeners: Seq[TestReportListener] = TestLogger(log) :: Nil

From 097135fb29f477516a1ed2a17b0e6b6c2d9b2eed Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 27 Nov 2009 13:12:58 -0500
Subject: [PATCH 169/268] specs updated for test-interface 0.2

---
 src/main/scala/sbt/DefaultProject.scala | 2 +-
 src/main/scala/sbt/TestFramework.scala  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index cbe62b968..7457bc01d 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -173,7 +173,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def testFrameworks: Seq[TestFramework] = 
 	{
 		import TestFrameworks.{ScalaCheck, ScalaTest, Specs}
-		ScalaCheck :: 	/*SpecsFramework ::*/ ScalaTest :: Nil
+		ScalaCheck :: Specs :: ScalaTest :: Nil
 	}
 	/** The list of listeners for testing. */
 	def testListeners: Seq[TestReportListener] = TestLogger(log) :: Nil
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index ece4455e7..a1ea479ed 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -16,7 +16,7 @@ object TestFrameworks
 {
 	val ScalaCheck = new TestFramework("org.scalacheck.ScalaCheckFramework")
 	val ScalaTest = new TestFramework("org.scalatest.tools.ScalaTestFramework")
-	val Specs = new TestFramework("org.specs.FrameworkImpl")
+	val Specs = new TestFramework("org.specs.runner.SpecsFramework")
 }
 
 class TestFramework(val implClassName: String) extends NotNull

From 36bb0e247aefec5bd54faee1d7521daa685c8da9 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 29 Nov 2009 18:17:31 -0500
Subject: [PATCH 170/268] version to 0.6.4

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index da1b182f1..12d2ceb11 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -3,5 +3,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.4-p1
+project.version=0.6.4
 scala.version=2.7.5

From dfaa2f370cd2defc93db896ed2116aa867239a9b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 2 Dec 2009 10:29:22 -0500
Subject: [PATCH 171/268] Make worker threads uninterruptible

---
 src/main/scala/sbt/ParallelRunner.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/sbt/ParallelRunner.scala b/src/main/scala/sbt/ParallelRunner.scala
index 24d5507f9..f67c31e24 100644
--- a/src/main/scala/sbt/ParallelRunner.scala
+++ b/src/main/scala/sbt/ParallelRunner.scala
@@ -125,6 +125,7 @@ final class Distributor[D](scheduler: Scheduler[D], doWork: D => Option[String],
 		}
 		private class Worker(data: D) extends Thread with NotNull
 		{
+			override def interrupt() {}
 			override def run()
 			{
 				val result = Control.trapUnit("", log(data))(doWork(data))

From 5c29bfc2c2bfe313e7bcbdf2cecfb31aa64395ed Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 4 Dec 2009 21:26:31 -0500
Subject: [PATCH 172/268] Getting scripted testing working with using-xsbt:  *
 uses new scripted test framework in xsbt  * adds ability to provide commands
 over loopback interface with <port command  * only some tests have been
 updated

---
 project/build.properties                      |   4 +-
 project/build/SbtProject.scala                |  10 +-
 project/plugins/Plugins.scala                 |   6 +
 scripted/project/build.properties             |   4 +-
 scripted/project/build/SbtTest.scala          |   2 +
 scripted/src/main/scala/SbtHandler.scala      |  42 +++
 scripted/src/main/scala/Scripted.scala        |  42 +--
 scripted/src/main/scala/ScriptedLogger.scala  |  50 ----
 scripted/src/main/scala/ScriptedTests.scala   | 129 ++++++---
 .../src/main/scala/TestScriptParser.scala     | 264 ------------------
 src/main/scala/sbt/Main.scala                 | 113 ++++++--
 src/sbt-test/actions/interactive/test         |  62 ++--
 .../project/build/src/TestProject.scala       |   1 -
 .../run-test/src/main/scala/Foo.scala         |  11 +-
 .../run-test/src/test/scala/FooTest.scala     |  12 -
 src/sbt-test/compiler-project/run-test/test   |  15 +-
 src/sbt-test/java/analysis/test               |   3 +-
 .../java/basic/project/build.properties       |   4 +-
 src/sbt-test/java/basic/test                  |   3 +-
 .../project/build/src/JavaProject.scala       |   1 +
 src/sbt-test/java/options/test                |   9 +-
 src/sbt-test/java/separate/test               |   7 +-
 .../project/build/AnonTest.scala              |   8 +
 src/sbt-test/java/track-anonymous/test        |  19 +-
 24 files changed, 317 insertions(+), 504 deletions(-)
 create mode 100644 project/plugins/Plugins.scala
 create mode 100644 scripted/src/main/scala/SbtHandler.scala
 delete mode 100644 scripted/src/main/scala/ScriptedLogger.scala
 delete mode 100644 scripted/src/main/scala/TestScriptParser.scala
 delete mode 100644 src/sbt-test/compiler-project/run-test/src/test/scala/FooTest.scala

diff --git a/project/build.properties b/project/build.properties
index 12d2ceb11..425e2defc 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,5 @@
-#Project properties
-#Thu Nov 19 22:26:26 EST 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.4
+project.version=0.6.5-p1
 scala.version=2.7.5
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 9514be1ef..044d1a6c9 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -5,7 +5,7 @@ import sbt._
 
 import java.io.File
 
-class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.SbtScripted
+class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted
 {
 	/* Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
@@ -13,12 +13,18 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 
 	override def testOptions = ExcludeTests("sbt.ReflectiveSpecification" :: Nil) :: super.testOptions.toList
 	override def normalizedName = "sbt"
-	//override def scriptedDependencies = testCompile :: `package` :: Nil
 
 	override def managedStyle = ManagedStyle.Ivy
 	val publishTo = Resolver.file("test-repo", (Path.userHome / ".ivy2" / "test").asFile)
 
 	override def compileOptions = Nil
+	
+	/**  configuration of scripted testing **/
+	// Set to false to show logging as it happens without buffering, true to buffer until it completes and only show if the task fails.
+	//   The output of scripted tasks executed in parallel will be inteleaved if true.
+	override def scriptedBufferLog = true
+	// Configure which versions of Scala to test against for those tests that do cross building
+	override def scriptedCompatibility = sbt.test.CompatibilityLevel.Full
 
 	def scalaVersionString = ScalaVersion.current.getOrElse(scalaVersion.value)
 	override def mainSources =
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
new file mode 100644
index 000000000..86482bb22
--- /dev/null
+++ b/project/plugins/Plugins.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class Plugins(info: ProjectInfo) extends PluginDefinition(info)
+{
+	val scripted = "org.scala-tools.sbt" % "test" % "0.6.5-p1"
+}
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index f661a4686..550e1d499 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -2,7 +2,7 @@
 #Sat Aug 01 10:32:20 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=test
-sbt.version=0.5.4
-project.version=0.5.4
+sbt.version=0.5.6
+project.version=0.6.5-p1
 scala.version=2.7.5
 project.initialize=false
diff --git a/scripted/project/build/SbtTest.scala b/scripted/project/build/SbtTest.scala
index bfc295cb5..f0b8c1cce 100644
--- a/scripted/project/build/SbtTest.scala
+++ b/scripted/project/build/SbtTest.scala
@@ -6,6 +6,8 @@ import sbt._
 
 class SbtTest(info: ProjectInfo) extends PluginProject(info)
 {
+	val xsbtTest = "org.scala-tools.sbt" %% "test" % version.toString
+	
 	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
 	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
 }
\ No newline at end of file
diff --git a/scripted/src/main/scala/SbtHandler.scala b/scripted/src/main/scala/SbtHandler.scala
new file mode 100644
index 000000000..22d879fee
--- /dev/null
+++ b/scripted/src/main/scala/SbtHandler.scala
@@ -0,0 +1,42 @@
+
+package sbt.test
+
+import java.io.{File, IOException}
+import xsbt.IPC
+import xsbt.test.{StatementHandler, TestFailed}
+
+final class SbtHandler(directory: File, log: Logger, server: IPC.Server) extends StatementHandler
+{
+	type State = Process
+	def initialState = newRemote
+	def apply(command: String, arguments: List[String], p: Process): Process =
+	{
+		send((command :: arguments).mkString(" "))
+		receive(command + " failed")
+		p
+	}
+	def finish(state: Process) =
+		try {
+			server.connection { _.send("exit") }
+			state.exitValue()
+		} catch {
+			case e: IOException =>  state.destroy()
+		}
+	def send(message: String) = server.connection { _.send(message) }
+	def receive(errorMessage: String) =
+		server.connection { ipc =>
+			val resultMessage = ipc.receive
+			if(!resultMessage.toBoolean) throw new TestFailed(errorMessage)
+		}
+	def newRemote =
+	{
+		val builder = new java.lang.ProcessBuilder("xsbt", "<" + server.port).directory(directory)
+		val io = BasicIO(log, false).withInput(_.close())
+		val p = Process(builder) run( io )
+		Spawn { p.exitValue(); server.close() }
+		try { receive("Remote sbt initialization failed") }
+		catch { case e: java.net.SocketException => error("Remote sbt initialization failed") }
+		p
+	}
+//		Process("java" :: "-classpath" :: classpath.map(_.getAbsolutePath).mkString(File.pathSeparator) :: "xsbt.boot.Boot" :: ( "<" + server.port) :: Nil) run log
+}
diff --git a/scripted/src/main/scala/Scripted.scala b/scripted/src/main/scala/Scripted.scala
index 71f1a1a4c..9344bc2ee 100644
--- a/scripted/src/main/scala/Scripted.scala
+++ b/scripted/src/main/scala/Scripted.scala
@@ -4,7 +4,7 @@
 package sbt.test
 
 import Scripted._
-import FileUtilities.{classLocation, sbtJar, scalaCompilerJar, scalaLibraryJar, wrapNull}
+import FileUtilities.{sbtJar, scalaCompilerJar, scalaLibraryJar, wrapNull}
 import java.io.File
 import java.net.URLClassLoader
 
@@ -17,18 +17,10 @@ trait ScalaScripted extends BasicScalaProject with Scripted with MavenStyleScala
 	override def testAction = testNoScripted dependsOn(scripted)
 	
 	lazy val scriptedOnly = scriptedMethodTask(scriptedDependencies : _*)
-	
-	override def scriptedClasspath = runClasspath +++ Path.lazyPathFinder { Path.fromFile(sbtJar) :: Nil }
 }
 trait SbtScripted extends ScalaScripted
 {
-	override def scriptedDependencies = testCompile :: `package` :: Nil
-	override def scriptedClasspath = 
-		Path.lazyPathFinder {
-			val ivy = runClasspath.get.filter(_.asFile.getName.startsWith("ivy-")).toList
-			val builtSbtJar = (outputPath / defaultJarName)
-			builtSbtJar :: ivy
-		}
+	override def scriptedDependencies = publishLocal :: Nil
 }
 final case class ScriptedTest(group: String, name: String) extends NotNull
 {
@@ -36,6 +28,11 @@ final case class ScriptedTest(group: String, name: String) extends NotNull
 }
 trait Scripted extends Project with MultiTaskProject
 {
+	def scriptedCompatibility = CompatibilityLevel.Minimal
+	def scriptedDefScala = scalaVersion.value.toString
+	def scriptedSbt = projectVersion.value.toString
+	def scriptedBufferLog = true
+	
 	def sbtTests: Path
 	def scriptedTask(dependencies: ManagedTask*) = dynamic(scriptedTests(listTests)) dependsOn(dependencies : _*)
 	def scriptedMethodTask(dependencies: ManagedTask*) = multiTask(listTests.map(_.toString).toList) { includeFunction =>
@@ -44,41 +41,21 @@ trait Scripted extends Project with MultiTaskProject
 	def listTests = (new ListTests(sbtTests.asFile, include _, log)).listTests
 	def scriptedTests(tests: Seq[ScriptedTest], dependencies: ManagedTask*) =
 	{
-		val localLogger = new LocalLogger(log)
-		lazy val runner =
-		{
-			// load ScriptedTests using a ClassLoader that loads from the project classpath so that the version
-			// of sbt being built is tested, not the one doing the building.
-			val filtered = new FilteredLoader(ClassLoader.getSystemClassLoader, Seq("sbt.", "scala.", "ch.epfl.", "org.apache.", "org.jsch."))
-			val loader = new URLClassLoader(_scriptedClasspath.toArray, filtered)
-			val scriptedClass = Class.forName(ScriptedClassName, true, loader)
-			val scriptedConstructor = scriptedClass.getConstructor(classOf[File], classOf[ClassLoader])
-			val rawRunner = scriptedConstructor.newInstance(sbtTests.asFile, loader)
-			rawRunner.asInstanceOf[{def scriptedTest(group: String, name: String, log: Reflected.Logger): String}]
-		}
+		val runner = new ScriptedTests(sbtTests.asFile, scriptedBufferLog, scriptedSbt, scriptedDefScala, scriptedCompatibility)
 		
 		val startTask = task { None } named("scripted-test-start") dependsOn(dependencies  : _*)
 		def scriptedTest(test: ScriptedTest) =
-			task { unwrapOption(runner.scriptedTest(test.group, test.name, localLogger)) } named test.toString dependsOn(startTask)
+			task { runner.scriptedTest(test.group, test.name, log) } named test.toString dependsOn(startTask)
 		val testTasks = tests.map(scriptedTest)
 		task { None } named("scripted-test-complete") dependsOn(testTasks : _*)
 	}
 	private def unwrapOption[T](s: T): Option[T] = if(s == null) None else Some(s)
-	/** The classpath to use for scripted tests.   This ensures that the version of sbt being built is the one used for testing.*/
-	private def _scriptedClasspath =
-	{
-		val buildClasspath = classLocation[Scripted]
-		val scalaJars = List(scalaLibraryJar, scalaCompilerJar).map(_.toURI.toURL).toList
-		buildClasspath :: scalaJars ::: scriptedClasspath.get.map(_.asURL).toList
-	}
-	def scriptedClasspath: PathFinder = Path.emptyPathFinder
 	
 	def include(test: ScriptedTest) = true
 }
 import scala.collection.mutable
 private[test] object Scripted
 {
-	val ScriptedClassName = "sbt.test.ScriptedTests"
 	val SbtTestDirectoryName = "sbt-test"
 	def list(directory: File, filter: java.io.FileFilter) = wrapNull(directory.listFiles(filter))
 }
@@ -87,7 +64,6 @@ private[test] final class ListTests(baseDirectory: File, accept: ScriptedTest =>
 	def filter = DirectoryFilter -- HiddenFileFilter
 	def listTests: Seq[ScriptedTest] =
 	{
-		System.setProperty("sbt.scala.version", "")
 		list(baseDirectory, filter) flatMap { group =>
 			val groupName = group.getName
 			listTests(group).map(ScriptedTest(groupName, _))
diff --git a/scripted/src/main/scala/ScriptedLogger.scala b/scripted/src/main/scala/ScriptedLogger.scala
deleted file mode 100644
index e7be8b30a..000000000
--- a/scripted/src/main/scala/ScriptedLogger.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-package sbt.test
-
-object Reflected
-{
-	type Logger =
-	{
-		def enableTrace(flag: Boolean): Unit
-		def traceEnabled: Boolean
-		def getLevel: Int
-		def setLevel(level: Int): Unit
-
-		def trace(t: F0[Throwable]): Unit
-		def success(message: F0[String]): Unit
-		def log(level: Int, message: F0[String]): Unit
-		def control(event: Int, message: F0[String]): Unit
-	}
-	type F0[T] = 
-	{
-		def apply(): T
-	}
-}
-
-final class LocalLogger(logger: Logger) extends NotNull
-{
-	import Reflected.F0
-	def enableTrace(flag: Boolean) = logger.enableTrace(flag)
-	def traceEnabled = logger.traceEnabled
-	def getLevel = logger.getLevel.id
-	def setLevel(level: Int) = logger.setLevel(Level(level))
-
-	def trace(t: F0[Throwable]) = logger.trace(t())
-	def success(message: F0[String]) = logger.success(message())
-	def log(level: Int, message: F0[String]) = logger.log(Level(level), message())
-	def control(event: Int, message: F0[String]) = logger.control(ControlEvent(event), message())
-}
-
-final class RemoteLogger(logger: Reflected.Logger) extends Logger
-{
-	private final class F0[T](s: => T) extends NotNull { def apply(): T = s }
-	def getLevel: Level.Value = Level(logger.getLevel)
-	def setLevel(newLevel: Level.Value) = logger.setLevel(newLevel.id)
-	def enableTrace(flag: Boolean) = logger.enableTrace(flag)
-	def traceEnabled = logger.traceEnabled
-	
-	def trace(t: => Throwable) = logger.trace(new F0(t))
-	def success(message: => String) = logger.success(new F0(message))
-	def log(level: Level.Value, message: => String) = logger.log(level.id, new F0(message))
-	def control(event: ControlEvent.Value, message: => String) = logger.control(event.id, new F0(message))
-	def logAll(events: Seq[LogEvent]) = events.foreach(log)
-}
\ No newline at end of file
diff --git a/scripted/src/main/scala/ScriptedTests.scala b/scripted/src/main/scala/ScriptedTests.scala
index b785618bb..8e7597873 100644
--- a/scripted/src/main/scala/ScriptedTests.scala
+++ b/scripted/src/main/scala/ScriptedTests.scala
@@ -5,59 +5,100 @@
 package sbt.test
 
 import java.io.File
+import java.nio.charset.Charset
 
-final class ScriptedTests(testResources: Resources) extends NotNull
+import xsbt.IPC
+import xsbt.test.{CommentHandler, FileCommands, ScriptRunner, TestScriptParser}
+
+final class ScriptedTests(resourceBaseDirectory: File, bufferLog: Boolean, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value) extends NotNull
 {
-	def this(resourceBaseDirectory: File, additional: ClassLoader) = this(new Resources(resourceBaseDirectory, additional))
-	def this(resourceBaseDirectory: File) = this(new Resources(resourceBaseDirectory))
+	private val testResources = new Resources(resourceBaseDirectory)
 	
 	val ScriptFilename = "test"
-	import testResources._
 	
-	private def printClass(c: Class[_]) = println(c.getName + " loader=" +c.getClassLoader + " location=" + FileUtilities.classLocationFile(c))
-	
-	def scriptedTest(group: String, name: String, logger: Reflected.Logger): String =
-	{
-		val log = new RemoteLogger(logger)
-		val result = readOnlyResourceDirectory(group, name).fold(err => Some(err), testDirectory => scriptedTest(testDirectory, log))
-		translateOption(result)
-	}
-	private def scriptedTest(testDirectory: File, log: Logger): Option[String] =
+	def scriptedTest(group: String, name: String, log: Logger): Option[String] =
+		testResources.readWriteResourceDirectory(group, name, log) { testDirectory =>
+			scriptedTest(group + " / " + name, testDirectory, log).toLeft(())
+		}.left.toOption
+	private def scriptedTest(label: String, testDirectory: File, log: Logger): Option[String] =
+		IPC.pullServer( scriptedTest0(label, testDirectory, log) )
+	private def scriptedTest0(label: String, testDirectory: File, log: Logger)(server: IPC.Server): Option[String] =
 	{
+		FillProperties(testDirectory, sbtVersion, defScalaVersion, level)
 		val buffered = new BufferedLogger(log)
-		//buffered.startRecording()
-		val filtered = new FilterLogger(buffered)
-		val parsedScript = (new TestScriptParser(testDirectory, filtered)).parse(new File(testDirectory, ScriptFilename))
-		val result = parsedScript.right.flatMap(withProject(testDirectory, filtered))
-		//result.left.foreach(x => buffered.playAll())
-		//buffered.clearAll()
-		result.left.toOption
+		if(bufferLog)
+			buffered.recordAll
+		
+		def createParser() =
+		{
+			val fileHandler = new FileCommands(testDirectory)
+			val sbtHandler = new SbtHandler(testDirectory, buffered, server)
+			new TestScriptParser(Map('$' -> fileHandler, '>' -> sbtHandler, '#' -> CommentHandler))
+		}
+		def runTest() =
+		{
+			val run = new ScriptRunner
+			val parser = createParser()
+			run(parser.parse(new File(testDirectory, ScriptFilename)))
+		}
+
+		try
+		{
+			runTest()
+			buffered.info("+ " + label)
+			None
+		}
+		catch
+		{
+			case e: xsbt.test.TestException =>
+				buffered.playAll()
+				buffered.error("x " + label)
+				if(e.getCause eq null)
+					buffered.error("   " + e.getMessage)
+				else
+					e.printStackTrace
+				Some(e.toString)
+			case e: Exception =>
+				buffered.playAll()
+				buffered.error("x " + label)
+				throw e
+		}
+		finally { buffered.clearAll() }
 	}
-	private[this] def translateOption[T >: Null](s: Option[T]): T = s match { case Some(t) => t; case None => null }
 }
 
-// TODO: remove for sbt 0.5.3
-final class FilterLogger(delegate: Logger) extends BasicLogger
+object CompatibilityLevel extends Enumeration
 {
-	def trace(t: => Throwable)
-	{
-		if(traceEnabled)
-			delegate.trace(t)
-	}
-	def log(level: Level.Value, message: => String)
-	{
-		if(atLevel(level))
-			delegate.log(level, message)
-	}
-	def success(message: => String)
-	{
-		if(atLevel(Level.Info))
-			delegate.success(message)
-	}
-	def control(event: ControlEvent.Value, message: => String)
-	{
-		if(atLevel(Level.Info))
-			delegate.control(event, message)
-	}
-	def logAll(events: Seq[LogEvent]): Unit = events.foreach(delegate.log)
+	val Full, Basic, Minimal, Minimal27, Minimal28 = Value
 }
+object FillProperties
+{
+	def apply(projectDirectory: File, sbtVersion: String, defScalaVersion: String, level: CompatibilityLevel.Value): Unit =
+	{
+		import xsbt.Paths._
+		fill(projectDirectory / "project" / "build.properties", sbtVersion, defScalaVersion, getVersions(level))
+	}
+	def fill(properties: File, sbtVersion: String, defScalaVersion: String, buildScalaVersions: String)
+	{
+		val toAppend = extraProperties(sbtVersion, defScalaVersion, buildScalaVersions)
+		xsbt.OpenResource.fileWriter(Charset.forName("ISO-8859-1"), true)(properties) { _.write(toAppend) }
+	}
+	def getVersions(level: CompatibilityLevel.Value) =
+	{
+		import CompatibilityLevel._
+		level match
+		{
+			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1-RC2 2.8.0-SNAPSHOT"
+			case Basic =>  "2.7.7 2.7.2 2.8.0.Beta1-RC2"
+			case Minimal => "2.7.7 2.8.0.Beta1-RC2" 
+			case Minimal27 => "2.7.7"
+			case Minimal28 => "2.8.0.Beta1-RC2"
+		}
+	}
+	def extraProperties(sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) = 
+<x>
+sbt.version={sbtVersion}
+def.scala.version={defScalaVersion}
+build.scala.versions={buildScalaVersions}
+</x>.text
+}
\ No newline at end of file
diff --git a/scripted/src/main/scala/TestScriptParser.scala b/scripted/src/main/scala/TestScriptParser.scala
deleted file mode 100644
index 84b8746c3..000000000
--- a/scripted/src/main/scala/TestScriptParser.scala
+++ /dev/null
@@ -1,264 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2009  Mark Harrah
- */
-
-package sbt.test
-
-import java.io.{BufferedReader, File, InputStreamReader}
-
-/*
-statement*
-statement ::= ('$' | '>') word+ '[' word ']'
-word ::= [^ \[\]]+
-comment ::= '#' [^ \n\r]* ('\n' | '\r' | eof)
-*/
-import scala.util.parsing.combinator._
-import scala.util.parsing.input.Positional
-
-import TestScriptParser._
-private class TestScriptParser(baseDirectory: File, log: Logger) extends RegexParsers with NotNull
-{
-	type Statement = Project => Either[String, ReloadProject]
-	type PStatement = Statement with Positional
-	
-	private def evaluateList(list: List[PStatement])(p: Project): WithProjectResult[Unit] =
-		list match
-		{
-			case Nil => ValueResult(())
-			case head :: tail =>
-				head(p) match
-				{
-					case Left(msg) => new ErrorResult(msg)
-					case Right(reload) => ContinueResult(p =>evaluateList(tail)(p), reload)
-				}
-		}
-
-	def script: Parser[Project => WithProjectResult[Unit]] = rep1(space ~> statement  <~ space) ^^ evaluateList
-	def statement: Parser[PStatement] =
-		positioned
-		{
-			(StartRegex ~! rep1(word) ~! "[" ~! word ~! "]") ^^
-			{
-				case start ~ command ~ open ~ result ~ close =>
-					val successExpected = result.toLowerCase == SuccessLiteral.toLowerCase
-					new Statement with Positional
-					{ selfPositional =>
-						def apply(p: Project) =
-						{
-							val result =
-								try
-								{
-									start match
-									{
-										case CommandStart => evaluateCommand(command, successExpected, selfPositional)(p)
-										case ActionStart => evaluateAction(command, successExpected)(p).toLeft(NoReload)
-									}
-								}
-								catch
-								{
-									case e: Exception =>
-										log.trace(e)
-										Left(e.toString)
-								}
-							result.left.map(message => linePrefix(this) + message)
-						}
-					}
-			}
-		}
-	private def linePrefix(p: Positional) = "{line " + p.pos.line + "} "
-	def space = """(\s+|(\#[^\n\r]*))*""".r
-	def word: Parser[String] =  ("\'" ~> "[^'\n\r]*".r <~ "\'")  |  ("\"" ~> "[^\"\n\r]*".r <~ "\"")  |  WordRegex
-	def parse(scriptFile: File): Either[String, Project => WithProjectResult[Unit]] =
-	{
-		def parseReader(reader: java.io.Reader) =
-			parseAll(script, reader) match
-			{
-				case Success(result, next) => Right(result)
-				case err: NoSuccess =>
-				{
-					val pos = err.next.pos
-					Left("Could not parse test script '" + scriptFile.getCanonicalPath + 
-					"' (" + pos.line + "," + pos.column + "): " + err.msg)
-				}
-			}
-		FileUtilities.readValue(scriptFile, log)(parseReader)
-	}
-	
-	private def scriptError(message: String): Some[String] = Some("Test script error: " + message)
-	private def wrongArguments(commandName: String, args: List[String]): Some[String] =
-		scriptError("Command '" + commandName + "' does not accept arguments (found '" + spacedString(args) + "').")
-	private def wrongArguments(commandName: String, requiredArgs: String, args: List[String]): Some[String] = 
-		scriptError("Wrong number of arguments to " + commandName + " command.  " + requiredArgs + " required, found: '" + spacedString(args) + "'.")
-	private def evaluateCommand(command: List[String], successExpected: Boolean, position: Positional)(project: Project): Either[String, ReloadProject] =
-	{
-		command match
-		{
-			case "reload" :: Nil => Right(if(successExpected) new ReloadSuccessExpected(linePrefix(position)) else ReloadErrorExpected)
-			case x => evaluateCommandNoReload(x, successExpected)(project).toLeft(NoReload)
-		}
-	}
-	private def evaluateCommandNoReload(command: List[String], successExpected: Boolean)(project: Project): Option[String] =
-	{
-		evaluate(successExpected, "Command '" + command.firstOption.getOrElse("") + "'", project)
-		{
-			command match
-			{
-				case Nil => scriptError("No command specified.")
-				case "touch" :: paths => touch(paths, project)
-				case "delete" :: paths => delete(paths, project)
-				case "mkdir" :: paths => makeDirectories(paths, project)
-				case "copy-file" :: from :: to :: Nil => copyFile(from, to, project)
-				case "copy-file" :: args => wrongArguments("copy-file", "Two paths", args)
-				case "sync" :: from :: to :: Nil => sync(from, to, project)
-				case "sync" :: args => wrongArguments("sync", "Two directory paths", args)
-				case "copy" :: paths => copy(paths, project)
-				case "exists" :: paths => exists(paths, project)
-				case "absent" :: paths => absent(paths, project)
-				case "pause" :: Nil => readLine("Press enter to continue. "); println(); None
-				case "pause" :: args => wrongArguments("pause", args)
-				case "newer" :: a :: b :: Nil => newer(a, b, project)
-				case "newer" :: args => wrongArguments("newer", "Two paths", args)
-				case "sleep" :: time :: Nil => trap("Error while sleeping:") { Thread.sleep(time.toLong) }
-				case "sleep" :: args => wrongArguments("sleep", "Time in milliseconds", args)
-				case "exec" :: command :: args => execute(command, args, project)
-				case "exec" :: other => wrongArguments("exec", "Command and arguments", other)
-				case "reload" :: args => wrongArguments("reload", args)
-				case unknown :: arguments => scriptError("Unknown command " + unknown)
-			}
-		}
-	}
-	private def foreachBufferedLogger(project: Project)(f: BufferedLogger => Unit)
-	{
-		project.topologicalSort.foreach(p => p.log match { case buffered: BufferedLogger => f(buffered); case _ => () })
-	}
-	private def evaluate(successExpected: Boolean, label: String, project: Project)(body: => Option[String]): Option[String] =
-	{
-		def startRecordingLog() { foreachBufferedLogger(project)(_.startRecording()) }
-		def clearLog() { foreachBufferedLogger(project)(_.clearAll()) }
-		def playLog(message: String) =
-		{
-			foreachBufferedLogger(project)(_.playAll())
-			Some(message)
-		}
-		
-		startRecordingLog()
-		try
-		{
-			val result = body
-			if(result.isEmpty == successExpected)
-				None
-			else
-			{
-				val mainMessage = result.map("failed (expected success): " + _).getOrElse("succeeded (expected failure).")
-				playLog(label + " " + mainMessage)
-			}
-		}
-		finally { clearLog() }
-	}
-	private def evaluateAction(action: List[String], successExpected: Boolean)(project: Project): Option[String] =
-	{
-		def actionToString = action.mkString(" ")
-		action match
-		{
-			case Nil => scriptError("No action specified.")
-			case head :: Nil if project.taskNames.toSeq.contains(head)=>
-					evaluate(successExpected, "Action '" + actionToString + "'", project)(project.act(head))
-			case head :: tail =>
-				evaluate(successExpected, "Method '" + actionToString + "'", project)(project.call(head, tail.toArray))
-		}
-	}
-	private def spacedString[T](l: Seq[T]) = l.mkString(" ")
-	private def wrap(result: Option[String]) = result.flatMap(scriptError)
-	private def trap(errorPrefix: String)(action: => Unit) = wrap( Control.trapUnit(errorPrefix, log) { action; None } )
-	
-	private def fromStrings(paths: List[String], project: Project) = paths.map(path => fromString(path, project))
-	private def fromString(path: String, project: Project) = Path.fromString(project.info.projectPath, path)
-	private def touch(paths: List[String], project: Project) =
-		if(paths.isEmpty)
-			scriptError("No paths specified for touch command.")
-		else
-			wrap(lazyFold(paths) { path => FileUtilities.touch(fromString(path, project), log) })
-		
-	private def delete(paths: List[String], project: Project) =
-		if(paths.isEmpty)
-			scriptError("No paths specified for delete command.")
-		else
-			wrap(FileUtilities.clean(fromStrings(paths, project), true, log))
-	private def sync(from: String, to: String, project: Project) =
-		wrap(FileUtilities.sync(fromString(from, project), fromString(to, project), log))
-	private def copyFile(from: String, to: String, project: Project) =
-		wrap(FileUtilities.copyFile(fromString(from, project), fromString(to, project), log))
-	private def copy(paths: List[String], project: Project) =
-		paths match
-		{
-			case Nil => scriptError("No paths specified for copy command.")
-			case path :: Nil => scriptError("No destination specified for copy command.")
-			case _ =>
-				val mapped = fromStrings(paths, project).toArray
-				val last = mapped.length - 1
-				wrap(FileUtilities.copy(mapped.take(last), mapped(last), log).left.toOption)
-		}
-	private def makeDirectories(paths: List[String], project: Project) =
-		fromStrings(paths, project) match
-		{
-			case Nil => scriptError("No paths specified for mkdir command.")
-			case p => FileUtilities.createDirectories(p, project.log)
-		}
-	private def newer(a: String, b: String, project: Project) =
-		trap("Error testing if '" + a + "' is newer than '" + b + "'")
-		{
-			val pathA = fromString(a, project)
-			val pathB = fromString(b, project)
-			pathA.exists && (!pathB.exists || pathA.lastModified > pathB.lastModified)
-		}
-	private def exists(paths: List[String], project: Project) =
-		fromStrings(paths, project).filter(!_.exists) match
-		{
-			case Nil => None
-			case x => Some("File(s) did not exist: " + x.mkString("[ ", " , ", " ]"))
-		}
-	private def absent(paths: List[String], project: Project) =
-		fromStrings(paths, project).filter(_.exists) match
-		{
-			case Nil => None
-			case x => Some("File(s) existed: " + x.mkString("[ ", " , ", " ]"))
-		}
-	private def execute(command: String, args: List[String], project: Project) =
-	{
-		if(command.trim.isEmpty)
-			Some("Command was empty.")
-		else
-		{
-			Control.trapUnit("Error running command: ", project.log)
-			{
-				val builder = new java.lang.ProcessBuilder((command :: args).toArray :  _*).directory(project.info.projectDirectory)
-				val exitValue = Process(builder) ! log
-				if(exitValue == 0)
-					None
-				else
-					Some("Nonzero exit value (" + exitValue + ")")
-			}
-		}
-	}
-}
-private object TestScriptParser
-{
-	val SuccessLiteral = "success"
-	val Failure = "error"
-	val CommandStart = "$"
-	val ActionStart = ">"
-	val WordRegex = """[^ \[\]\s'\"][^ \[\]\s]*""".r
-	val StartRegex = ("[" + CommandStart + ActionStart + "]").r
-	
-	final def lazyFold[T](list: List[T])(f: T => Option[String]): Option[String] =
-		list match
-		{
-			case Nil => None
-			case head :: tail =>
-				f(head) match
-				{
-					case None => lazyFold(tail)(f)
-					case x => x
-				}
-		}
-}
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index cbdc9eca1..c75357577 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -116,46 +116,115 @@ class xMain extends xsbti.AppMain
 			case r => r
 		}
 	}
+	/** This is the top-level command processing method. */
 	private def processArguments(baseProject: Project, arguments: List[String], configuration: xsbti.AppConfiguration, startTime: Long): xsbti.MainResult =
 	{
-		def process(project: Project, arguments: List[String], isInteractive: Boolean): xsbti.MainResult =
+		type OnFailure = Option[String]
+		def ExitOnFailure = None
+		lazy val interactiveContinue = Some( InteractiveCommand )
+		def remoteContinue(port: Int) = Some( FileCommandsPrefix + "-" + port )
+		
+		// replace in 2.8
+		trait Trampoline
+		class Done(val r: xsbti.MainResult) extends Trampoline
+		class Continue(project: Project, arguments: List[String], failAction: OnFailure) extends Trampoline {
+			def apply() = process(project, arguments, failAction)
+		}
+		def continue(project: Project, arguments: List[String], failAction: OnFailure) = new Continue(project, arguments, failAction)
+		def result(r: xsbti.MainResult) = new Done(r)
+		def run(t: Trampoline): xsbti.MainResult = t match { case d: Done => d.r; case c: Continue => run(c()) }
+
+		def process(project: Project, arguments: List[String], failAction: OnFailure): Trampoline =
 		{
-			def rememberCurrent(newArgs: List[String]) = if(baseProject.name != project.name) (ProjectAction + " " + project.name) :: newArgs else newArgs
+			project.log.debug("commands " + failAction.map("(on failure: " + _ + "): ").mkString + arguments.mkString(", "))
+			def rememberCurrent(newArgs: List[String]) = rememberProject(rememberFail(newArgs))
+			def rememberProject(newArgs: List[String]) = if(baseProject.name != project.name) (ProjectAction + " " + project.name) :: newArgs else newArgs
+			def rememberFail(newArgs: List[String]) = failAction.map(f => (FailureHandlerPrefix + f)).toList :::  newArgs
+			def failed(code: Int) =
+				failAction match
+				{
+					case Some(c) => continue(project, c :: Nil, ExitOnFailure)
+					case None => result( Exit(code) )
+				}
+				
 			arguments match
 			{
-				case "" :: tail => process(project, tail, isInteractive)
-				case (ExitCommand | QuitCommand) :: _ => Exit(NormalExitCode)
-				case RebootCommand :: tail => Reboot(project.defScalaVersion.value, rememberCurrent(tail), configuration)
-				case InteractiveCommand :: _ => process(project, prompt(baseProject, project) :: arguments, true)
+				case "" :: tail => continue(project, tail, failAction)
+				case (ExitCommand | QuitCommand) :: _ => result( Exit(NormalExitCode) )
+				case RebootCommand :: tail => result( Reboot(project.defScalaVersion.value, rememberCurrent(tail), configuration) )
+				case InteractiveCommand :: _ => continue(project, prompt(baseProject, project) :: arguments, interactiveContinue)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)
 						throw new ReloadException(rememberCurrent(action :: tail), Some(version))
 					else
-						process(project, action :: tail, isInteractive)
+						continue(project, action :: tail, failAction)
+
 				case CrossBuild(action) :: tail =>
-					if(checkAction(project, action)) process(project, CrossBuild(project, action) ::: tail, isInteractive)
-					else if(isInteractive) process(project, tail, isInteractive)
-					else Exit(UsageErrorExitCode)
+					if(checkAction(project, action))
+						process(project, CrossBuild(project, action) ::: tail, failAction)
+					else
+						failed(UsageErrorExitCode)
+
 				case SetProject(name) :: tail =>
 					SetProject(baseProject, name, project) match
 					{
-						case Some(newProject) => process(newProject, tail, isInteractive)
-						case None => process(project, if(isInteractive) tail else ExitCommand :: tail, isInteractive)
+						case Some(newProject) => continue(newProject, tail, failAction)
+						case None => failed(BuildErrorExitCode)
 					}
+					
 				case action :: tail if action.startsWith(FileCommandsPrefix) =>
-					val file = new File(baseProject.info.projectDirectory, action.substring(FileCommandsPrefix.length).trim)
-					readLines(project, file) match
+					getSource(action.substring(FileCommandsPrefix.length).trim, baseProject.info.projectDirectory) match
 					{
-						case Some(lines) => process(project, lines ::: tail , isInteractive)
-						case None => process(project, if(isInteractive) tail else ExitCommand :: tail, isInteractive)
+						case Left(portAndSuccess) =>
+							val port = Math.abs(portAndSuccess)
+							val previousSuccess = portAndSuccess >= 0
+							readMessage(port, previousSuccess) match
+							{
+								case Some(message) => continue(project, message :: (FileCommandsPrefix + port) :: Nil, remoteContinue(port))
+								case None =>
+									project.log.error("Connection closed.")
+									failed(BuildErrorExitCode)
+							}
+							
+						case Right(file) =>
+							readLines(project, file) match
+							{
+								case Some(lines) => continue(project, lines ::: tail , failAction)
+								case None => failed(UsageErrorExitCode)
+							}
 					}
+					
+				case action :: tail if action.startsWith(FailureHandlerPrefix) =>
+					val errorAction = action.substring(FailureHandlerPrefix.length).trim
+					continue(project, tail, if(errorAction.isEmpty) None else Some(errorAction) )
+					
 				case action :: tail =>
-					val success = processAction(baseProject, project, action, isInteractive)
-					if(success || isInteractive) process(project, tail, isInteractive) else Exit(BuildErrorExitCode)
-				case Nil => project.log.error("Invalid internal sbt state: no arguments"); Exit(ProgramErrorExitCode)
+					val success = processAction(baseProject, project, action, failAction == interactiveContinue)
+					if(success) continue(project, tail, failAction)
+					else failed(BuildErrorExitCode)
+						
+				case Nil =>
+					project.log.error("Invalid internal sbt state: no arguments")
+					result( Exit(ProgramErrorExitCode) )
 			}
 		}
-		process(baseProject, arguments, arguments.lastOption == Some(InteractiveCommand))
+		run(process(baseProject, arguments, ExitOnFailure))
+	}
+	private def isInteractive(failureActions: Option[List[String]]) = failureActions == Some(InteractiveCommand :: Nil)
+	private def getSource(action: String, baseDirectory: File) =
+	{
+		try { Left(action.toInt) }
+		catch { case _: NumberFormatException => Right(new File(baseDirectory, action)) }
+	}
+	private def readMessage(port: Int, previousSuccess: Boolean): Option[String] =
+	{
+		// split into two connections because this first connection ends the previous communication
+		xsbt.IPC.client(port) { _.send(previousSuccess.toString) }
+		//   and this second connection starts the next communication
+		xsbt.IPC.client(port) { ipc =>
+			val message = ipc.receive
+			if(message eq null) None else Some(message)
+		}
 	}
 	object SetProject
 	{
@@ -261,8 +330,10 @@ class xMain extends xsbti.AppMain
 	* Scala version between this prefix and the space (i.e. '++version action' means execute 'action' using
 	* Scala version 'version'. */
 	val SpecificBuildPrefix = "++"
-	/** The prefix used to identify a file to read commands from. */
+	/** The prefix used to identify a file or local port to read commands from. */
 	val FileCommandsPrefix = "<"
+	/** The prefix used to identify the action to run after an error*/
+	val FailureHandlerPrefix = "!"
 
 	/** The number of seconds between polling by the continuous compile command.*/
 	val ContinuousCompilePollDelaySeconds = 1
diff --git a/src/sbt-test/actions/interactive/test b/src/sbt-test/actions/interactive/test
index 58946fe31..5493ef914 100644
--- a/src/sbt-test/actions/interactive/test
+++ b/src/sbt-test/actions/interactive/test
@@ -1,46 +1,46 @@
 # This test verifies the behavior of actions declared interactive
 
 # Single project, non-interactive task
-> interactive-test [success]
-$ exists ran [success]
-$ delete ran [success]
+> interactive-test
+$ exists ran
+$ delete ran
 
 # Single project, interactive task
-$ copy-file changes/TestProject2.scala project/build/src/TestProject.scala [success]
-$ reload [success]
-> interactive-test [success]
-$ exists ran [success]
-$ delete ran [success]
+$ copy-file changes/TestProject2.scala project/build/src/TestProject.scala
+> reload
+> interactive-test
+$ exists ran
+$ delete ran
 
 # Multi-project, single interactive task on parent project
-$ copy-file changes/TestProject3.scala project/build/src/TestProject.scala [success]
-$ reload [success]
-> interactive-test [success]
-$ exists ran [success]
-$ delete ran [success]
+$ copy-file changes/TestProject3.scala project/build/src/TestProject.scala
+> reload
+> interactive-test
+$ exists ran
+$ delete ran
 
 # Multi-project, single interactive task on child project
-$ copy-file changes/TestProject4.scala project/build/src/TestProject.scala [success]
-$ reload [success]
-> interactive-test [failure]
+$ copy-file changes/TestProject4.scala project/build/src/TestProject.scala
+> reload
+-> interactive-test
 
 # Multi-project, two interactive tasks with same name, which is allowed because it is defined on parent
-$ copy-file changes/TestProject5.scala project/build/src/TestProject.scala [success]
-$ reload [success]
-> interactive-test [success]
-$ exists "ran" [success]
-$ delete "ran" [success]
+$ copy-file changes/TestProject5.scala project/build/src/TestProject.scala
+> reload
+> interactive-test
+$ exists "ran"
+$ delete "ran"
 
 # Multi-project, interactive on subproject + non-interactive on parent, which cannot be run from parent
-$ copy-file changes/TestProject6.scala project/build/src/TestProject.scala [success]
-$ reload [success]
-> interactive-test [failure]
+$ copy-file changes/TestProject6.scala project/build/src/TestProject.scala
+> reload
+-> interactive-test
 
 # Multi-project, two non-interactive tasks with same name, which is allowed
-$ copy-file changes/TestProject7.scala project/build/src/TestProject.scala [success]
-$ reload [success]
-> interactive-test [success]
-$ exists "ran" [success]
-$ exists "a/ran" [success]
-$ delete "ran" [success]
-$ delete "a/ran" [success]
\ No newline at end of file
+$ copy-file changes/TestProject7.scala project/build/src/TestProject.scala
+> reload
+> interactive-test
+$ exists "ran"
+$ exists "a/ran"
+$ delete "ran"
+$ delete "a/ran"
\ No newline at end of file
diff --git a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
index f9ab1439c..e08ad8e61 100644
--- a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
+++ b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
@@ -3,5 +3,4 @@ import sbt._
 class TestProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.fromFile(FileUtilities.sbtJar)
-	val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default"
 }
diff --git a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
index 1b58be453..b81426eb7 100644
--- a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
+++ b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
@@ -1,12 +1,15 @@
 package foo.bar
 
+import java.io.File
+import java.net.{URISyntaxException, URL}
+
 class Holder { var value: Any = _ }
 
 import scala.tools.nsc.{Interpreter, Settings}
 
 class Foo {
 	val settings = new Settings()
-	settings.classpath.value = sbt.FileUtilities.classLocationFile[Holder].getAbsolutePath
+	settings.classpath.value = location(classOf[Holder])
 	val inter = new Interpreter(settings)
 
 	def eval(code: String): Any = {
@@ -15,6 +18,10 @@ class Foo {
 		val r = inter.interpret("$r_.value = " + code)
 		h.value
 	}
+	def location(c: Class[_]) =  toFile(c.getProtectionDomain.getCodeSource.getLocation).getAbsolutePath
+	def toFile(url: URL) =
+		try { new File(url.toURI) }
+		catch { case _: URISyntaxException => new File(url.getPath) }
 }
 
 object Test
@@ -22,6 +29,6 @@ object Test
 	def main(args: Array[String])
 	{
 		val foo = new Foo
-		foo.eval("3")
+		args.foreach { arg =>  foo.eval(arg) == arg.toInt }
 	}
 }
diff --git a/src/sbt-test/compiler-project/run-test/src/test/scala/FooTest.scala b/src/sbt-test/compiler-project/run-test/src/test/scala/FooTest.scala
deleted file mode 100644
index fb0601e2d..000000000
--- a/src/sbt-test/compiler-project/run-test/src/test/scala/FooTest.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo.bar
-
-import org.scalacheck._
-
-object FooTest extends Properties("Foo")
-{
-	specify("Set", (i: Int) => { try {
-		val foo = new Foo
-		foo.eval(i.toString) == i
-	} catch { case e => e.printStackTrace(); false } 
-	})
-}
\ No newline at end of file
diff --git a/src/sbt-test/compiler-project/run-test/test b/src/sbt-test/compiler-project/run-test/test
index dd9d7d54a..15139f18e 100644
--- a/src/sbt-test/compiler-project/run-test/test
+++ b/src/sbt-test/compiler-project/run-test/test
@@ -1,11 +1,8 @@
-> update
-[success]
+> +run 1
+> +clean
 
-> run
-[success]
+> +run 2
+> +clean
 
-> clean
-[success]
-
-> test
-[success]
+> +run -1
+> +clean
\ No newline at end of file
diff --git a/src/sbt-test/java/analysis/test b/src/sbt-test/java/analysis/test
index 0e5cfa345..3641069b7 100644
--- a/src/sbt-test/java/analysis/test
+++ b/src/sbt-test/java/analysis/test
@@ -1,2 +1 @@
-> compile
-[success]
\ No newline at end of file
+> +compile
\ No newline at end of file
diff --git a/src/sbt-test/java/basic/project/build.properties b/src/sbt-test/java/basic/project/build.properties
index 3a234a13f..43f4b082f 100644
--- a/src/sbt-test/java/basic/project/build.properties
+++ b/src/sbt-test/java/basic/project/build.properties
@@ -1,5 +1,3 @@
-#Project properties
-#Sat Apr 18 15:22:08 EDT 2009
 project.organization=empty
 project.name=Java Test
-project.version=1.0
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/java/basic/test b/src/sbt-test/java/basic/test
index 0e5cfa345..3641069b7 100644
--- a/src/sbt-test/java/basic/test
+++ b/src/sbt-test/java/basic/test
@@ -1,2 +1 @@
-> compile
-[success]
\ No newline at end of file
+> +compile
\ No newline at end of file
diff --git a/src/sbt-test/java/options/project/build/src/JavaProject.scala b/src/sbt-test/java/options/project/build/src/JavaProject.scala
index 99bdd529e..5dbd40e0a 100644
--- a/src/sbt-test/java/options/project/build/src/JavaProject.scala
+++ b/src/sbt-test/java/options/project/build/src/JavaProject.scala
@@ -5,4 +5,5 @@ class JavaProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	// make the source target 1.4 so that we get an error when these options are used
 	override def javaCompileOptions = ("-source" :: "1.4" :: Nil).map(JavaCompileOption(_))
+	println(FileUtilities.classLocationFile[JavaProject])
 }
\ No newline at end of file
diff --git a/src/sbt-test/java/options/test b/src/sbt-test/java/options/test
index a10e99135..aa3abd024 100644
--- a/src/sbt-test/java/options/test
+++ b/src/sbt-test/java/options/test
@@ -1,2 +1,7 @@
-> compile
-[failure]
\ No newline at end of file
+# need explicit versions here because we want:
+#   fail forall versions
+# and not
+#   fail for any version
+-> ++2.7.7 compile
+-> ++2.8.0-SNAPSHOT compile
+-> ++2.7.2 compile
\ No newline at end of file
diff --git a/src/sbt-test/java/separate/test b/src/sbt-test/java/separate/test
index fc6cce7bf..1796e8a3d 100644
--- a/src/sbt-test/java/separate/test
+++ b/src/sbt-test/java/separate/test
@@ -1,9 +1,4 @@
 > clean
-[success]
-
 > test
-[success]
-
 # this will fail if the sources are recompiled again (see the project definition)
-> test
-[success]
\ No newline at end of file
+> test
\ No newline at end of file
diff --git a/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala b/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
index 4119dca17..bc8b8342a 100644
--- a/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
+++ b/src/sbt-test/java/track-anonymous/project/build/AnonTest.scala
@@ -2,4 +2,12 @@ import sbt._
 class AnonTest(info: ProjectInfo) extends DefaultProject(info)
 {
   override def compileOrder = CompileOrder.JavaThenScala
+  lazy val checkOutput = task { args => println(args.mkString); checkOutputTask(args(0) == "exists") }
+  private def checkOutputTask(shouldExist: Boolean) = 
+	  task
+	  {
+		  if((mainCompilePath / "Anon.class").exists != shouldExist) Some("Top level class incorrect" )
+		  else if( (mainCompilePath / "Anon$1.class").exists != shouldExist) Some("Inner class incorrect" )
+		  else None
+	  }
 }
\ No newline at end of file
diff --git a/src/sbt-test/java/track-anonymous/test b/src/sbt-test/java/track-anonymous/test
index 75a470c0e..ebdf4ee0a 100644
--- a/src/sbt-test/java/track-anonymous/test
+++ b/src/sbt-test/java/track-anonymous/test
@@ -1,17 +1,6 @@
 $ copy-file changes/Anon.java src/main/java/Anon.java
-[success]
-
-> compile
-[success]
-
-$ exists target/classes/Anon.class target/classes/Anon$1.class
-[success]
-
+> +compile
+> +check-output exists
 $ delete src/main/java/Anon.java
-[success]
-
-> compile
-[success]
-
-$ absent target/classes/Anon.class target/classes/Anon$1.class
-[success]
\ No newline at end of file
+> +compile
+> +check-output absent
\ No newline at end of file

From 5fd4ec6fa477d0e5aa12e49d73b4c9a277d62814 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 5 Dec 2009 10:36:41 -0500
Subject: [PATCH 173/268] 0.6.5

---
 project/build.properties          | 2 +-
 project/plugins/Plugins.scala     | 2 +-
 scripted/project/build.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 425e2defc..4c694537f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.5-p1
+project.version=0.6.5
 scala.version=2.7.5
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 86482bb22..75955487a 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.6.5-p1"
+	val scripted = "org.scala-tools.sbt" % "test" % "0.6.5"
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 550e1d499..7145a46bc 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -3,6 +3,6 @@
 project.organization=org.scala-tools.sbt
 project.name=test
 sbt.version=0.5.6
-project.version=0.6.5-p1
+project.version=0.6.5
 scala.version=2.7.5
 project.initialize=false

From 24464ccbe73e13e396b6a517150f6014ac902959 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 5 Dec 2009 10:44:29 -0500
Subject: [PATCH 174/268] Correct repositories for publishing

---
 project/build/SbtProject.scala       | 2 +-
 scripted/project/build/SbtTest.scala | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 044d1a6c9..9b1e8e7a0 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -15,7 +15,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	override def normalizedName = "sbt"
 
 	override def managedStyle = ManagedStyle.Ivy
-	val publishTo = Resolver.file("test-repo", (Path.userHome / ".ivy2" / "test").asFile)
+	val publishTo = Resolver.file("technically", new File("/var/dbwww/repo/"))
 
 	override def compileOptions = Nil
 	
diff --git a/scripted/project/build/SbtTest.scala b/scripted/project/build/SbtTest.scala
index f0b8c1cce..23afd4c93 100644
--- a/scripted/project/build/SbtTest.scala
+++ b/scripted/project/build/SbtTest.scala
@@ -7,7 +7,7 @@ import sbt._
 class SbtTest(info: ProjectInfo) extends PluginProject(info)
 {
 	val xsbtTest = "org.scala-tools.sbt" %% "test" % version.toString
-	
-	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
-	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
+
+	override def managedStyle = ManagedStyle.Ivy
+	val publishTo = Resolver.file("technically", new File("/var/dbwww/repo/"))
 }
\ No newline at end of file

From 04ae140d1236b97f4df9dddb5ecdb093fcd4750c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 5 Dec 2009 10:46:20 -0500
Subject: [PATCH 175/268] correct error

---
 scripted/project/build/SbtTest.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripted/project/build/SbtTest.scala b/scripted/project/build/SbtTest.scala
index 23afd4c93..896e1b933 100644
--- a/scripted/project/build/SbtTest.scala
+++ b/scripted/project/build/SbtTest.scala
@@ -9,5 +9,5 @@ class SbtTest(info: ProjectInfo) extends PluginProject(info)
 	val xsbtTest = "org.scala-tools.sbt" %% "test" % version.toString
 
 	override def managedStyle = ManagedStyle.Ivy
-	val publishTo = Resolver.file("technically", new File("/var/dbwww/repo/"))
+	val publishTo = Resolver.file("technically", new java.io.File("/var/dbwww/repo/"))
 }
\ No newline at end of file

From 4902c3f1b31a2004108b6f4d770f75c10ea8fdee Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 5 Dec 2009 11:02:41 -0500
Subject: [PATCH 176/268] Fixing repositories...

---
 project/build/SbtProject.scala | 4 +++-
 project/plugins/Plugins.scala  | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 9b1e8e7a0..3b9b79f04 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -4,6 +4,7 @@
 import sbt._
 
 import java.io.File
+import java.net.URL
 
 class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted
 {
@@ -15,7 +16,8 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	override def normalizedName = "sbt"
 
 	override def managedStyle = ManagedStyle.Ivy
-	val publishTo = Resolver.file("technically", new File("/var/dbwww/repo/"))
+	//val publishTo = Resolver.file("technically", new File("/var/dbwww/repo/"))
+	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 
 	override def compileOptions = Nil
 	
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 75955487a..f974c9607 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -1,6 +1,9 @@
 import sbt._
 
+import java.net.URL
+
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
 	val scripted = "org.scala-tools.sbt" % "test" % "0.6.5"
+	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }

From 9bfc8a8f4a9b8771e4cf5485df88386532e9a123 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 6 Dec 2009 22:58:53 -0500
Subject: [PATCH 177/268] Better handling of invalid Scala versions

---
 project/build.properties          |  6 +++--
 project/plugins/Plugins.scala     |  2 +-
 scripted/project/build.properties |  4 +--
 src/main/scala/sbt/Main.scala     | 42 +++++++++++++++++++++++++------
 src/main/scala/sbt/Project.scala  | 32 +++++++++++++++++------
 5 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 4c694537f..c3fcade05 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,7 @@
+#Project properties
+#Sun Dec 06 21:31:48 EST 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.5
-scala.version=2.7.5
+project.version=0.6.6
+scala.version=2.7.7
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index f974c9607..caa313044 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,6 +4,6 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.6.5"
+	val scripted = "org.scala-tools.sbt" % "test" % "0.6.6"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 7145a46bc..8cda32990 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -3,6 +3,6 @@
 project.organization=org.scala-tools.sbt
 project.name=test
 sbt.version=0.5.6
-project.version=0.6.5
-scala.version=2.7.5
+project.version=0.6.6
+scala.version=2.7.7
 project.initialize=false
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index c75357577..d3d573d8d 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -155,13 +155,24 @@ class xMain extends xsbti.AppMain
 				case InteractiveCommand :: _ => continue(project, prompt(baseProject, project) :: arguments, interactiveContinue)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)
-						throw new ReloadException(rememberCurrent(action :: tail), Some(version))
+					{
+						if(checkVersion(baseProject, version))
+							throw new ReloadException(rememberCurrent(action :: tail), Some(version))
+						else
+							failed(UsageErrorExitCode)
+					}
 					else
 						continue(project, action :: tail, failAction)
 
 				case CrossBuild(action) :: tail =>
 					if(checkAction(project, action))
-						process(project, CrossBuild(project, action) ::: tail, failAction)
+					{
+						CrossBuild(project, action) match
+						{
+							case Some(actions) => continue(project, actions ::: tail, failAction)
+							case None => failed(UsageErrorExitCode)
+						}
+					}
 					else
 						failed(UsageErrorExitCode)
 
@@ -257,21 +268,35 @@ class xMain extends xsbti.AppMain
 				None
 		}
 	}
+	def checkVersion(p: Project, version: String) =
+	{
+		try { p.getScalaInstance(version); true }
+		catch { case e: xsbti.RetrieveException => p.log.error(e.getMessage); false }
+	}
 	object CrossBuild
 	{
 		def unapply(s: String) = if(s.startsWith(CrossBuildPrefix) && !s.startsWith(SpecificBuildPrefix)) Some(s.substring(1)) else None
-		def apply(project: Project, action: String) =
+		def apply(project: Project, action: String): Option[List[String]] =
 		{
 			val againstScalaVersions = project.crossScalaVersions
 			if(againstScalaVersions.isEmpty)
 			{
 				Console.println("Project does not declare any Scala versions to cross-build against, building against current version...")
-				action :: Nil
+				Some(action :: Nil)
 			}
 			else
-				againstScalaVersions.toList.map(SpecificBuildPrefix + _ + " " + action) ::: // build against all versions
-					(SpecificBuildPrefix + project.buildScalaVersion) :: // reset to the version before the cross-build
-					Nil
+			{
+				if( !againstScalaVersions.forall(v => checkVersion(project, v)) )
+					None
+				else
+				{
+					val actions = 
+						againstScalaVersions.toList.map(SpecificBuildPrefix + _ + " " + action) ::: // build against all versions
+							(SpecificBuildPrefix + project.buildScalaVersion) :: // reset to the version before the cross-build
+							Nil
+					Some(actions)
+				}
+			}
 		}
 	}
 	private def readLines(project: Project, file: File): Option[List[String]] =
@@ -382,7 +407,7 @@ class xMain extends xsbti.AppMain
 		printCmd(ShowActions, "Shows all available actions.")
 		printCmd(RebootCommand, "Reloads sbt, picking up modifications to sbt.version or scala.version and recompiling modified project definitions.")
 		printCmd(HelpAction, "Displays this help message.")
-		printCmd(ShowCurrent, "Shows the current project and logging level of that project.")
+		printCmd(ShowCurrent, "Shows the current project, Scala version, and logging level.")
 		printCmd(Level.levels.mkString(", "), "Set logging for the current project to the specified level.")
 		printCmd(TraceCommand, "Toggles whether logging stack traces is enabled.")
 		printCmd(ProjectAction + " <project name>", "Sets the currently active project.")
@@ -408,6 +433,7 @@ class xMain extends xsbti.AppMain
 			case ProjectAction => setProjectError(project.log)
 			case ShowCurrent =>
 				printProject("Current project is ", project)
+				Console.println("Current Scala version is " + project.buildScalaVersion)
 				Console.println("Current log level is " + project.log.getLevel)
 				printTraceEnabled(project)
 				true
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 59e931711..53f67a754 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -227,10 +227,24 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	/** The definitive source for the version of Scala being used to *build* the project.*/
 	def buildScalaVersion = info.buildScalaVersion.getOrElse(crossScalaVersions.first)
 
+
 	def componentManager = new xsbt.ComponentManager(info.launcher.globalLock, info.app.components, log)
-	def buildScalaInstance =
-		localScalaInstances.find(_.version == buildScalaVersion) getOrElse
-			xsbt.ScalaInstance(buildScalaVersion, info.launcher)
+	def buildScalaInstance = buildScalaInstance0
+	final def buildScalaInstance0: ScalaInstance =
+	{
+		try { getScalaInstance(buildScalaVersion) }
+		catch { case e: xsbti.RetrieveException if info.buildScalaVersion.isEmpty => // only catch the exception if this is the default Scala version
+			log.error(e.getMessage)
+			SimpleReader.readLine("\nProvide a new Scala version or press enter to exit: ") match
+			{
+				case Some(v) if v.length > 0=> buildScalaVersions() = v; saveEnvironment(); buildScalaInstance0
+				case _ => throw e
+			}
+		}
+	}
+	def getScalaInstance(version: String) =
+		localScalaInstances.find(_.version == version) getOrElse
+			xsbt.ScalaInstance(version, info.launcher)
 	lazy val localScalaInstances: Seq[ScalaInstance] = localScala ++ info.parent.toList.flatMap(_.localScalaInstances)
 	def localScala: Seq[ScalaInstance] = Nil
 	def buildCompiler = new AnalyzingCompiler(buildScalaInstance, componentManager)
@@ -348,12 +362,14 @@ object Project
 			case e: Exception => errorLoadingProject(e, log)
 		}
 	}
-	/** Logs the stack trace and returns an error message in Left.*/
 	private def errorLoadingProject(e: Throwable, log: Logger) =
-	{
-		log.trace(e)
-		new LoadError("Error loading project: " + e.toString)
-	}
+		e match
+		{
+			case _: xsbti.RetrieveException => LoadSetupDeclined
+			case _ =>
+				log.trace(e)
+				new LoadError("Error loading project: " + e.toString)
+		}
 	/** Loads the project for the given `info` and represented by an instance of 'builderClass'.*/
 	private[sbt] def constructProject[P <: Project](info: ProjectInfo, builderClass: Class[P]): P =
 		builderClass.getConstructor(classOf[ProjectInfo]).newInstance(info)

From ef0bc1f2e4759565d903dbf06d244818e27f3016 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 7 Dec 2009 08:38:35 -0500
Subject: [PATCH 178/268] Update completions to include ++ and exit/quit

---
 src/main/scala/sbt/LineReader.scala | 10 ++++++++--
 src/main/scala/sbt/Main.scala       |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/sbt/LineReader.scala b/src/main/scala/sbt/LineReader.scala
index 2bd655bef..558b08936 100644
--- a/src/main/scala/sbt/LineReader.scala
+++ b/src/main/scala/sbt/LineReader.scala
@@ -9,6 +9,7 @@ trait LineReader extends NotNull
 }
 class Completors(val projectAction: String, val projectNames: Iterable[String],
 	val generalCommands: Iterable[String], val propertyActions: Iterable[String],
+	val specificPrefix: String, val scalaVersions: Iterable[String],
 	val prefixes: Iterable[String]) extends NotNull
 import jline.ConsoleReader
 abstract class JLine extends LineReader
@@ -102,7 +103,12 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
 	private def propertyCompletor(propertyNames: Iterable[String]) =
 		simpleArgumentCompletor(propertyActions, propertyNames)
 	private def prefixedCompletor(baseCompletor: Completor) =
-		singleArgumentCompletor(simpleCompletor(prefixes.toList.toArray[String]), baseCompletor)
+		singleArgumentCompletor(simpleCompletor(prefixes), baseCompletor)
+	private def specificCompletor(baseCompletor: Completor) =
+	{
+		val specific = simpleCompletor(specificPrefix :: Nil) // TODO
+		new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
+	}
 	def setVariableCompletions(taskNames: Iterable[String], propertyNames: Iterable[String], extra: Iterable[(String, Iterable[String])] )
 	{
 		import scala.collection.immutable.TreeSet
@@ -110,6 +116,6 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
 		val extraCompletors = for( (first, repeat) <- extra) yield repeatedArgumentCompletor(simpleCompletor(first :: Nil), simpleCompletor(repeat))
 		val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
 		val baseCompletor = new MultiCompletor(baseCompletors.toArray)
-		completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor)) )
+		completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor), specificCompletor(baseCompletor)) )
 	}
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index d3d573d8d..918114f0a 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -258,7 +258,7 @@ class xMain extends xsbti.AppMain
 	object SpecificBuild
 	{
 		import java.util.regex.Pattern.{compile,quote}
-		val pattern = compile(quote(SpecificBuildPrefix) + """(\S+)\s*(.*)""")
+		val pattern = compile(quote(SpecificBuildPrefix) + """\s*(\S+)\s*(.*)""")
 		def unapply(s: String) =
 		{
 			val m = pattern.matcher(s)
@@ -313,7 +313,8 @@ class xMain extends xsbti.AppMain
 	{
 		val projectNames = baseProject.projectClosure.map(_.name)
 		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
-		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), prefixes)
+		val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value)
+		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), SpecificBuildPrefix, scalaVersions, prefixes)
 		val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log)
 		val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
 		reader.setVariableCompletions(project.taskNames, project.propertyNames, methodCompletions)
@@ -365,7 +366,7 @@ class xMain extends xsbti.AppMain
 
 	/** The list of all available commands at the interactive prompt in addition to the tasks defined
 	* by a project.*/
-	protected def interactiveCommands: Iterable[String] = basicCommands.toList ++ logLevels.toList
+	protected def interactiveCommands: Iterable[String] = basicCommands.toList ++ logLevels.toList ++ TerminateActions
 	/** The list of logging levels.*/
 	private def logLevels: Iterable[String] = TreeSet.empty[String] ++ Level.levels.map(_.toString)
 	/** The list of all interactive commands other than logging level.*/

From dfdb9456f7bde880f3694fea8312ade8f5fdeb58 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 7 Dec 2009 19:04:37 -0500
Subject: [PATCH 179/268] * fix naming clash between xsbt/sbt test libraries *
 correct classpath for plugin projects

---
 project/build/SbtProject.scala                | 3 +++
 project/plugins/Plugins.scala                 | 2 +-
 scripted/project/build.properties             | 2 +-
 scripted/src/main/scala/Scripted.scala        | 2 +-
 src/main/scala/sbt/BuilderProject.scala       | 6 +++---
 src/test/scala/sbt/ReflectSpecification.scala | 3 ++-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 3b9b79f04..cecba01f9 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -50,6 +50,9 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 
 	override def crossScalaVersions = Set(Version2_7_5)
 
+	//testing
+	val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6"
+
 	val ivy = "org.apache.ivy" % "ivy" % "2.0.0" intransitive()
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index caa313044..d3cdcc43b 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,6 +4,6 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "test" % "0.6.6"
+	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.6"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 8cda32990..fb0ede1fa 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
 #Sat Aug 01 10:32:20 EDT 2009
 project.organization=org.scala-tools.sbt
-project.name=test
+project.name=scripted
 sbt.version=0.5.6
 project.version=0.6.6
 scala.version=2.7.7
diff --git a/scripted/src/main/scala/Scripted.scala b/scripted/src/main/scala/Scripted.scala
index 9344bc2ee..f46ee4d42 100644
--- a/scripted/src/main/scala/Scripted.scala
+++ b/scripted/src/main/scala/Scripted.scala
@@ -4,7 +4,7 @@
 package sbt.test
 
 import Scripted._
-import FileUtilities.{sbtJar, scalaCompilerJar, scalaLibraryJar, wrapNull}
+import FileUtilities.wrapNull
 import java.io.File
 import java.net.URLClassLoader
 
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index 7152ac2c0..4483c7117 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -32,8 +32,8 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 		log.setLevel(oldLevel)
 	}
 
-	def projectClasspath = compilePath +++ libraries +++ sbtJarPath
-	def sbtJarPath = Path.lazyPathFinder { Path.fromFile(FileUtilities.sbtJar) :: Nil }
+	def projectClasspath = compilePath +++ libraries +++ sbtJars
+	def sbtJars = Path.lazyPathFinder { info.app.mainClasspath.map(Path.fromFile) }
 
 	abstract class BuilderCompileConfiguration extends AbstractCompileConfiguration
 	{
@@ -195,7 +195,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 				def sourceRoots = managedSourcePath
 				def sources = descendents(sourceRoots, sourceFilter)
 				def outputDirectory = outputPath / "plugin-classes"
-				def classpath: PathFinder = pluginClasspath +++ sbtJarPath
+				def classpath: PathFinder = pluginClasspath +++ sbtJars
 				def analysisPath = outputPath / "plugin-analysis"
 			}
 	}
diff --git a/src/test/scala/sbt/ReflectSpecification.scala b/src/test/scala/sbt/ReflectSpecification.scala
index 082359a78..515c220a5 100644
--- a/src/test/scala/sbt/ReflectSpecification.scala
+++ b/src/test/scala/sbt/ReflectSpecification.scala
@@ -105,9 +105,10 @@ object ReflectiveCreate
 			val sourceFile = source.asFile
 			val outputDirectory = basePath / "target"
 			for(writeOK <- FileUtilities.write(sourceFile, codeString, log).toLeft("").right;
-				compileOK <- (new Compile(100))("reflect", source :: Nil, "", outputDirectory, Nil, log).toLeft("").right)
+				compileOK <- Left("").right)//(new RawCompile(100))("reflect", source :: Nil, "", outputDirectory, Nil, log).toLeft("").right)
 			yield
 			{
+				error("Reintegrate")
 				val loader = new java.net.URLClassLoader(Array(outputDirectory.asURL), getClass.getClassLoader)
 				val c = Class.forName(instantiate.name, true, loader)
 				c.newInstance.asInstanceOf[AnyRef]

From e899f51c5ac318f2eddb8b00921da47223f58d8a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 8 Dec 2009 08:27:42 -0500
Subject: [PATCH 180/268] Add 'test-run' method analogous to 'run' but for test
 classes

---
 src/main/scala/sbt/DefaultProject.scala | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 7457bc01d..397981119 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -29,10 +29,12 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	* `promptIfMultipleChoices` controls the behavior when multiple main classes are detected.
 	* If true, it prompts the user to select which main class to use.  If false, it prints a warning
 	* and returns no main class.*/
-	def getMainClass(promptIfMultipleChoices: Boolean) =
-		mainClass orElse
+	def getMainClass(promptIfMultipleChoices: Boolean): Option[String] =
+		getMainClass(promptIfMultipleChoices, mainCompileConditional, mainClass)
+	def getMainClass(promptIfMultipleChoices: Boolean, compileConditional: CompileConditional, explicit: Option[String]): Option[String] =
+		explicit orElse
 		{
-			val applications = mainCompileConditional.analysis.allApplications.toList
+			val applications = compileConditional.analysis.allApplications.toList
 			impl.SelectMainClass(promptIfMultipleChoices, applications) orElse
 			{
 				if(!promptIfMultipleChoices && !applications.isEmpty)
@@ -40,6 +42,10 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 				None
 			}
 		}
+	def testMainClass: Option[String] = None
+	def getTestMainClass(promptIfMultipleChoices: Boolean): Option[String] =
+		getMainClass(promptIfMultipleChoices, testCompileConditional, testMainClass)
+
 	/** Specifies the value of the `Class-Path` attribute in the manifest of the main jar. */
 	def manifestClassPath: Option[String] = None
 	def dependencies = info.dependencies ++ subProjects.values.toList
@@ -243,6 +249,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def compileAction = task { doCompile(mainCompileConditional) } describedAs MainCompileDescription
 	protected def testCompileAction = task { doCompile(testCompileConditional) } dependsOn compile describedAs TestCompileDescription
 	protected def cleanAction = cleanTask(outputPath, cleanOptions) describedAs CleanDescription
+	protected def testRunAction = task { args => runTask(getTestMainClass(true), testClasspath, args) dependsOn(testCompile, copyResources) } describedAs TestRunDescription
 	protected def runAction = task { args => runTask(getMainClass(true), runClasspath, args) dependsOn(compile, copyResources) } describedAs RunDescription
 	protected def consoleQuickAction = basicConsoleTask describedAs ConsoleQuickDescription
 	protected def consoleAction = basicConsoleTask.dependsOn(testCompile, copyResources, copyTestResources) describedAs ConsoleDescription
@@ -286,6 +293,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	lazy val doc = docAction
 	lazy val docTest = docTestAction
 	lazy val test = testAction
+	lazy val testRun = testRunAction
 	lazy val `package` = packageAction
 	lazy val packageTest = packageTestAction
 	lazy val packageDocs = packageDocsAction
@@ -419,6 +427,8 @@ object BasicScalaProject
 		"Generates API documentation for test Scala source files using scaladoc."
 	val RunDescription =
 		"Runs the main class for the project with the provided arguments."
+	val TestRunDescription =
+		"Runs a test class with a main method with the provided arguments."
 	val ConsoleDescription =
 		"Starts the Scala interpreter with the project classes on the classpath."
 	val ConsoleQuickDescription =

From 0120326160ef324c0ee5c5c9245473964929b4ab Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 12 Dec 2009 08:38:35 -0500
Subject: [PATCH 181/268] 0.6.7 for publishing

---
 project/build.properties             |  2 +-
 project/build/SbtProject.scala       | 10 +++++-----
 project/plugins/Plugins.scala        |  2 +-
 scripted/project/build.properties    |  4 +---
 src/main/scala/sbt/Conditional.scala |  4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index c3fcade05..83378f0db 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -3,5 +3,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.6
+project.version=0.6.7
 scala.version=2.7.7
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index cecba01f9..c5506e9c5 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -20,7 +20,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 
 	override def compileOptions = Nil
-	
+
 	/**  configuration of scripted testing **/
 	// Set to false to show logging as it happens without buffering, true to buffer until it completes and only show if the task fails.
 	//   The output of scripted tasks executed in parallel will be inteleaved if true.
@@ -43,12 +43,12 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val provided = Configurations.Provided
 
 	/* Versions of Scala to cross-build against. */
-	private val Version2_7_5 = "2.7.5"
-	private val Version2_8_0 = "2.8.0-20090929.004247-+"
+	private val Version2_7_7 = "2.7.7"
+	private val Version2_8_0 = "2.8.0-SNAPSHOT"
 	// the list of all supported versions
-	private def allVersions = Version2_7_5 :: Version2_8_0 :: Nil
+	private def allVersions = Version2_7_7 :: Version2_8_0 :: Nil
 
-	override def crossScalaVersions = Set(Version2_7_5)
+	override def crossScalaVersions = Set(Version2_7_7)
 
 	//testing
 	val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6"
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index d3cdcc43b..a21f23274 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,6 +4,6 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.6"
+	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.7"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index fb0ede1fa..67ee86e12 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,8 +1,6 @@
-#Project properties
-#Sat Aug 01 10:32:20 EDT 2009
 project.organization=org.scala-tools.sbt
 project.name=scripted
 sbt.version=0.5.6
-project.version=0.6.6
+project.version=0.6.7
 scala.version=2.7.7
 project.initialize=false
diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
index 802c1afd0..0f6519a3e 100644
--- a/src/main/scala/sbt/Conditional.scala
+++ b/src/main/scala/sbt/Conditional.scala
@@ -374,8 +374,8 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 		{
 			if(jars.size > 1)
 			{
-				log.warn("Possible duplicate classpath locations for jar " + name + ": ")
-				for(jar <- jars) log.warn("\t" + jar.absolutePath)
+				log.debug("Possible duplicate classpath locations for jar " + name + ": ")
+				for(jar <- jars) log.debug("\t" + jar.absolutePath)
 			}
 		}
 	}

From a27f24c307a333339f380adaae75f2b6622fba24 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 12 Dec 2009 08:46:38 -0500
Subject: [PATCH 182/268] set version for building locally

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 83378f0db..5a25df349 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -3,5 +3,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.7
+project.version=0.6.8-SNAPSHOT
 scala.version=2.7.7

From 414043b7f40bf0f76924df205b2056f6eac36a9b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 14 Dec 2009 09:00:34 -0500
Subject: [PATCH 183/268] make NoClassDefError a one line warning message in
 dependency analysis of Java classes

---
 src/main/scala/sbt/classfile/Analyze.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
index f861fb128..8de27e240 100644
--- a/src/main/scala/sbt/classfile/Analyze.scala
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -51,8 +51,10 @@ private[sbt] object Analyze
 				{
 					Control.trapAndLog(log)
 					{
-						val clazz = Class.forName(tpe, false, loader)
-						for(file <- Control.convertException(FileUtilities.classLocationFile(clazz)).right)
+						val loaded =
+							try { Some(Class.forName(tpe, false, loader)) }
+							catch { case e: NoClassDefFoundError => log.warn("Problem processing dependencies of source " + source + " : " +e.toString); None }
+						for(clazz <- loaded; file <- Control.convertException(FileUtilities.classLocationFile(clazz)).right)
 						{
 							if(file.isDirectory)
 							{

From bad073408d00f1ca1efd8abc37e635e0e73d2a83 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 14 Dec 2009 18:39:15 -0500
Subject: [PATCH 184/268] Fix Java dependency tracking in 0.6.x

---
 src/main/scala/sbt/ClasspathUtilities.scala | 12 +++++++++++-
 src/main/scala/sbt/Compile.scala            |  1 +
 src/main/scala/sbt/Conditional.scala        |  7 ++++++-
 src/main/scala/sbt/classfile/Analyze.scala  |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/ClasspathUtilities.scala b/src/main/scala/sbt/ClasspathUtilities.scala
index 8852d6bdf..1b924018e 100644
--- a/src/main/scala/sbt/ClasspathUtilities.scala
+++ b/src/main/scala/sbt/ClasspathUtilities.scala
@@ -15,9 +15,19 @@ object ClasspathUtilities
 	def toClasspath(paths: Iterable[Path]): Array[URL] = paths.map(_.asURL).toSeq.toArray
 	def toLoader(finder: PathFinder): ClassLoader = toLoader(finder.get)
 	def toLoader(finder: PathFinder, parent: ClassLoader): ClassLoader = toLoader(finder.get, parent)
-	def toLoader(paths: Iterable[Path]): ClassLoader = new URLClassLoader(toClasspath(paths), getClass.getClassLoader)
+	def toLoader(paths: Iterable[Path]): ClassLoader = new URLClassLoader(toClasspath(paths), rootLoader)
 	def toLoader(paths: Iterable[Path], parent: ClassLoader): ClassLoader = new URLClassLoader(toClasspath(paths), parent)
 	
+	lazy val rootLoader =
+	{
+		def parent(loader: ClassLoader): ClassLoader =
+		{
+			val p = loader.getParent
+			if(p eq null) loader else parent(p)
+		}
+		parent(getClass.getClassLoader)
+	}
+	
 	private[sbt] def printSource(c: Class[_]) =
 		println(c.getName + " loader=" +c.getClassLoader + " location=" + FileUtilities.classLocationFile(c))
 	
diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index f6991eaae..ec8f44617 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -79,6 +79,7 @@ final class Compile(maximumErrors: Int, compiler: AnalyzingCompiler, analysisCal
 	protected def processJava(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger)
 	{
 		val arguments = (new CompilerArguments(compiler.scalaInstance))(sources, classpath, outputDirectory, options, true)
+		log.debug("Calling 'javac' with arguments:\n\t" + arguments.mkString("\n\t"))
 		val code = Process("javac", arguments) ! log
 		if( code != 0 ) throw new CompileFailed(arguments.toArray, "javac returned nonzero exit code")
 	}
diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
index 0f6519a3e..817465615 100644
--- a/src/main/scala/sbt/Conditional.scala
+++ b/src/main/scala/sbt/Conditional.scala
@@ -310,6 +310,11 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 			}
 		})
 	}
+	private def scalaJars: Iterable[Path] =
+	{
+		val instance = compiler.scalaInstance
+		Seq(instance.libraryJar, instance.compilerJar).map(Path.fromFile)
+	}
 	protected def execute(executeAnalysis: ConditionalAnalysis) =
 	{
 		log.info(executeAnalysis.toString)
@@ -328,7 +333,7 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 			val compile = new Compile(config.maxErrors, compiler, analysisCallback, projectPath)
 			compile(label, dirtySources, cp, outputDirectory, options, javaOptions, compileOrder, log)
 		}
-		val loader = ClasspathUtilities.toLoader(cp)
+		val loader = ClasspathUtilities.toLoader(cp ++ scalaJars)
 		val r = classfile.Analyze(projectPath, outputDirectory, dirtySources, sourceRoots.get, log)(analysis.allProducts, analysisCallback, loader)(run)
 		if(log.atLevel(Level.Debug))
 		{
diff --git a/src/main/scala/sbt/classfile/Analyze.scala b/src/main/scala/sbt/classfile/Analyze.scala
index 8de27e240..1f54bdf81 100644
--- a/src/main/scala/sbt/classfile/Analyze.scala
+++ b/src/main/scala/sbt/classfile/Analyze.scala
@@ -53,7 +53,7 @@ private[sbt] object Analyze
 					{
 						val loaded =
 							try { Some(Class.forName(tpe, false, loader)) }
-							catch { case e: NoClassDefFoundError => log.warn("Problem processing dependencies of source " + source + " : " +e.toString); None }
+							catch { case e => log.warn("Problem processing dependencies of source " + source + " : " +e.toString); None }
 						for(clazz <- loaded; file <- Control.convertException(FileUtilities.classLocationFile(clazz)).right)
 						{
 							if(file.isDirectory)

From 4ee8c92beca64fad4f2bd0d329ee86330be6e267 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 15 Dec 2009 19:11:59 -0500
Subject: [PATCH 185/268] * Fix issue with 'run' improperly interpreting
 System.exit(0) as a non-zero code * Updating more tests for 0.6.x

---
 src/main/scala/sbt/TrapExit.scala             | 10 +++-
 .../dependency-management/classifier/test     |  3 +-
 .../dependency-management/configurations/test | 46 ++++++++-----------
 .../exclude-transitive/test                   | 20 +++-----
 src/sbt-test/dependency-management/extra/test | 15 ++----
 .../info/project/build/InfoTest.scala         |  2 +-
 src/sbt-test/dependency-management/info/test  | 22 ++++-----
 .../dependency-management/inherit-repo/test   | 12 +----
 .../project/build/src/TestProject.scala       |  3 +-
 .../dependency-management/inline-default/test | 25 +++++-----
 .../project/build/src/UpdateTestProject.scala |  1 +
 .../inline-dependencies-a/test                |  4 +-
 .../project/build/TestProject.scala           |  6 +++
 .../dependency-management/ivy-settings-a/test | 15 +-----
 .../project/build/src/UpdateTestProject.scala |  1 +
 .../dependency-management/ivy-settings-b/test | 10 +---
 .../dependency-management/java.net/test       |  3 +-
 .../dependency-management/module-confs/test   | 17 ++-----
 .../parent-ivy-settings/test                  | 16 ++-----
 .../dependency-management/parent-publish/test |  3 +-
 .../dependency-management/provided/test       | 27 ++---------
 .../dependency-management/publish-local/test  | 22 ++++-----
 .../dependency-management/sources/test        |  5 +-
 src/sbt-test/dependency-management/url/test   | 11 ++---
 .../lazy-name/project/build/Test.scala        |  6 +++
 src/sbt-test/package/lazy-name/test           | 17 +------
 .../build/src/ManifestTestProject.scala       |  5 +-
 src/sbt-test/package/manifest/test            | 11 +----
 .../build/src/ManifestTestProject.scala       |  5 +-
 src/sbt-test/package/resources/test           | 20 +++-----
 src/sbt-test/properties/multi-project-a/test  |  7 ++-
 src/sbt-test/properties/multi-project-b/test  |  7 ++-
 src/sbt-test/run/daemon-exit/test             |  3 +-
 src/sbt-test/run/daemon/test                  |  1 -
 .../error/changes/RunExplicitFailure.scala    |  4 ++
 .../error/changes/RunExplicitSuccess.scala    |  4 ++
 src/sbt-test/run/error/test                   | 16 ++++---
 src/sbt-test/run/spawn-exit/test              |  3 +-
 src/sbt-test/run/spawn/test                   |  3 +-
 src/sbt-test/web/jsp/test                     |  9 +---
 40 files changed, 148 insertions(+), 272 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
 create mode 100644 src/sbt-test/package/lazy-name/project/build/Test.scala
 create mode 100644 src/sbt-test/run/error/changes/RunExplicitFailure.scala
 create mode 100644 src/sbt-test/run/error/changes/RunExplicitSuccess.scala

diff --git a/src/main/scala/sbt/TrapExit.scala b/src/main/scala/sbt/TrapExit.scala
index 7567f4b2f..5f00ed1b0 100644
--- a/src/main/scala/sbt/TrapExit.scala
+++ b/src/main/scala/sbt/TrapExit.scala
@@ -29,7 +29,15 @@ object TrapExit
 		* the threads that were created by 'execute'.*/
 		val originalThreads = allThreads
 		val code = new ExitCode
-		def executeMain = try { execute } catch { case x => code.set(1); throw x }
+		def executeMain =
+			try { execute }
+			catch
+			{
+				case e: TrapExitSecurityException => throw e
+				case x =>
+					code.set(1) //exceptions in the main thread cause the exit code to be 1
+					throw x
+			}
 		val customThreadGroup = new ExitThreadGroup(new ExitHandler(Thread.getDefaultUncaughtExceptionHandler, originalThreads, code, log))
 		val executionThread = new Thread(customThreadGroup, "run-main") { override def run() { executeMain } }
 		
diff --git a/src/sbt-test/dependency-management/classifier/test b/src/sbt-test/dependency-management/classifier/test
index 93397d07c..edf1fbdd5 100644
--- a/src/sbt-test/dependency-management/classifier/test
+++ b/src/sbt-test/dependency-management/classifier/test
@@ -1,2 +1 @@
-> update
-[success]
\ No newline at end of file
+> update
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/test b/src/sbt-test/dependency-management/configurations/test
index 841dc3bfe..4b534066b 100644
--- a/src/sbt-test/dependency-management/configurations/test
+++ b/src/sbt-test/dependency-management/configurations/test
@@ -1,48 +1,40 @@
 # publish a jar with Published with managedStyle = ManagedStyle.Maven
 
-$ copy-file changes/maven/Published.scala src/main/scala/Published.scala [success]
+$ copy-file changes/maven/Published.scala src/main/scala/Published.scala
 > publish
-[success]
-$ delete src project lib_managed [success]
+$ delete src project lib_managed
 
 # get and compile against each published jar with managedStyle = ManagedStyle.Maven
 
-$ copy-file changes/maven/TestUse.scala project/build/TestUse.scala [success]
-$ copy-file changes/maven/use.build.properties project/build.properties [success]
-$ reload [success]
-$ copy-file changes/maven/Use.scala src/main/scala/Use.scala [success]
+$ copy-file changes/maven/TestUse.scala project/build/TestUse.scala
+$ copy-file changes/maven/use.build.properties project/build.properties
+> reload
+$ copy-file changes/maven/Use.scala src/main/scala/Use.scala
 
-> compile
-[failure]
+-> compile
 
 > update
-[success]
 > compile
-[success]
-$ delete src project lib_managed repo [success]
+$ delete src project lib_managed repo
 
 
 # publish a jar with PublishedIvy with managedStyle = ManagedStyle.Ivy
 
-$ copy-file changes/ivy/publish.build.properties project/build.properties [success]
-$ copy-file changes/ivy/TestPublish.scala project/build/TestPublish.scala [success]
-$ reload [success]
-$ copy-file changes/ivy/Published.scala src/main/scala/Published.scala [success]
+$ copy-file changes/ivy/publish.build.properties project/build.properties
+$ copy-file changes/ivy/TestPublish.scala project/build/TestPublish.scala
+> reload
+$ copy-file changes/ivy/Published.scala src/main/scala/Published.scala
 > publish
-[success]
 
 # get and compile against each published jar with managedStyle = ManagedStyle.Ivy
 
-$ delete src project lib_managed [success]
-$ copy-file changes/ivy/TestUse.scala project/build/TestUse.scala [success]
-$ copy-file changes/ivy/use.build.properties project/build.properties [success]
-$ reload [success]
-$ copy-file changes/ivy/Use.scala src/main/scala/Use.scala [success]
+$ delete src project lib_managed
+$ copy-file changes/ivy/TestUse.scala project/build/TestUse.scala
+$ copy-file changes/ivy/use.build.properties project/build.properties
+> reload
+$ copy-file changes/ivy/Use.scala src/main/scala/Use.scala
 
-> compile
-[failure]
+-> compile
 
 > update
-[success]
-> compile
-[success]
\ No newline at end of file
+> compile
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/exclude-transitive/test b/src/sbt-test/dependency-management/exclude-transitive/test
index d0b58e349..b55595ca6 100644
--- a/src/sbt-test/dependency-management/exclude-transitive/test
+++ b/src/sbt-test/dependency-management/exclude-transitive/test
@@ -1,29 +1,23 @@
 # load the project definition with transitive dependencies enabled
 # and check that they are not downloaded
 
-$ touch transitive [success]
-$ reload [success]
+$ touch transitive
+$ reload
 
 > update
-[success]
 
 > check-transitive
-[success]
-> check-intransitive
-[failure]
+-> check-intransitive
 
 
 # load the project definition with transitive dependencies disabled
 # and check that they are not downloaded
 
 $ delete ivy-cache
-$ delete transitive [success]
-$ reload [success]
+$ delete transitive
+> reload
 
 > update
-[success]
 
-> check-transitive
-[failure]
-> check-intransitive
-[success]
\ No newline at end of file
+-> check-transitive
+> check-intransitive
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/test b/src/sbt-test/dependency-management/extra/test
index e79c35cd1..1c3192000 100644
--- a/src/sbt-test/dependency-management/extra/test
+++ b/src/sbt-test/dependency-management/extra/test
@@ -1,21 +1,12 @@
 > publish
-[success]
 
 $ delete project/build/
-[success]
 $ copy-file changes/UseColor.scala project/build/UseColor.scala
-[success]
 $ copy-file changes/blue color
-[success]
 $ copy-file changes/build.properties project/build.properties
-[success]
-$ reload
-[success]
+> reload
 
-> update
-[failure]
+-> update
 
 $ copy-file changes/red color
-[success]
-> update
-[success]
\ No newline at end of file
+> update
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/info/project/build/InfoTest.scala b/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
index fc4759671..dc71382d8 100644
--- a/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
+++ b/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
@@ -7,7 +7,7 @@ class InfoTest(info: ProjectInfo) extends DefaultProject(info)
 	
 	override def ivyXML =
 		if(customInfo)
-			(<info organisation="test" module="test" revision="1.0">
+			(<info organisation={organization} module={moduleID} revision="1.0">
 				<license name="Two-clause BSD-style" url="http://github.com/szeiger/scala-query/blob/master/LICENSE.txt" />
 				<description homepage="http://github.com/szeiger/scala-query/">
 					ScalaQuery is a type-safe database query API for Scala.
diff --git a/src/sbt-test/dependency-management/info/test b/src/sbt-test/dependency-management/info/test
index b301d8a4f..de451a8d3 100644
--- a/src/sbt-test/dependency-management/info/test
+++ b/src/sbt-test/dependency-management/info/test
@@ -1,13 +1,13 @@
-> update [success]
-> check-download [success]
-> deliver-local [success]
-> check-info [success]
+> update
+> check-download
+> deliver-local
+> check-info
 
-> clean [success]
-> clean-lib [success]
-$ touch info [success]
+> clean
+> clean-lib
+$ touch info
 
-> update [success]
-> check-download [success]
-> deliver-local [success]
-> check-info [success]
\ No newline at end of file
+> update
+> check-download
+> deliver-local
+> check-info
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/inherit-repo/test b/src/sbt-test/dependency-management/inherit-repo/test
index 3c58ae287..5f48617db 100644
--- a/src/sbt-test/dependency-management/inherit-repo/test
+++ b/src/sbt-test/dependency-management/inherit-repo/test
@@ -1,31 +1,21 @@
 # This should fail because the sub project declares a dependency that exists in an extra repository, which we haven't declared
 > update
-[failure]
 
 # Copy the project definition with the extra repository declared in the parent and reload
 $ copy-file changes/CorrectProject.scala project/build/src/TestProject.scala
-[success]
 $ reload
-[success]
 
 # Try updating again, which should work because the repository declared in the parent should be inherited by the child
 > update
-[success]
 
 # Copy the project definition with the extra repository declared in the child and parent and reload
 $ copy-file changes/CorrectProject2.scala project/build/src/TestProject.scala
-[success]
 $ reload
-[success]
 
 > update
-[success]
 
 # Copy the project definition with the extra repository declared in the child and reload
 $ copy-file changes/CorrectProject3.scala project/build/src/TestProject.scala
-[success]
 $ reload
-[success]
 
-> update
-[success]
\ No newline at end of file
+> update
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
index 36c4016f4..ef14fd0cb 100644
--- a/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
+++ b/src/sbt-test/dependency-management/inline-default/project/build/src/TestProject.scala
@@ -5,8 +5,7 @@ class TestProject(info: ProjectInfo) extends DefaultProject(info)
 	val httpclient = "org.apache.httpcomponents" % "httpclient" % "4.0-beta2" intransitive()
 	
 	override def useDefaultConfigurations =
-		if("useDefaultConfigurations".asFile.exists) true
-		else false
+		if("useDefaultConfigurations".asFile.exists) true else false
 
 	lazy val checkDefault = task { check(Configurations.Default) }
 	lazy val checkCompile = task { check(Configurations.Compile) }
diff --git a/src/sbt-test/dependency-management/inline-default/test b/src/sbt-test/dependency-management/inline-default/test
index 025cf0969..e7c024b64 100644
--- a/src/sbt-test/dependency-management/inline-default/test
+++ b/src/sbt-test/dependency-management/inline-default/test
@@ -2,41 +2,40 @@
 
 # Download jars.  If successful, httpclient should be downloaded to the 'default' configuration 
 > update
-[success]
+
 
 # The jar should exist in the 'default' configuration ...
 > check-default
-[success]
+
 # but not in the 'compile' configuration ...
-> check-compile
-[failure]
+-> check-compile
+
 # It should be present on the compile classpath
 > check-classpath
-[success]
+
 
 # reset test
 > clean-lib
-[success]
+
 # Indicate to the project definition that we now want useDefaultConfigurations = true
 $ touch useDefaultConfigurations
-[success]
+
 # Reload for change to take effect
 $ reload
-[success]
+
 
 ## Rerun test with useDefaultConfigurations=true
 
 # Download jars.  If successful,  httpclient should be downloaded to the 'compile' configuration
 > update
-[success]
+
 
 
 # The jar should not exist in the 'default' configuration ...
-> check-default
-[failure]
+-> check-default
+
 # It should exist in the 'compile' configuration
 > check-compile
-[success]
+
 # It should be present on the compile classpath
 > check-classpath
-[success]
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala b/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
index 272ff3250..09885508b 100644
--- a/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
+++ b/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
@@ -5,4 +5,5 @@ class UpdateTestProject(info: ProjectInfo) extends DefaultProject(info)
 	val sc = "org.scalacheck" % "scalacheck" % "1.5"
 	def ivyCacheDirectory = outputPath / "ivy-cache"
 	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/inline-dependencies-a/test b/src/sbt-test/dependency-management/inline-dependencies-a/test
index 2110da54b..f63ec9192 100644
--- a/src/sbt-test/dependency-management/inline-dependencies-a/test
+++ b/src/sbt-test/dependency-management/inline-dependencies-a/test
@@ -1,5 +1,3 @@
 > update
-[success]
 
-$ exists lib_managed/compile/scalacheck-1.5.jar
-[success]
\ No newline at end of file
+$ exists lib_managed/compile/scalacheck-1.5.jar
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala b/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
new file mode 100644
index 000000000..f8cb6a639
--- /dev/null
+++ b/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def disableCrossPaths = true
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/ivy-settings-a/test b/src/sbt-test/dependency-management/ivy-settings-a/test
index 04e8dd8c9..48c7771b1 100644
--- a/src/sbt-test/dependency-management/ivy-settings-a/test
+++ b/src/sbt-test/dependency-management/ivy-settings-a/test
@@ -1,20 +1,9 @@
 > update
-[success]
 
 $ copy-file changes/scalacheck-ivy.xml ivy.xml
-[success]
-
-> update
-[failure]
-
+-> update
 $ absent lib_managed/default/scalacheck-1.5.jar
-[success]
 
 $ copy-file changes/scala-tools-ivysettings.xml ivysettings.xml
-[success]
-
 > update
-[success]
-
-$ exists lib_managed/default/scalacheck-1.5.jar
-[success]
\ No newline at end of file
+$ exists lib_managed/default/scalacheck-1.5.jar
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala b/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
index 0f45f4a59..005f0cb62 100644
--- a/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
+++ b/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
@@ -3,4 +3,5 @@ import sbt._
 class UpdateTestProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	val sc = "org.scalacheck" % "scalacheck" % "1.5"
+	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/ivy-settings-b/test b/src/sbt-test/dependency-management/ivy-settings-b/test
index 90953e12e..bdbedd260 100644
--- a/src/sbt-test/dependency-management/ivy-settings-b/test
+++ b/src/sbt-test/dependency-management/ivy-settings-b/test
@@ -1,14 +1,6 @@
-> update
-[error]
-
+-> update
 $ absent lib_managed/compile/scalacheck-1.5.jar
-[success]
 
 $ copy-file changes/scala-tools-ivysettings.xml ivysettings.xml
-[success]
-
 > update
-[success]
-
 $ exists lib_managed/compile/scalacheck-1.5.jar
-[success]
diff --git a/src/sbt-test/dependency-management/java.net/test b/src/sbt-test/dependency-management/java.net/test
index 93397d07c..edf1fbdd5 100644
--- a/src/sbt-test/dependency-management/java.net/test
+++ b/src/sbt-test/dependency-management/java.net/test
@@ -1,2 +1 @@
-> update
-[success]
\ No newline at end of file
+> update
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/test b/src/sbt-test/dependency-management/module-confs/test
index 251e67e51..3c5aaf79b 100644
--- a/src/sbt-test/dependency-management/module-confs/test
+++ b/src/sbt-test/dependency-management/module-confs/test
@@ -1,25 +1,14 @@
 > update
-[success]
 > clean
-[success]
 
 $ copy-file changes/WrongOrg.scala project/build/Test.scala
-[success]
 $ reload
-[success]
-> update
-[failure]
+-> update
 
 $ copy-file changes/WrongVersion.scala project/build/Test.scala
-[success]
 $ reload
-[success]
-> update
-[failure]
+-> update
 
 $ copy-file changes/WrongPattern.scala project/build/Test.scala
-[success]
 $ reload
-[success]
-> update
-[failure]
+-> update
diff --git a/src/sbt-test/dependency-management/parent-ivy-settings/test b/src/sbt-test/dependency-management/parent-ivy-settings/test
index 86e43b4a1..22099a981 100644
--- a/src/sbt-test/dependency-management/parent-ivy-settings/test
+++ b/src/sbt-test/dependency-management/parent-ivy-settings/test
@@ -1,23 +1,13 @@
-> update
-[failure]
+-> update
 > clean-lib
-[success]
 $ copy-file changes/ivysettings.xml sub/ivysettings.xml
-[success]
 
 > update
-[success]
 > clean-lib
-[success]
 
 $ delete sub/ivysettings.xml
-[success]
-> update
-[failure]
+-> update
 > clean-lib
-[success]
 
 $ copy-file changes/ivysettings.xml ivysettings.xml
-[success]
-> update
-[success]
\ No newline at end of file
+> update
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/parent-publish/test b/src/sbt-test/dependency-management/parent-publish/test
index 8c3241f84..262de7fc3 100644
--- a/src/sbt-test/dependency-management/parent-publish/test
+++ b/src/sbt-test/dependency-management/parent-publish/test
@@ -1,2 +1 @@
-> publish-local
-[success]
\ No newline at end of file
+> publish-local
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/provided/test b/src/sbt-test/dependency-management/provided/test
index 23adf7948..628240b5e 100644
--- a/src/sbt-test/dependency-management/provided/test
+++ b/src/sbt-test/dependency-management/provided/test
@@ -1,51 +1,30 @@
 # verify that the classpaths are correct for when a dependency is in the provided configuration
 $ touch useProvided
-[success]
-$ reload
-[success]
+> reload
 
 > update
-[success]
 
 > check-run
-[success]
 > check-compile
-[success]
 > check-provided
-[success]
 > check-public
-[success]
 
 > package
-[success]
-
 > check-war
-[success]
 
 # verify that the classpaths are correct for when a dependency is in the compile configuration
 $ delete useProvided
-[success]
-$ reload
-[success]
+> reload
 
 > update
-[success]
 
 > check-run
-[success]
 > check-compile
-[success]
 > check-provided
-[success]
 > check-public
-[success]
 
 # prepare-webapp is last modified based, so we need to force it to do work
 $ delete target
-[success]
 
 > package
-[success]
-
-> check-war
-[success]
\ No newline at end of file
+> check-war
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/publish-local/test b/src/sbt-test/dependency-management/publish-local/test
index ce87c08b9..c2dd386b7 100644
--- a/src/sbt-test/dependency-management/publish-local/test
+++ b/src/sbt-test/dependency-management/publish-local/test
@@ -1,20 +1,16 @@
 > publish-local
-[success]
 
-> clean [success]
-$ touch mavenStyle [success]
-$ reload [success]
+> clean 
+$ touch mavenStyle 
+> reload 
 > publish-local
-[success]
 
-> clean [success]
-$ touch sub/mavenStyle [success]
-$ reload [success]
+> clean 
+$ touch sub/mavenStyle 
+> reload 
 > publish-local
-[success]
 
-> clean [success]
-$ delete mavenStyle [success]
-$ reload [success]
+> clean 
+$ delete mavenStyle 
+> reload 
 > publish-local
-[success]
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/sources/test b/src/sbt-test/dependency-management/sources/test
index 7739dd87c..b81a22c43 100644
--- a/src/sbt-test/dependency-management/sources/test
+++ b/src/sbt-test/dependency-management/sources/test
@@ -1,5 +1,2 @@
 > update
-[success]
-
-> check
-[success]
\ No newline at end of file
+> check
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/url/test b/src/sbt-test/dependency-management/url/test
index 20481d07b..7ceb7a895 100644
--- a/src/sbt-test/dependency-management/url/test
+++ b/src/sbt-test/dependency-management/url/test
@@ -1,12 +1,7 @@
-> check-in-test
-[failure]
-> check-in-compile
-[failure]
+-> check-in-test
+-> check-in-compile
 
 > update
-[success]
 
 > check-in-test
-[success]
-> check-in-compile
-[failure]
+-> check-in-compile
diff --git a/src/sbt-test/package/lazy-name/project/build/Test.scala b/src/sbt-test/package/lazy-name/project/build/Test.scala
new file mode 100644
index 000000000..7e621723c
--- /dev/null
+++ b/src/sbt-test/package/lazy-name/project/build/Test.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def disableCrossPaths = true
+}
\ No newline at end of file
diff --git a/src/sbt-test/package/lazy-name/test b/src/sbt-test/package/lazy-name/test
index 3b4b67352..97a9b3104 100755
--- a/src/sbt-test/package/lazy-name/test
+++ b/src/sbt-test/package/lazy-name/test
@@ -1,26 +1,11 @@
 > package
-[success]
-
 $ exists "target/lazy-package-name-0.1.1.jar"
-[success]
-
 > clean
-[success]
 
 > increment-version
-[success]
-
 > package
-[success]
-
 $ exists "target/lazy-package-name-0.1.2.jar"
-[success]
 
 > increment-version
-[success]
-
 > package
-[success]
-
-$ exists "target/lazy-package-name-0.1.3.jar"
-[success]
+$ exists "target/lazy-package-name-0.1.3.jar"
\ No newline at end of file
diff --git a/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala b/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
index 3cec27fde..a3b3387fe 100644
--- a/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
+++ b/src/sbt-test/package/manifest/project/build/src/ManifestTestProject.scala
@@ -2,15 +2,14 @@ import sbt._
 
 class ManifestTestProject(info: ProjectInfo) extends DefaultProject(info)
 {
-	val scalaHome = system[String]("scala.home")
 	override def mainClass = Some("jartest.Main")
 	def manifestExtra =
 	{
 		import java.util.jar._
 		val mf = new Manifest
-		for(scalaH <- scalaHome.get)
-			mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, scalaH + "/lib/scala-library.jar")
+		mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, buildScalaInstance.libraryJar.getAbsolutePath)
 		mf
 	}
 	override def packageOptions = JarManifest(manifestExtra) :: super.packageOptions.toList
+	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/package/manifest/test b/src/sbt-test/package/manifest/test
index 61331f4fa..20c80ee3c 100644
--- a/src/sbt-test/package/manifest/test
+++ b/src/sbt-test/package/manifest/test
@@ -1,11 +1,4 @@
 > package
-[success]
-
-$ "exists" "./target/jar-manifest-test-0.2.jar"
-[success]
-
+$ exists "./target/jar-manifest-test-0.2.jar"
 $ exec java -jar "./target/jar-manifest-test-0.2.jar"
-[success]
-
-> run
-[success]
+> run
\ No newline at end of file
diff --git a/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala b/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
index 3cec27fde..a3b3387fe 100644
--- a/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
+++ b/src/sbt-test/package/resources/project/build/src/ManifestTestProject.scala
@@ -2,15 +2,14 @@ import sbt._
 
 class ManifestTestProject(info: ProjectInfo) extends DefaultProject(info)
 {
-	val scalaHome = system[String]("scala.home")
 	override def mainClass = Some("jartest.Main")
 	def manifestExtra =
 	{
 		import java.util.jar._
 		val mf = new Manifest
-		for(scalaH <- scalaHome.get)
-			mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, scalaH + "/lib/scala-library.jar")
+		mf.getMainAttributes.put(Attributes.Name.CLASS_PATH, buildScalaInstance.libraryJar.getAbsolutePath)
 		mf
 	}
 	override def packageOptions = JarManifest(manifestExtra) :: super.packageOptions.toList
+	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/package/resources/test b/src/sbt-test/package/resources/test
index 3e4d841cb..aa29e4d8c 100644
--- a/src/sbt-test/package/resources/test
+++ b/src/sbt-test/package/resources/test
@@ -4,33 +4,27 @@
 
 # This should fail because the Main object is in package jartest and the resource is directly
 # in src/main/resources
-> run
-[failure]
+-> run
 
 > package
-[success]
 
 # This should fail because sbt should include the resource in the jar but it won't have the right
 # directory structure
-$ exec java -jar "./target/main-resources-test-0.1.jar"
-[failure]
+-$ exec java -jar "./target/main-resources-test-0.1.jar"
 
 # Give the resource the right directory structure
-$ mkdir src/main/resources/jartest [success]
-$ copy-file src/main/resources/main_resource_test src/main/resources/jartest/main_resource_test [success]
-$ delete src/main/resources/main_resource_test [success]
+$ mkdir src/main/resources/jartest
+$ copy-file src/main/resources/main_resource_test src/main/resources/jartest/main_resource_test
+$ delete src/main/resources/main_resource_test
 
 # This should succeed because sbt should put the resource on the runClasspath
 > run
-[success]
 
 # This is necessary because package bases whether or not to run on last modified times, which don't have
 # high enough resolution to notice the above move of main_resource_test
-> clean [success]
+> clean
 
 > package
-[success]
 
 # This should succeed because sbt should include the resource in the jar with the right directory structure
-$ exec java -jar "./target/main-resources-test-0.1.jar"
-[success]
\ No newline at end of file
+$ exec java -jar "./target/main-resources-test-0.1.jar"
\ No newline at end of file
diff --git a/src/sbt-test/properties/multi-project-a/test b/src/sbt-test/properties/multi-project-a/test
index b21259178..4806c9649 100644
--- a/src/sbt-test/properties/multi-project-a/test
+++ b/src/sbt-test/properties/multi-project-a/test
@@ -1,5 +1,4 @@
+> project "Sub project A"
+> get sbt.version
 $ absent a/project
-[success]
-
-$ absent b/project
-[success]
\ No newline at end of file
+$ absent b/project
\ No newline at end of file
diff --git a/src/sbt-test/properties/multi-project-b/test b/src/sbt-test/properties/multi-project-b/test
index b21259178..4806c9649 100644
--- a/src/sbt-test/properties/multi-project-b/test
+++ b/src/sbt-test/properties/multi-project-b/test
@@ -1,5 +1,4 @@
+> project "Sub project A"
+> get sbt.version
 $ absent a/project
-[success]
-
-$ absent b/project
-[success]
\ No newline at end of file
+$ absent b/project
\ No newline at end of file
diff --git a/src/sbt-test/run/daemon-exit/test b/src/sbt-test/run/daemon-exit/test
index 57bd0350e..9e4c2371c 100644
--- a/src/sbt-test/run/daemon-exit/test
+++ b/src/sbt-test/run/daemon-exit/test
@@ -1,2 +1 @@
-> run
-[success]
+> run
\ No newline at end of file
diff --git a/src/sbt-test/run/daemon/test b/src/sbt-test/run/daemon/test
index 57bd0350e..62ea636c1 100644
--- a/src/sbt-test/run/daemon/test
+++ b/src/sbt-test/run/daemon/test
@@ -1,2 +1 @@
 > run
-[success]
diff --git a/src/sbt-test/run/error/changes/RunExplicitFailure.scala b/src/sbt-test/run/error/changes/RunExplicitFailure.scala
new file mode 100644
index 000000000..b7e371d60
--- /dev/null
+++ b/src/sbt-test/run/error/changes/RunExplicitFailure.scala
@@ -0,0 +1,4 @@
+object Spawn
+{
+	def main(args: Array[String]) { System.exit(1); }
+}
\ No newline at end of file
diff --git a/src/sbt-test/run/error/changes/RunExplicitSuccess.scala b/src/sbt-test/run/error/changes/RunExplicitSuccess.scala
new file mode 100644
index 000000000..f02b5236c
--- /dev/null
+++ b/src/sbt-test/run/error/changes/RunExplicitSuccess.scala
@@ -0,0 +1,4 @@
+object Spawn
+{
+	def main(args: Array[String]) { System.exit(0); }
+}
\ No newline at end of file
diff --git a/src/sbt-test/run/error/test b/src/sbt-test/run/error/test
index 8f7c86954..d3599f40d 100644
--- a/src/sbt-test/run/error/test
+++ b/src/sbt-test/run/error/test
@@ -1,16 +1,18 @@
 $ copy-file changes/RunSuccess.scala src/main/scala/Run.scala
-[success]
 > run
-[success]
 
 # an exception in the main thread should be a nonzero exit code
 $ copy-file changes/RunFailureMain.scala src/main/scala/Run.scala
-[success]
-> run
-[failure]
+-> run
 
 # an exception in a non-main thread should still be exit code 0
 $ copy-file changes/ThreadRunError.scala src/main/scala/Run.scala
-[success]
 > run
-[success]
+
+# explicitly calling System.exit(0) should succeed
+$ copy-file changes/RunExplicitSuccess.scala src/main/scala/Run.scala
+> run
+
+# explicitly calling System.exit(1) should fail the 'run' task
+$ copy-file changes/RunExplicitFailure.scala src/main/scala/Run.scala
+-> run
\ No newline at end of file
diff --git a/src/sbt-test/run/spawn-exit/test b/src/sbt-test/run/spawn-exit/test
index 57bd0350e..9e4c2371c 100644
--- a/src/sbt-test/run/spawn-exit/test
+++ b/src/sbt-test/run/spawn-exit/test
@@ -1,2 +1 @@
-> run
-[success]
+> run
\ No newline at end of file
diff --git a/src/sbt-test/run/spawn/test b/src/sbt-test/run/spawn/test
index 57bd0350e..9e4c2371c 100644
--- a/src/sbt-test/run/spawn/test
+++ b/src/sbt-test/run/spawn/test
@@ -1,2 +1 @@
-> run
-[success]
+> run
\ No newline at end of file
diff --git a/src/sbt-test/web/jsp/test b/src/sbt-test/web/jsp/test
index f18db92d3..0ea28e8a8 100644
--- a/src/sbt-test/web/jsp/test
+++ b/src/sbt-test/web/jsp/test
@@ -1,11 +1,4 @@
 > update
-[success]
-
 > jetty-run
-[success]
-
 > check-page
-[success]
-
-> jetty-stop
-[success]
\ No newline at end of file
+> jetty-stop
\ No newline at end of file

From 5b1e26660c9bb329b7b35adb3fe61e663508a264 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 18 Dec 2009 09:47:02 -0500
Subject: [PATCH 186/268]  * Added source-dependency tests created when testing
 build manager  * Updated remaining scripted tests for 0.6.x and new scripted
 framework- test/* tests need to be rewritten  * removed FileUtilities.sbtJar
 since sbt is no longer one jar  * updated PluginProject to work with 0.6.x

---
 project/build/SbtProject.scala                |  2 +-
 src/main/scala/sbt/BuilderProject.scala       |  4 +-
 src/main/scala/sbt/FileUtilities.scala        |  2 -
 src/main/scala/sbt/WebApp.scala               |  2 +-
 .../project/build/src/TestProject.scala       |  6 --
 .../run-test/src/main/scala/Foo.scala         |  1 +
 .../configurations/changes/ivy/TestUse.scala  |  6 +-
 .../changes/ivy/publish.build.properties      |  3 -
 .../changes/ivy/use.build.properties          |  3 -
 .../changes/maven/TestUse.scala               |  6 +-
 .../changes/maven/use.build.properties        |  3 -
 .../dependency-management/configurations/test | 17 +++--
 .../exclude-transitive/test                   |  2 +-
 .../extra/changes/UseColor.scala              |  2 +-
 .../extra/changes/build.properties            |  3 -
 src/sbt-test/dependency-management/extra/test |  2 +-
 .../dependency-management/inherit-repo/test   |  8 +--
 .../dependency-management/inline-default/test |  2 +-
 .../module-confs/project/build/Test.scala     |  2 +
 .../dependency-management/module-confs/test   |  6 +-
 .../changes/LibTestProject.scala              |  1 +
 .../project/build/LibTestProject.scala        |  7 ++
 src/sbt-test/project/Class.forName/test       | 11 +--
 .../project/build/src/FlatProject.scala       |  2 +-
 src/sbt-test/project/flatten/test             | 12 +---
 .../project/lib/changes/LibTestProject.scala  |  2 +
 .../project/lib/project/build/Test.scala      |  7 ++
 src/sbt-test/project/lib/test                 | 11 +--
 .../multi/changes/SingleAndTraitProject.scala |  2 +-
 src/sbt-test/project/multi/test               | 27 ++-----
 src/sbt-test/project/plugins/test             |  3 +-
 .../project/src-plugins/changes/Plugins.scala | 13 ++++
 .../src-plugins/changes/TestPlugin.scala      |  6 ++
 .../src-plugins/changes/UsePlugin.scala       |  3 +
 .../src-plugins/project/build.properties      |  3 +
 .../project/build/DefinePlugin.scala          | 10 +++
 src/sbt-test/project/src-plugins/test         | 10 +++
 .../source-dependencies/abstract-type/A.scala |  3 +
 .../source-dependencies/abstract-type/B.scala |  3 +
 .../abstract-type/changes/A.scala             |  3 +
 .../abstract-type/project/build.properties    |  3 +
 .../source-dependencies/abstract-type/test    |  7 ++
 src/sbt-test/source-dependencies/added/test   | 23 ++----
 .../source-dependencies/by-name/A.scala       |  4 ++
 .../source-dependencies/by-name/B.scala       |  4 ++
 .../by-name/changes/A.scala                   |  4 ++
 .../by-name/project/build.properties          |  3 +
 src/sbt-test/source-dependencies/by-name/test |  7 ++
 .../default-params/A.scala                    |  5 ++
 .../default-params/B.scala                    |  4 ++
 .../default-params/changes/A.scala            |  5 ++
 .../default-params/project/build.properties   |  3 +
 .../source-dependencies/default-params/test   | 11 +++
 src/sbt-test/source-dependencies/empty-a/test | 34 ++-------
 .../source-dependencies/erasure/A.scala       |  3 +
 .../source-dependencies/erasure/B.scala       |  3 +
 .../erasure/changes/A.scala                   |  3 +
 .../erasure/project/build.properties          |  3 +
 src/sbt-test/source-dependencies/erasure/test |  4 ++
 .../source-dependencies/false-error/A.scala   |  4 ++
 .../source-dependencies/false-error/B.scala   |  3 +
 .../false-error/changes/A.scala               |  4 ++
 .../false-error/project/build.properties      |  3 +
 .../source-dependencies/false-error/test      |  5 ++
 .../implicit-params/A.scala                   |  6 ++
 .../implicit-params/B.scala                   |  4 ++
 .../implicit-params/changes/A.scala           |  6 ++
 .../implicit-params/project/build.properties  |  3 +
 .../source-dependencies/implicit-params/test  |  8 +++
 .../source-dependencies/implicit/A.scala      |  4 ++
 .../source-dependencies/implicit/B.scala      |  4 ++
 .../implicit/changes/A.scala                  |  4 ++
 .../implicit/project/build.properties         |  3 +
 .../source-dependencies/implicit/test         |  7 ++
 .../source-dependencies/import/A.scala        |  1 +
 .../source-dependencies/import/B.scala        |  1 +
 .../import/changes/A.scala                    |  1 +
 .../import/project/build.properties           |  3 +
 src/sbt-test/source-dependencies/import/test  |  8 +++
 .../intermediate-error/A.scala                |  6 ++
 .../intermediate-error/B.scala                |  4 ++
 .../intermediate-error/changes/A2.scala       |  6 ++
 .../intermediate-error/changes/A3.scala       |  6 ++
 .../project/build.properties                  |  3 +
 .../intermediate-error/test                   |  7 ++
 .../source-dependencies/java-basic/test       | 35 +++------
 .../source-dependencies/java-static/test      | 18 ++---
 .../source-dependencies/lazy-val/A.scala      |  4 ++
 .../source-dependencies/lazy-val/B.scala      |  4 ++
 .../lazy-val/changes/A.scala                  |  4 ++
 .../lazy-val/project/build.properties         |  3 +
 .../source-dependencies/lazy-val/test         |  6 ++
 .../source-dependencies/linearization/A.scala |  3 +
 .../source-dependencies/linearization/B.scala |  3 +
 .../source-dependencies/linearization/C.scala |  3 +
 .../source-dependencies/linearization/D.scala |  2 +
 .../source-dependencies/linearization/E.scala |  2 +
 .../source-dependencies/linearization/F.scala |  3 +
 .../linearization/changes/D.scala             |  1 +
 .../linearization/project/build.properties    |  3 +
 .../source-dependencies/linearization/test    | 13 ++++
 .../source-dependencies/named/A.scala         |  3 +
 .../source-dependencies/named/B.scala         |  7 ++
 .../source-dependencies/named/changes/A.scala |  3 +
 .../named/project/build.properties            |  3 +
 src/sbt-test/source-dependencies/named/test   | 16 +++++
 .../source-dependencies/new-cyclic/test       |  8 +--
 .../source-dependencies/parent-change/W.scala |  5 ++
 .../source-dependencies/parent-change/Y.scala |  5 ++
 .../source-dependencies/parent-change/Z.scala |  1 +
 .../parent-change/changes/W.scala             |  5 ++
 .../parent-change/project/build.properties    |  3 +
 .../source-dependencies/parent-change/test    |  7 ++
 .../parent-member-change/A.scala              |  3 +
 .../parent-member-change/B.scala              |  1 +
 .../parent-member-change/C.scala              |  3 +
 .../parent-member-change/changes/A.scala      |  3 +
 .../project/build.properties                  |  3 +
 .../parent-member-change/test                 |  7 ++
 .../qualified-access/A.scala                  | 10 +++
 .../qualified-access/B.scala                  |  6 ++
 .../qualified-access/changes/A.scala          |  6 ++
 .../qualified-access/project/build.properties |  3 +
 .../source-dependencies/qualified-access/test |  7 ++
 .../source-dependencies/remove-test-a/test    | 13 +---
 .../source-dependencies/remove-test-b/test    | 43 +++--------
 .../repeated-parameters/A.scala               |  4 ++
 .../repeated-parameters/B.scala               |  4 ++
 .../repeated-parameters/changes/A.scala       |  4 ++
 .../project/build.properties                  |  3 +
 .../repeated-parameters/test                  |  7 ++
 .../source-dependencies/replace-test-a/test   | 22 ++----
 .../source-dependencies/sealed/A.scala        |  3 +
 .../source-dependencies/sealed/D.scala        |  8 +++
 .../sealed/changes/A.scala                    |  4 ++
 .../sealed/project/build.properties           |  3 +
 src/sbt-test/source-dependencies/sealed/test  |  9 +++
 .../source-dependencies/specialized/A.scala   |  4 ++
 .../source-dependencies/specialized/B.scala   |  7 ++
 .../specialized/changes/A.scala               |  4 ++
 .../specialized/project/build.properties      |  3 +
 .../project/build/SpecializeTest.scala        |  6 ++
 .../source-dependencies/specialized/test      | 16 +++++
 .../stability-change/A.scala                  |  4 ++
 .../stability-change/B.scala                  |  5 ++
 .../stability-change/C.scala                  |  4 ++
 .../stability-change/changes/A.scala          |  4 ++
 .../stability-change/project/build.properties |  3 +
 .../source-dependencies/stability-change/test |  6 ++
 .../source-dependencies/struct-usage/A.scala  |  3 +
 .../source-dependencies/struct-usage/B.scala  |  3 +
 .../struct-usage/changes/A.scala              |  3 +
 .../struct-usage/project/build.properties     |  3 +
 .../source-dependencies/struct-usage/test     |  5 ++
 .../source-dependencies/struct/A.scala        |  3 +
 .../source-dependencies/struct/B.scala        |  4 ++
 .../source-dependencies/struct/C.scala        |  4 ++
 .../struct/changes/A.scala                    |  3 +
 .../struct/project/build.properties           |  3 +
 src/sbt-test/source-dependencies/struct/test  |  6 ++
 .../source-dependencies/transitive-a/test     |  8 +--
 .../source-dependencies/transitive-b/test     |  8 +--
 .../type-parameter/A.scala                    |  1 +
 .../type-parameter/B.scala                    |  1 +
 .../type-parameter/C.scala                    |  3 +
 .../type-parameter/D.scala                    |  3 +
 .../type-parameter/changes/A.scala            |  1 +
 .../type-parameter/project/build.properties   |  3 +
 .../source-dependencies/type-parameter/test   |  7 ++
 .../typeref-return/A.scala                    |  4 ++
 .../typeref-return/B.scala                    |  3 +
 .../typeref-return/changes/A.scala            |  4 ++
 .../typeref-return/project/build.properties   |  3 +
 .../source-dependencies/typeref-return/test   |  5 ++
 src/sbt-test/source-dependencies/var/A.scala  |  5 ++
 src/sbt-test/source-dependencies/var/B.scala  |  4 ++
 .../source-dependencies/var/changes/A.scala   |  4 ++
 .../var/project/build.properties              |  3 +
 src/sbt-test/source-dependencies/var/test     |  6 ++
 .../source-dependencies/variance/A.scala      |  2 +
 .../source-dependencies/variance/C.scala      |  3 +
 .../variance/changes/A.scala                  |  2 +
 .../variance/project/build.properties         |  3 +
 .../source-dependencies/variance/test         |  6 ++
 .../project/build}/TestProject.scala          |  2 +-
 src/sbt-test/tests/Class.forName/test         |  6 --
 .../tests/extend/changes/ScalaCheck.scala     | 41 -----------
 .../tests/extend/changes/TestFailure.scala    |  6 --
 .../tests/extend/changes/TestProject2.scala   |  8 ---
 .../tests/extend/changes/TestProject3.scala   | 12 ----
 .../tests/extend/changes/TestSuccess.scala    |  6 --
 .../tests/extend/project/build.properties     |  5 --
 .../project/build/src/TestProject.scala       |  9 ---
 src/sbt-test/tests/extend/test                | 72 -------------------
 src/sbt-test/tests/resources/test             |  5 +-
 .../scalacheck-a/changes/BasicTest.scala      | 21 ------
 .../scalacheck-a/changes/FailedTest.scala     | 21 ------
 .../scalacheck-a/project/build.properties     |  4 --
 .../project/build/src/TestProject.scala       |  7 --
 .../src/test/scala/DummyTest.scala            |  2 -
 src/sbt-test/tests/scalacheck-a/test          | 23 ------
 .../scalatest-ignore/project/build.properties |  2 -
 .../scalatest-ignore/project/build/Test.scala |  7 --
 .../src/test/scala/IgnoreTest.scala           | 11 ---
 src/sbt-test/tests/scalatest-ignore/test      |  5 --
 .../tests/specs-a/changes/BasicTest.scala     | 35 ---------
 .../tests/specs-a/changes/FailTest.scala      | 36 ----------
 .../tests/specs-a/project/build.properties    |  4 --
 .../project/build/src/TestProject.scala       |  7 --
 .../specs-a/src/test/scala/DummyTest.scala    |  2 -
 src/sbt-test/tests/specs-a/test               | 23 ------
 .../specs-nested/project/build.properties     |  4 --
 .../src/test/scala/TestSpecification.scala    | 19 -----
 src/sbt-test/tests/specs-nested/test          |  5 --
 .../project/build/TestQuickProject.scala      |  3 +-
 src/sbt-test/tests/test-failed/test           | 24 ++-----
 216 files changed, 768 insertions(+), 687 deletions(-)
 delete mode 100644 src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
 delete mode 100644 src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties
 delete mode 100644 src/sbt-test/dependency-management/configurations/changes/ivy/use.build.properties
 delete mode 100644 src/sbt-test/dependency-management/configurations/changes/maven/use.build.properties
 delete mode 100644 src/sbt-test/dependency-management/extra/changes/build.properties
 create mode 100644 src/sbt-test/project/Class.forName/project/build/LibTestProject.scala
 create mode 100644 src/sbt-test/project/lib/project/build/Test.scala
 create mode 100644 src/sbt-test/project/src-plugins/changes/Plugins.scala
 create mode 100644 src/sbt-test/project/src-plugins/changes/TestPlugin.scala
 create mode 100644 src/sbt-test/project/src-plugins/changes/UsePlugin.scala
 create mode 100644 src/sbt-test/project/src-plugins/project/build.properties
 create mode 100644 src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
 create mode 100644 src/sbt-test/project/src-plugins/test
 create mode 100644 src/sbt-test/source-dependencies/abstract-type/A.scala
 create mode 100644 src/sbt-test/source-dependencies/abstract-type/B.scala
 create mode 100644 src/sbt-test/source-dependencies/abstract-type/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/abstract-type/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/abstract-type/test
 create mode 100644 src/sbt-test/source-dependencies/by-name/A.scala
 create mode 100644 src/sbt-test/source-dependencies/by-name/B.scala
 create mode 100644 src/sbt-test/source-dependencies/by-name/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/by-name/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/by-name/test
 create mode 100644 src/sbt-test/source-dependencies/default-params/A.scala
 create mode 100644 src/sbt-test/source-dependencies/default-params/B.scala
 create mode 100644 src/sbt-test/source-dependencies/default-params/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/default-params/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/default-params/test
 create mode 100644 src/sbt-test/source-dependencies/erasure/A.scala
 create mode 100644 src/sbt-test/source-dependencies/erasure/B.scala
 create mode 100644 src/sbt-test/source-dependencies/erasure/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/erasure/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/erasure/test
 create mode 100644 src/sbt-test/source-dependencies/false-error/A.scala
 create mode 100644 src/sbt-test/source-dependencies/false-error/B.scala
 create mode 100644 src/sbt-test/source-dependencies/false-error/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/false-error/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/false-error/test
 create mode 100644 src/sbt-test/source-dependencies/implicit-params/A.scala
 create mode 100644 src/sbt-test/source-dependencies/implicit-params/B.scala
 create mode 100644 src/sbt-test/source-dependencies/implicit-params/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/implicit-params/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/implicit-params/test
 create mode 100644 src/sbt-test/source-dependencies/implicit/A.scala
 create mode 100644 src/sbt-test/source-dependencies/implicit/B.scala
 create mode 100644 src/sbt-test/source-dependencies/implicit/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/implicit/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/implicit/test
 create mode 100644 src/sbt-test/source-dependencies/import/A.scala
 create mode 100644 src/sbt-test/source-dependencies/import/B.scala
 create mode 100644 src/sbt-test/source-dependencies/import/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/import/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/import/test
 create mode 100644 src/sbt-test/source-dependencies/intermediate-error/A.scala
 create mode 100644 src/sbt-test/source-dependencies/intermediate-error/B.scala
 create mode 100644 src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
 create mode 100644 src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
 create mode 100644 src/sbt-test/source-dependencies/intermediate-error/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/intermediate-error/test
 create mode 100644 src/sbt-test/source-dependencies/lazy-val/A.scala
 create mode 100644 src/sbt-test/source-dependencies/lazy-val/B.scala
 create mode 100644 src/sbt-test/source-dependencies/lazy-val/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/lazy-val/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/lazy-val/test
 create mode 100644 src/sbt-test/source-dependencies/linearization/A.scala
 create mode 100644 src/sbt-test/source-dependencies/linearization/B.scala
 create mode 100644 src/sbt-test/source-dependencies/linearization/C.scala
 create mode 100644 src/sbt-test/source-dependencies/linearization/D.scala
 create mode 100644 src/sbt-test/source-dependencies/linearization/E.scala
 create mode 100644 src/sbt-test/source-dependencies/linearization/F.scala
 create mode 100644 src/sbt-test/source-dependencies/linearization/changes/D.scala
 create mode 100644 src/sbt-test/source-dependencies/linearization/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/linearization/test
 create mode 100644 src/sbt-test/source-dependencies/named/A.scala
 create mode 100644 src/sbt-test/source-dependencies/named/B.scala
 create mode 100644 src/sbt-test/source-dependencies/named/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/named/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/named/test
 create mode 100644 src/sbt-test/source-dependencies/parent-change/W.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-change/Y.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-change/Z.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-change/changes/W.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-change/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/parent-change/test
 create mode 100644 src/sbt-test/source-dependencies/parent-member-change/A.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-member-change/B.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-member-change/C.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/parent-member-change/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/parent-member-change/test
 create mode 100644 src/sbt-test/source-dependencies/qualified-access/A.scala
 create mode 100644 src/sbt-test/source-dependencies/qualified-access/B.scala
 create mode 100644 src/sbt-test/source-dependencies/qualified-access/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/qualified-access/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/qualified-access/test
 create mode 100644 src/sbt-test/source-dependencies/repeated-parameters/A.scala
 create mode 100644 src/sbt-test/source-dependencies/repeated-parameters/B.scala
 create mode 100644 src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/repeated-parameters/test
 create mode 100644 src/sbt-test/source-dependencies/sealed/A.scala
 create mode 100644 src/sbt-test/source-dependencies/sealed/D.scala
 create mode 100644 src/sbt-test/source-dependencies/sealed/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/sealed/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/sealed/test
 create mode 100644 src/sbt-test/source-dependencies/specialized/A.scala
 create mode 100644 src/sbt-test/source-dependencies/specialized/B.scala
 create mode 100644 src/sbt-test/source-dependencies/specialized/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/specialized/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
 create mode 100644 src/sbt-test/source-dependencies/specialized/test
 create mode 100644 src/sbt-test/source-dependencies/stability-change/A.scala
 create mode 100644 src/sbt-test/source-dependencies/stability-change/B.scala
 create mode 100644 src/sbt-test/source-dependencies/stability-change/C.scala
 create mode 100644 src/sbt-test/source-dependencies/stability-change/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/stability-change/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/stability-change/test
 create mode 100644 src/sbt-test/source-dependencies/struct-usage/A.scala
 create mode 100644 src/sbt-test/source-dependencies/struct-usage/B.scala
 create mode 100644 src/sbt-test/source-dependencies/struct-usage/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/struct-usage/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/struct-usage/test
 create mode 100644 src/sbt-test/source-dependencies/struct/A.scala
 create mode 100644 src/sbt-test/source-dependencies/struct/B.scala
 create mode 100644 src/sbt-test/source-dependencies/struct/C.scala
 create mode 100644 src/sbt-test/source-dependencies/struct/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/struct/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/struct/test
 create mode 100644 src/sbt-test/source-dependencies/type-parameter/A.scala
 create mode 100644 src/sbt-test/source-dependencies/type-parameter/B.scala
 create mode 100644 src/sbt-test/source-dependencies/type-parameter/C.scala
 create mode 100644 src/sbt-test/source-dependencies/type-parameter/D.scala
 create mode 100644 src/sbt-test/source-dependencies/type-parameter/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/type-parameter/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/type-parameter/test
 create mode 100644 src/sbt-test/source-dependencies/typeref-return/A.scala
 create mode 100644 src/sbt-test/source-dependencies/typeref-return/B.scala
 create mode 100644 src/sbt-test/source-dependencies/typeref-return/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/typeref-return/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/typeref-return/test
 create mode 100644 src/sbt-test/source-dependencies/var/A.scala
 create mode 100644 src/sbt-test/source-dependencies/var/B.scala
 create mode 100644 src/sbt-test/source-dependencies/var/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/var/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/var/test
 create mode 100644 src/sbt-test/source-dependencies/variance/A.scala
 create mode 100644 src/sbt-test/source-dependencies/variance/C.scala
 create mode 100644 src/sbt-test/source-dependencies/variance/changes/A.scala
 create mode 100644 src/sbt-test/source-dependencies/variance/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/variance/test
 rename src/sbt-test/tests/{specs-nested/project/build/src => Class.forName/project/build}/TestProject.scala (61%)
 mode change 100755 => 100644
 delete mode 100644 src/sbt-test/tests/extend/changes/ScalaCheck.scala
 delete mode 100644 src/sbt-test/tests/extend/changes/TestFailure.scala
 delete mode 100644 src/sbt-test/tests/extend/changes/TestProject2.scala
 delete mode 100644 src/sbt-test/tests/extend/changes/TestProject3.scala
 delete mode 100644 src/sbt-test/tests/extend/changes/TestSuccess.scala
 delete mode 100644 src/sbt-test/tests/extend/project/build.properties
 delete mode 100644 src/sbt-test/tests/extend/project/build/src/TestProject.scala
 delete mode 100644 src/sbt-test/tests/extend/test
 delete mode 100755 src/sbt-test/tests/scalacheck-a/changes/BasicTest.scala
 delete mode 100755 src/sbt-test/tests/scalacheck-a/changes/FailedTest.scala
 delete mode 100755 src/sbt-test/tests/scalacheck-a/project/build.properties
 delete mode 100755 src/sbt-test/tests/scalacheck-a/project/build/src/TestProject.scala
 delete mode 100755 src/sbt-test/tests/scalacheck-a/src/test/scala/DummyTest.scala
 delete mode 100755 src/sbt-test/tests/scalacheck-a/test
 delete mode 100644 src/sbt-test/tests/scalatest-ignore/project/build.properties
 delete mode 100644 src/sbt-test/tests/scalatest-ignore/project/build/Test.scala
 delete mode 100644 src/sbt-test/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
 delete mode 100644 src/sbt-test/tests/scalatest-ignore/test
 delete mode 100755 src/sbt-test/tests/specs-a/changes/BasicTest.scala
 delete mode 100755 src/sbt-test/tests/specs-a/changes/FailTest.scala
 delete mode 100755 src/sbt-test/tests/specs-a/project/build.properties
 delete mode 100755 src/sbt-test/tests/specs-a/project/build/src/TestProject.scala
 delete mode 100755 src/sbt-test/tests/specs-a/src/test/scala/DummyTest.scala
 delete mode 100755 src/sbt-test/tests/specs-a/test
 delete mode 100755 src/sbt-test/tests/specs-nested/project/build.properties
 delete mode 100755 src/sbt-test/tests/specs-nested/src/test/scala/TestSpecification.scala
 delete mode 100755 src/sbt-test/tests/specs-nested/test

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index c5506e9c5..4b8817504 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -53,7 +53,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	//testing
 	val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6"
 
-	val ivy = "org.apache.ivy" % "ivy" % "2.0.0" intransitive()
+	val ivy = "org.apache.ivy" % "ivy" % "2.1.0" intransitive()
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
 
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index 4483c7117..611180c40 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -210,7 +210,9 @@ class PluginDefinition(val info: ProjectInfo) extends InternalProject with Basic
 }
 class PluginProject(info: ProjectInfo) extends DefaultProject(info)
 {
-	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
+	override def moduleID = normalizedName
+	override def buildScalaVersion = defScalaVersion.value
+	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(info.app.mainClasspath.map(Path.fromFile))
 	override def packageAction = packageSrc dependsOn(test)
 	override def packageSrcJar = jarPath
 	override def useMavenConfigurations = true
diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index 4174d9ab6..0ad0d2c9b 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -806,8 +806,6 @@ object FileUtilities
 	def classLocation[T](implicit mf: scala.reflect.Manifest[T]): URL = classLocation(mf.erasure)
 	def classLocationFile[T](implicit mf: scala.reflect.Manifest[T]): File = classLocationFile(mf.erasure)
 	
-	/** The location of the jar containing this class.*/
-	lazy val sbtJar: File = classLocationFile(getClass)
 	lazy val scalaLibraryJar: File = classLocationFile[scala.ScalaObject]
 	lazy val scalaCompilerJar: File = classLocationFile[scala.tools.nsc.Settings]
 	def scalaJars: Iterable[File] = List(scalaLibraryJar, scalaCompilerJar)
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index 29f38d357..d8b748b99 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -33,7 +33,7 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 			val baseLoader = this.getClass.getClassLoader
 			val classpathURLs = jettyClasspath.get.map(_.asURL).toSeq
 			val loader: ClassLoader = new java.net.URLClassLoader(classpathURLs.toArray, baseLoader)
-			val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.sbtJar.toURI.toURL), loader, baseLoader)
+			val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.classLocation[Stoppable].toURI.toURL), loader, baseLoader)
 			val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
 			runner(configuration)
 		}
diff --git a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
deleted file mode 100644
index e08ad8e61..000000000
--- a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-import sbt._
-
-class TestProject(info: ProjectInfo) extends DefaultProject(info)
-{
-	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.fromFile(FileUtilities.sbtJar)
-}
diff --git a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
index b81426eb7..875399679 100644
--- a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
+++ b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala
@@ -10,6 +10,7 @@ import scala.tools.nsc.{Interpreter, Settings}
 class Foo {
 	val settings = new Settings()
 	settings.classpath.value = location(classOf[Holder])
+	settings.bootclasspath.value = settings.bootclasspath.value + File.pathSeparator + location(classOf[ScalaObject])
 	val inter = new Interpreter(settings)
 
 	def eval(code: String): Any = {
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
index 01ad76516..2d71feffd 100644
--- a/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
@@ -5,7 +5,7 @@ class TestUse(info: ProjectInfo) extends DefaultProject(info)
 {
 	override def managedStyle = ManagedStyle.Ivy
 	val publishTo = Resolver.file("test-repo", path("repo").asFile)(Patterns(false, Resolver.mavenStyleBasePattern))
-	val mavenC = "org.example" % "test-ivy" % "1.0"
-	val mavenT = "org.example" % "test-ivy" % "1.0" % "test"
-	val mavenR = "org.example" % "test-ivy" % "1.0" % "runtime"
+	val mavenC = "org.example" %% "test-ivy" % "1.0"
+	val mavenT = "org.example" %% "test-ivy" % "1.0" % "test"
+	val mavenR = "org.example" %% "test-ivy" % "1.0" % "runtime"
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties b/src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties
deleted file mode 100644
index 067fa5e0a..000000000
--- a/src/sbt-test/dependency-management/configurations/changes/ivy/publish.build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=test-ivy
-project.organization=org.example
-project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy/use.build.properties b/src/sbt-test/dependency-management/configurations/changes/ivy/use.build.properties
deleted file mode 100644
index cd8b539bd..000000000
--- a/src/sbt-test/dependency-management/configurations/changes/ivy/use.build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=test-ivy-use
-project.organization=test
-project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
index 49208bbd8..fa8b7b6dc 100644
--- a/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
+++ b/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
@@ -4,7 +4,7 @@ import sbt._
 class TestUse(info: ProjectInfo) extends DefaultProject(info)
 {
 	val publishTo = Resolver.file("test-repo", path("repo").asFile)
-	val mavenC = "org.example" % "test" % "1.0"
-	val mavenT = "org.example" % "test" % "1.0" % "test"
-	val mavenR = "org.example" % "test" % "1.0" % "runtime"
+	val mavenC = "org.example" %% "test" % "1.0"
+	val mavenT = "org.example" %% "test" % "1.0" % "test"
+	val mavenR = "org.example" %% "test" % "1.0" % "runtime"
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/changes/maven/use.build.properties b/src/sbt-test/dependency-management/configurations/changes/maven/use.build.properties
deleted file mode 100644
index 85cb472ff..000000000
--- a/src/sbt-test/dependency-management/configurations/changes/maven/use.build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=test-use
-project.organization=test
-project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/configurations/test b/src/sbt-test/dependency-management/configurations/test
index 4b534066b..8d3a67f5b 100644
--- a/src/sbt-test/dependency-management/configurations/test
+++ b/src/sbt-test/dependency-management/configurations/test
@@ -2,12 +2,14 @@
 
 $ copy-file changes/maven/Published.scala src/main/scala/Published.scala
 > publish
-$ delete src project lib_managed
+
 
 # get and compile against each published jar with managedStyle = ManagedStyle.Maven
 
+> set project.name test-use
+> set project.organization test
+$ delete src project/build lib_managed
 $ copy-file changes/maven/TestUse.scala project/build/TestUse.scala
-$ copy-file changes/maven/use.build.properties project/build.properties
 > reload
 $ copy-file changes/maven/Use.scala src/main/scala/Use.scala
 
@@ -15,12 +17,12 @@ $ copy-file changes/maven/Use.scala src/main/scala/Use.scala
 
 > update
 > compile
-$ delete src project lib_managed repo
 
 
 # publish a jar with PublishedIvy with managedStyle = ManagedStyle.Ivy
-
-$ copy-file changes/ivy/publish.build.properties project/build.properties
+> set project.name test-ivy
+> set project.organization org.example
+$ delete src project/build lib_managed repo
 $ copy-file changes/ivy/TestPublish.scala project/build/TestPublish.scala
 > reload
 $ copy-file changes/ivy/Published.scala src/main/scala/Published.scala
@@ -28,9 +30,10 @@ $ copy-file changes/ivy/Published.scala src/main/scala/Published.scala
 
 # get and compile against each published jar with managedStyle = ManagedStyle.Ivy
 
-$ delete src project lib_managed
+> set project.name test-ivy-use
+> set project.organization test
+$ delete src project/build lib_managed
 $ copy-file changes/ivy/TestUse.scala project/build/TestUse.scala
-$ copy-file changes/ivy/use.build.properties project/build.properties
 > reload
 $ copy-file changes/ivy/Use.scala src/main/scala/Use.scala
 
diff --git a/src/sbt-test/dependency-management/exclude-transitive/test b/src/sbt-test/dependency-management/exclude-transitive/test
index b55595ca6..3911dabf1 100644
--- a/src/sbt-test/dependency-management/exclude-transitive/test
+++ b/src/sbt-test/dependency-management/exclude-transitive/test
@@ -2,7 +2,7 @@
 # and check that they are not downloaded
 
 $ touch transitive
-$ reload
+> reload
 
 > update
 
diff --git a/src/sbt-test/dependency-management/extra/changes/UseColor.scala b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
index 79639ab5e..4371704fd 100644
--- a/src/sbt-test/dependency-management/extra/changes/UseColor.scala
+++ b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
@@ -9,6 +9,6 @@ class UseColor(info: ProjectInfo) extends DefaultProject(info)
 	val repo = Resolver.file("test-repo", ("repo" / "test").asFile)
 	def color = FileUtilities.readString("color".asFile, log).right.getOrElse(error("No color specified"))
 	override def libraryDependencies = Set(
-		"org.scala-tools.sbt" % "test-ivy-extra" %"1.0" extra("e:color" -> color)
+		"org.scala-tools.sbt" %% "test-ivy-extra" %"1.0" extra("e:color" -> color)
 	)
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/changes/build.properties b/src/sbt-test/dependency-management/extra/changes/build.properties
deleted file mode 100644
index e0c0892fb..000000000
--- a/src/sbt-test/dependency-management/extra/changes/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-project.name=UseColor
-project.version=1.0
-project.organization=org.scala-tools.sbt
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/test b/src/sbt-test/dependency-management/extra/test
index 1c3192000..1d6137036 100644
--- a/src/sbt-test/dependency-management/extra/test
+++ b/src/sbt-test/dependency-management/extra/test
@@ -1,9 +1,9 @@
 > publish
+> set project.name UseColor
 
 $ delete project/build/
 $ copy-file changes/UseColor.scala project/build/UseColor.scala
 $ copy-file changes/blue color
-$ copy-file changes/build.properties project/build.properties
 > reload
 
 -> update
diff --git a/src/sbt-test/dependency-management/inherit-repo/test b/src/sbt-test/dependency-management/inherit-repo/test
index 5f48617db..e35eedd79 100644
--- a/src/sbt-test/dependency-management/inherit-repo/test
+++ b/src/sbt-test/dependency-management/inherit-repo/test
@@ -1,21 +1,21 @@
 # This should fail because the sub project declares a dependency that exists in an extra repository, which we haven't declared
-> update
+-> update
 
 # Copy the project definition with the extra repository declared in the parent and reload
 $ copy-file changes/CorrectProject.scala project/build/src/TestProject.scala
-$ reload
+> reload
 
 # Try updating again, which should work because the repository declared in the parent should be inherited by the child
 > update
 
 # Copy the project definition with the extra repository declared in the child and parent and reload
 $ copy-file changes/CorrectProject2.scala project/build/src/TestProject.scala
-$ reload
+> reload
 
 > update
 
 # Copy the project definition with the extra repository declared in the child and reload
 $ copy-file changes/CorrectProject3.scala project/build/src/TestProject.scala
-$ reload
+> reload
 
 > update
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/inline-default/test b/src/sbt-test/dependency-management/inline-default/test
index e7c024b64..589a667a1 100644
--- a/src/sbt-test/dependency-management/inline-default/test
+++ b/src/sbt-test/dependency-management/inline-default/test
@@ -21,7 +21,7 @@
 $ touch useDefaultConfigurations
 
 # Reload for change to take effect
-$ reload
+> reload
 
 
 ## Rerun test with useDefaultConfigurations=true
diff --git a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
index c1ea79b6e..83b398a03 100644
--- a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
+++ b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
@@ -11,4 +11,6 @@ class Test(info: ProjectInfo) extends DefaultProject(info)
 
 	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20091017.011744-240"
 	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
+	
+	override def checkExplicitScalaDependencies = false
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/test b/src/sbt-test/dependency-management/module-confs/test
index 3c5aaf79b..16466a54b 100644
--- a/src/sbt-test/dependency-management/module-confs/test
+++ b/src/sbt-test/dependency-management/module-confs/test
@@ -2,13 +2,13 @@
 > clean
 
 $ copy-file changes/WrongOrg.scala project/build/Test.scala
-$ reload
+> reload
 -> update
 
 $ copy-file changes/WrongVersion.scala project/build/Test.scala
-$ reload
+> reload
 -> update
 
 $ copy-file changes/WrongPattern.scala project/build/Test.scala
-$ reload
+> reload
 -> update
diff --git a/src/sbt-test/project/Class.forName/changes/LibTestProject.scala b/src/sbt-test/project/Class.forName/changes/LibTestProject.scala
index 121545671..19d6398aa 100644
--- a/src/sbt-test/project/Class.forName/changes/LibTestProject.scala
+++ b/src/sbt-test/project/Class.forName/changes/LibTestProject.scala
@@ -3,4 +3,5 @@ import sbt._
 class LibTestProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	lazy val useJar = task { injar.Test.other; None }
+	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/project/Class.forName/project/build/LibTestProject.scala b/src/sbt-test/project/Class.forName/project/build/LibTestProject.scala
new file mode 100644
index 000000000..be902da1b
--- /dev/null
+++ b/src/sbt-test/project/Class.forName/project/build/LibTestProject.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class LibTestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def disableCrossPaths = true
+	override def buildScalaVersion = defScalaVersion.value
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/Class.forName/test b/src/sbt-test/project/Class.forName/test
index 00c356c76..a9aeccdfd 100644
--- a/src/sbt-test/project/Class.forName/test
+++ b/src/sbt-test/project/Class.forName/test
@@ -1,19 +1,14 @@
 # this step builds a test jar for use by the project definition
 > package
-[success]
 
+$ delete project/build
 $ copy-file target/definition-lib-forname-test-1.0.jar project/build/lib/test.jar
-[success]
-
 $ copy-file changes/LibTestProject.scala project/build/src/LibTestProject.scala
-[success]
 
 # the copied project definition depends on the Test module in test.jar and will
 # fail to compile if sbt did not put the jars in project/build/lib/ on the compile classpath
-$ reload
-[success]
+> reload
 
 # The project definition uses the class in test.jar and will fail here if sbt did not put the
 # jars in project/build/lib on the runtime classpath
-> use-jar
-[success]
\ No newline at end of file
+> use-jar
\ No newline at end of file
diff --git a/src/sbt-test/project/flatten/project/build/src/FlatProject.scala b/src/sbt-test/project/flatten/project/build/src/FlatProject.scala
index abafb603e..f9cb648fc 100644
--- a/src/sbt-test/project/flatten/project/build/src/FlatProject.scala
+++ b/src/sbt-test/project/flatten/project/build/src/FlatProject.scala
@@ -3,7 +3,7 @@ import sbt._
 class FlatProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	override def useMavenConfigurations = true
-	val sc = "org.scalacheck" % "scalacheck" % "1.5" % "test->default"
+	val sc = "org.scalacheck" % "scalacheck" % "1.5" % "test"
 
 	def sourceFilter =  "*.java" | "*.scala"
 	override def mainSources = descendents(sourcePath ##, sourceFilter)
diff --git a/src/sbt-test/project/flatten/test b/src/sbt-test/project/flatten/test
index 0b85c1c16..f3588fbb2 100644
--- a/src/sbt-test/project/flatten/test
+++ b/src/sbt-test/project/flatten/test
@@ -1,25 +1,19 @@
+> ++2.7.7
+
 # This test verifies that sbt works after the source hierarchy has been flattened and merged
 # so that resources and Java and Scala sources are side by side under src/
 
 > update
-[success]
-
 > test
-[success]
 
 # This part verifies that the package-src action works properly under a flattened/merged source hierarchy
 
 > package-project
-[success]
 
 $ delete src
-[success]
 
-> test
-[failure]
+-> test
 
 > unpackage-project
-[success]
 
 > test
-[success]
diff --git a/src/sbt-test/project/lib/changes/LibTestProject.scala b/src/sbt-test/project/lib/changes/LibTestProject.scala
index c586969ae..3bb540a96 100644
--- a/src/sbt-test/project/lib/changes/LibTestProject.scala
+++ b/src/sbt-test/project/lib/changes/LibTestProject.scala
@@ -2,5 +2,7 @@ import sbt._
 
 class LibTestProject(info: ProjectInfo) extends DefaultProject(info)
 {
+	override def disableCrossPaths = true
+	override def buildScalaVersion = defScalaVersion.value
 	lazy val useJar = task { injar.Test.foo }
 }
\ No newline at end of file
diff --git a/src/sbt-test/project/lib/project/build/Test.scala b/src/sbt-test/project/lib/project/build/Test.scala
new file mode 100644
index 000000000..f240876d6
--- /dev/null
+++ b/src/sbt-test/project/lib/project/build/Test.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def disableCrossPaths = true
+	override def buildScalaVersion = defScalaVersion.value
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/lib/test b/src/sbt-test/project/lib/test
index a6870d084..3975db53a 100644
--- a/src/sbt-test/project/lib/test
+++ b/src/sbt-test/project/lib/test
@@ -1,19 +1,14 @@
 # this step builds a test jar for use by the project definition
 > package
-[success]
 
+$ delete project/build
 $ copy-file target/definition-lib-test-1.0.jar project/build/lib/test.jar
-[success]
-
 $ copy-file changes/LibTestProject.scala project/build/src/LibTestProject.scala
-[success]
 
 # the copied project definition depends on the Test module in test.jar and will
 # fail to compile if sbt did not put the jars in project/build/lib/ on the compile classpath
-$ reload
-[success]
+> reload
 
 # The project definition uses the class in test.jar and will fail here if sbt did not put the
 # jars in project/build/lib on the runtime classpath
-> use-jar
-[success]
\ No newline at end of file
+> use-jar
\ No newline at end of file
diff --git a/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala b/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
index 503b434d1..00c1b8ee1 100644
--- a/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
+++ b/src/sbt-test/project/multi/changes/SingleAndTraitProject.scala
@@ -6,4 +6,4 @@ class TestProject(info: ProjectInfo) extends DefaultProject(info)
 
 trait NotAProject extends Project
 abstract class AnotherNonProject extends Project
-object YetAnotherNonProject extends DefaultProject(ProjectInfo(new java.io.File("."), Nil, None)(new ConsoleLogger))
\ No newline at end of file
+object YetAnotherNonProject extends DefaultProject(error("Shouldn't be called"))
\ No newline at end of file
diff --git a/src/sbt-test/project/multi/test b/src/sbt-test/project/multi/test
index 317a22840..a637b54d5 100644
--- a/src/sbt-test/project/multi/test
+++ b/src/sbt-test/project/multi/test
@@ -1,31 +1,16 @@
 # There should be no ambiguity with a single project definition
 
 $ copy-file changes/SingleProject.scala project/build/src/TestProject.scala
-[success]
-
-$ reload
-[success]
+> reload
 
 # Again, no ambiguity with a single project definition and any number of abstract classes/traits implementing Project
-
 $ copy-file changes/SingleAndTraitProject.scala project/build/src/TestProject.scala
-[success]
-
-$ reload
-[success]
-
-# Multiple public projects should be an error
-
-$ copy-file changes/MultiProject.scala project/build/src/TestProject.scala
-[success]
-
-$ reload
-[failure]
+> reload
 
 # One public project and any number of non-public projects should not be an error
-
 $ copy-file changes/SinglePublicProject.scala project/build/src/TestProject.scala
-[success]
+> reload
 
-$ reload
-[success]
+# Multiple public projects should be an error
+$ copy-file changes/MultiProject.scala project/build/src/TestProject.scala
+-> reload
\ No newline at end of file
diff --git a/src/sbt-test/project/plugins/test b/src/sbt-test/project/plugins/test
index f9d588aa7..a5912a391 100644
--- a/src/sbt-test/project/plugins/test
+++ b/src/sbt-test/project/plugins/test
@@ -1,2 +1 @@
-> check
-[success]
\ No newline at end of file
+> check
\ No newline at end of file
diff --git a/src/sbt-test/project/src-plugins/changes/Plugins.scala b/src/sbt-test/project/src-plugins/changes/Plugins.scala
new file mode 100644
index 000000000..20f91dc6e
--- /dev/null
+++ b/src/sbt-test/project/src-plugins/changes/Plugins.scala
@@ -0,0 +1,13 @@
+import sbt._
+
+class Plugins(info: ProjectInfo) extends PluginDefinition(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	override def managedStyle = ManagedStyle.Ivy
+	def projectRoot = Path.fromFile(info.projectPath.asFile.getParentFile.getParentFile)
+	val publishTo = Resolver.file("test-repo", (projectRoot /"repo" / "test").asFile)
+
+	val plug = "test" % "plugins-test" % "1.0"
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/src-plugins/changes/TestPlugin.scala b/src/sbt-test/project/src-plugins/changes/TestPlugin.scala
new file mode 100644
index 000000000..19e043b1f
--- /dev/null
+++ b/src/sbt-test/project/src-plugins/changes/TestPlugin.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+trait TestPlugin extends DefaultProject
+{
+	lazy val check = task { log.info("Test action"); None }
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/src-plugins/changes/UsePlugin.scala b/src/sbt-test/project/src-plugins/changes/UsePlugin.scala
new file mode 100644
index 000000000..0feff6898
--- /dev/null
+++ b/src/sbt-test/project/src-plugins/changes/UsePlugin.scala
@@ -0,0 +1,3 @@
+import sbt._
+
+class UsePlugin(info: ProjectInfo) extends DefaultProject(info) with TestPlugin
\ No newline at end of file
diff --git a/src/sbt-test/project/src-plugins/project/build.properties b/src/sbt-test/project/src-plugins/project/build.properties
new file mode 100644
index 000000000..6915dc797
--- /dev/null
+++ b/src/sbt-test/project/src-plugins/project/build.properties
@@ -0,0 +1,3 @@
+project.version=1.0
+project.name=Plugins Test
+project.organization=test
\ No newline at end of file
diff --git a/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala b/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
new file mode 100644
index 000000000..7f063b03f
--- /dev/null
+++ b/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
@@ -0,0 +1,10 @@
+import sbt._
+
+class DefinePlugin(info: ProjectInfo) extends PluginProject(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	override def managedStyle = ManagedStyle.Ivy
+	val publishTo = Resolver.file("test-repo", ("repo" / "test").asFile)
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/src-plugins/test b/src/sbt-test/project/src-plugins/test
new file mode 100644
index 000000000..93b1260a4
--- /dev/null
+++ b/src/sbt-test/project/src-plugins/test
@@ -0,0 +1,10 @@
+$ copy-file changes/TestPlugin.scala src/main/scala/TestPlugin.scala
+> publish
+
+> set project.name use-plugin-test
+$ delete project/build
+$ copy-file changes/Plugins.scala project/plugins/Plugins.scala
+$ copy-file changes/UsePlugin.scala project/build/UsePlugin.scala
+
+> reload
+> check
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/abstract-type/A.scala b/src/sbt-test/source-dependencies/abstract-type/A.scala
new file mode 100644
index 000000000..08c21e380
--- /dev/null
+++ b/src/sbt-test/source-dependencies/abstract-type/A.scala
@@ -0,0 +1,3 @@
+trait A {
+	type S[_]
+}
diff --git a/src/sbt-test/source-dependencies/abstract-type/B.scala b/src/sbt-test/source-dependencies/abstract-type/B.scala
new file mode 100644
index 000000000..c6fa33d89
--- /dev/null
+++ b/src/sbt-test/source-dependencies/abstract-type/B.scala
@@ -0,0 +1,3 @@
+trait B extends A {
+	type F = S[Int]
+}
diff --git a/src/sbt-test/source-dependencies/abstract-type/changes/A.scala b/src/sbt-test/source-dependencies/abstract-type/changes/A.scala
new file mode 100644
index 000000000..7d5c095b4
--- /dev/null
+++ b/src/sbt-test/source-dependencies/abstract-type/changes/A.scala
@@ -0,0 +1,3 @@
+trait A {
+	type S
+}
diff --git a/src/sbt-test/source-dependencies/abstract-type/project/build.properties b/src/sbt-test/source-dependencies/abstract-type/project/build.properties
new file mode 100644
index 000000000..5206c1758
--- /dev/null
+++ b/src/sbt-test/source-dependencies/abstract-type/project/build.properties
@@ -0,0 +1,3 @@
+project.name=abstract-type
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/abstract-type/test b/src/sbt-test/source-dependencies/abstract-type/test
new file mode 100644
index 000000000..a5dd8502d
--- /dev/null
+++ b/src/sbt-test/source-dependencies/abstract-type/test
@@ -0,0 +1,7 @@
+> +compile
+
+# remove type arguments from S
+$ copy-file changes/A.scala A.scala
+
+# Both A.scala and B.scala should be recompiled, producing a compile error
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/added/test b/src/sbt-test/source-dependencies/added/test
index 5ba6a5af9..4f85e4288 100644
--- a/src/sbt-test/source-dependencies/added/test
+++ b/src/sbt-test/source-dependencies/added/test
@@ -3,37 +3,26 @@
 
 # B and A are independent, so both should compile successfully
 $ copy-file changes/A1.scala src/main/scala/A.scala
-[success]
 $ copy-file changes/B1.scala src/main/scala/B.scala
-[success]
-> compile
-[success]
+> +compile
 
 
 # A now depends on B and to check that it was recompiled, we mismatch the types, which should fail
 $ copy-file changes/A2.scala src/main/scala/A.scala
-[success]
-> compile
-[failure]
+-> +compile
 
 
 # We now correct the type so that it compiles successfully and this should introduce a dependency from A to B
 $ copy-file changes/A3.scala src/main/scala/A.scala
-[success]
-> compile
-[success]
+> +compile
 
 
 # If the dependency from A to B was properly introduced, changing the type of B.y to Int should make
 # the following statement in A a compiler error:
 #   val x: String = B.y
 $ copy-file changes/B2.scala src/main/scala/B.scala
-[success]
-> compile
-[failure]
+-> +compile
 
 # verify this was the correct result by doing a clean+compile
->clean
-[success]
-> compile
-[failure]
\ No newline at end of file
+> +clean
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/by-name/A.scala b/src/sbt-test/source-dependencies/by-name/A.scala
new file mode 100644
index 000000000..46ec286ff
--- /dev/null
+++ b/src/sbt-test/source-dependencies/by-name/A.scala
@@ -0,0 +1,4 @@
+object A
+{
+	def x(i: => String) = ()
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/by-name/B.scala b/src/sbt-test/source-dependencies/by-name/B.scala
new file mode 100644
index 000000000..a06f3a186
--- /dev/null
+++ b/src/sbt-test/source-dependencies/by-name/B.scala
@@ -0,0 +1,4 @@
+object B
+{
+	val x = A.x("3")
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/by-name/changes/A.scala b/src/sbt-test/source-dependencies/by-name/changes/A.scala
new file mode 100644
index 000000000..0d12dd477
--- /dev/null
+++ b/src/sbt-test/source-dependencies/by-name/changes/A.scala
@@ -0,0 +1,4 @@
+object A
+{
+	def x(i: Function0[String]) = ()
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/by-name/project/build.properties b/src/sbt-test/source-dependencies/by-name/project/build.properties
new file mode 100644
index 000000000..a69cc28b4
--- /dev/null
+++ b/src/sbt-test/source-dependencies/by-name/project/build.properties
@@ -0,0 +1,3 @@
+project.name=by-name
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/by-name/test b/src/sbt-test/source-dependencies/by-name/test
new file mode 100644
index 000000000..0d39f0383
--- /dev/null
+++ b/src/sbt-test/source-dependencies/by-name/test
@@ -0,0 +1,7 @@
+> +compile
+
+# change => Int to Function0
+$ copy-file changes/A.scala A.scala
+
+# Both A.scala and B.scala need to be recompiled because the type has changed
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/default-params/A.scala b/src/sbt-test/source-dependencies/default-params/A.scala
new file mode 100644
index 000000000..50baa662f
--- /dev/null
+++ b/src/sbt-test/source-dependencies/default-params/A.scala
@@ -0,0 +1,5 @@
+object A
+{
+	def x(f: String, g: Int): Int = g
+	def x(f: Int, g: Int = 3): Int = g
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/default-params/B.scala b/src/sbt-test/source-dependencies/default-params/B.scala
new file mode 100644
index 000000000..59a7159f9
--- /dev/null
+++ b/src/sbt-test/source-dependencies/default-params/B.scala
@@ -0,0 +1,4 @@
+object B
+{
+	val y = A.x(5)
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/default-params/changes/A.scala b/src/sbt-test/source-dependencies/default-params/changes/A.scala
new file mode 100644
index 000000000..b59015306
--- /dev/null
+++ b/src/sbt-test/source-dependencies/default-params/changes/A.scala
@@ -0,0 +1,5 @@
+object A
+{
+	def x(f: String, g: Int = 3): Int = g
+	def x(f: Int, g: Int): Int = g
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/default-params/project/build.properties b/src/sbt-test/source-dependencies/default-params/project/build.properties
new file mode 100644
index 000000000..76fda34a1
--- /dev/null
+++ b/src/sbt-test/source-dependencies/default-params/project/build.properties
@@ -0,0 +1,3 @@
+project.name=default-params
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/default-params/test b/src/sbt-test/source-dependencies/default-params/test
new file mode 100644
index 000000000..666b17986
--- /dev/null
+++ b/src/sbt-test/source-dependencies/default-params/test
@@ -0,0 +1,11 @@
+# default parameters are only in 2.8
+> ++2.8.0-SNAPSHOT
+> compile
+
+# switch which 'x' method has a default for the second parameter in A
+#   this change is selected because of the encoding of default method names
+$ copy-file changes/A.scala A.scala
+
+# Both A.scala and B.scala need to be recompiled because the parameter needs to be explicitly provided
+# and it should be a compile error
+-> compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/empty-a/test b/src/sbt-test/source-dependencies/empty-a/test
index 2e58e8cb9..ecba8ad1a 100644
--- a/src/sbt-test/source-dependencies/empty-a/test
+++ b/src/sbt-test/source-dependencies/empty-a/test
@@ -1,41 +1,19 @@
 $ copy-file changes/A.scala src/main/scala/A.scala
-[success]
-
-> compile
-[success]
+> +compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
-[success]
-
-> compile
-[success]
+> +compile
 
 $ copy-file changes/B.scala src/main/scala/B.scala
-[success]
-
-> compile
-[failure]
+-> +compile
 
 $ copy-file changes/A.scala src/main/scala/A.scala
-[success]
-
-> compile
-[success]
+> +compile
 
 $ delete src/main/scala/B.scala
-[success]
-
 $ copy-file changes/A2.scala src/main/scala/A.scala
-[success]
-
-> compile
-[success]
+> +compile
 
 $ copy-file changes/A.scala src/main/scala/A.scala
-[success]
-
 $ copy-file changes/B.scala src/main/scala/B.scala
-[success]
-
-> compile
-[success]
+> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/erasure/A.scala b/src/sbt-test/source-dependencies/erasure/A.scala
new file mode 100644
index 000000000..63b240ac6
--- /dev/null
+++ b/src/sbt-test/source-dependencies/erasure/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: List[Int] = List(3)
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/erasure/B.scala b/src/sbt-test/source-dependencies/erasure/B.scala
new file mode 100644
index 000000000..1c636101f
--- /dev/null
+++ b/src/sbt-test/source-dependencies/erasure/B.scala
@@ -0,0 +1,3 @@
+object B {
+	val y: List[Int] = A.x
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/erasure/changes/A.scala b/src/sbt-test/source-dependencies/erasure/changes/A.scala
new file mode 100644
index 000000000..c1bceae79
--- /dev/null
+++ b/src/sbt-test/source-dependencies/erasure/changes/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: List[String] = List("3")
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/erasure/project/build.properties b/src/sbt-test/source-dependencies/erasure/project/build.properties
new file mode 100644
index 000000000..a38a143cd
--- /dev/null
+++ b/src/sbt-test/source-dependencies/erasure/project/build.properties
@@ -0,0 +1,3 @@
+project.name=erasure
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/erasure/test b/src/sbt-test/source-dependencies/erasure/test
new file mode 100644
index 000000000..30a932d1b
--- /dev/null
+++ b/src/sbt-test/source-dependencies/erasure/test
@@ -0,0 +1,4 @@
+> +compile
+
+$ copy-file changes/A.scala A.scala
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/false-error/A.scala b/src/sbt-test/source-dependencies/false-error/A.scala
new file mode 100644
index 000000000..64675b5e3
--- /dev/null
+++ b/src/sbt-test/source-dependencies/false-error/A.scala
@@ -0,0 +1,4 @@
+object A {
+	val x = 3
+	val z: Int = B.y
+}
diff --git a/src/sbt-test/source-dependencies/false-error/B.scala b/src/sbt-test/source-dependencies/false-error/B.scala
new file mode 100644
index 000000000..756aeacf6
--- /dev/null
+++ b/src/sbt-test/source-dependencies/false-error/B.scala
@@ -0,0 +1,3 @@
+object B {
+	val y = A.x
+}
diff --git a/src/sbt-test/source-dependencies/false-error/changes/A.scala b/src/sbt-test/source-dependencies/false-error/changes/A.scala
new file mode 100644
index 000000000..b2c9dfb26
--- /dev/null
+++ b/src/sbt-test/source-dependencies/false-error/changes/A.scala
@@ -0,0 +1,4 @@
+object A {
+	val x = "3"
+	val z: String = B.y
+}
diff --git a/src/sbt-test/source-dependencies/false-error/project/build.properties b/src/sbt-test/source-dependencies/false-error/project/build.properties
new file mode 100644
index 000000000..168e1bf4d
--- /dev/null
+++ b/src/sbt-test/source-dependencies/false-error/project/build.properties
@@ -0,0 +1,3 @@
+project.name=no-false-error
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/false-error/test b/src/sbt-test/source-dependencies/false-error/test
new file mode 100644
index 000000000..aac00c6b9
--- /dev/null
+++ b/src/sbt-test/source-dependencies/false-error/test
@@ -0,0 +1,5 @@
+> +compile
+
+$ copy-file changes/A.scala A.scala
+
+> +compile
diff --git a/src/sbt-test/source-dependencies/implicit-params/A.scala b/src/sbt-test/source-dependencies/implicit-params/A.scala
new file mode 100644
index 000000000..598d266d4
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit-params/A.scala
@@ -0,0 +1,6 @@
+class A
+{
+	implicit def e: E = new E
+	def x(i: Int)(implicit y: E): String = ""
+}
+class E
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit-params/B.scala b/src/sbt-test/source-dependencies/implicit-params/B.scala
new file mode 100644
index 000000000..3273cdceb
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit-params/B.scala
@@ -0,0 +1,4 @@
+object B extends A
+{
+	val y = x(3)
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit-params/changes/A.scala b/src/sbt-test/source-dependencies/implicit-params/changes/A.scala
new file mode 100644
index 000000000..2de2c62ee
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit-params/changes/A.scala
@@ -0,0 +1,6 @@
+class A
+{
+	implicit def e: E = new E
+	def x(i: Int)(y: E): String = ""
+}
+class E
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit-params/project/build.properties b/src/sbt-test/source-dependencies/implicit-params/project/build.properties
new file mode 100644
index 000000000..473fe0930
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit-params/project/build.properties
@@ -0,0 +1,3 @@
+project.name=implicit-params
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit-params/test b/src/sbt-test/source-dependencies/implicit-params/test
new file mode 100644
index 000000000..5b0be8a77
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit-params/test
@@ -0,0 +1,8 @@
+> +compile
+
+# make implicit parameters in A.x be explicit
+$ copy-file changes/A.scala A.scala
+
+# Both A.scala and B.scala need to be recompiled because the parameter section is no longer implicit
+# and it should be a compile error
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit/A.scala b/src/sbt-test/source-dependencies/implicit/A.scala
new file mode 100644
index 000000000..765f66013
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit/A.scala
@@ -0,0 +1,4 @@
+class A
+{
+	implicit def x(i: Int): String = i.toString
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit/B.scala b/src/sbt-test/source-dependencies/implicit/B.scala
new file mode 100644
index 000000000..ec0200dfa
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit/B.scala
@@ -0,0 +1,4 @@
+object B extends A
+{
+	val x: String = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit/changes/A.scala b/src/sbt-test/source-dependencies/implicit/changes/A.scala
new file mode 100644
index 000000000..24f8e4069
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit/changes/A.scala
@@ -0,0 +1,4 @@
+class A
+{
+	def x(i: Int): String = i.toString
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit/project/build.properties b/src/sbt-test/source-dependencies/implicit/project/build.properties
new file mode 100644
index 000000000..85325a978
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit/project/build.properties
@@ -0,0 +1,3 @@
+project.name=implicit
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/implicit/test b/src/sbt-test/source-dependencies/implicit/test
new file mode 100644
index 000000000..57d694872
--- /dev/null
+++ b/src/sbt-test/source-dependencies/implicit/test
@@ -0,0 +1,7 @@
+> +compile
+
+# change A.x to be implicit
+$ copy-file changes/A.scala A.scala
+
+# Both A.scala and B.scala need to be recompiled because a new implicit is available
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/import/A.scala b/src/sbt-test/source-dependencies/import/A.scala
new file mode 100644
index 000000000..1c94ccf3a
--- /dev/null
+++ b/src/sbt-test/source-dependencies/import/A.scala
@@ -0,0 +1 @@
+package a.b
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/import/B.scala b/src/sbt-test/source-dependencies/import/B.scala
new file mode 100644
index 000000000..10ee10d82
--- /dev/null
+++ b/src/sbt-test/source-dependencies/import/B.scala
@@ -0,0 +1 @@
+import a.b
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/import/changes/A.scala b/src/sbt-test/source-dependencies/import/changes/A.scala
new file mode 100644
index 000000000..d63f93ea4
--- /dev/null
+++ b/src/sbt-test/source-dependencies/import/changes/A.scala
@@ -0,0 +1 @@
+package a
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/import/project/build.properties b/src/sbt-test/source-dependencies/import/project/build.properties
new file mode 100644
index 000000000..fe80ce662
--- /dev/null
+++ b/src/sbt-test/source-dependencies/import/project/build.properties
@@ -0,0 +1,3 @@
+project.name=import
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/import/test b/src/sbt-test/source-dependencies/import/test
new file mode 100644
index 000000000..393bdb6a7
--- /dev/null
+++ b/src/sbt-test/source-dependencies/import/test
@@ -0,0 +1,8 @@
+> +compile
+
+# shorten the package defined in A from 'a.b' to 'a'.
+$ copy-file changes/A.scala A.scala
+
+# 'import a.b' should now fail in B.scala
+# disabled because scalac doesn't track this dependency
+#-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/intermediate-error/A.scala b/src/sbt-test/source-dependencies/intermediate-error/A.scala
new file mode 100644
index 000000000..392db0805
--- /dev/null
+++ b/src/sbt-test/source-dependencies/intermediate-error/A.scala
@@ -0,0 +1,6 @@
+object A
+{
+	def x = 3
+	//def x: String = 3
+	//def x: String = "3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/intermediate-error/B.scala b/src/sbt-test/source-dependencies/intermediate-error/B.scala
new file mode 100644
index 000000000..1a1e0c06f
--- /dev/null
+++ b/src/sbt-test/source-dependencies/intermediate-error/B.scala
@@ -0,0 +1,4 @@
+object B
+{
+	val y: Int = A.x
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala b/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
new file mode 100644
index 000000000..ba9953954
--- /dev/null
+++ b/src/sbt-test/source-dependencies/intermediate-error/changes/A2.scala
@@ -0,0 +1,6 @@
+object A
+{
+	//def x = 3
+	def x: String = 3
+	//def x: String = "3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala b/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
new file mode 100644
index 000000000..f020041ea
--- /dev/null
+++ b/src/sbt-test/source-dependencies/intermediate-error/changes/A3.scala
@@ -0,0 +1,6 @@
+object A
+{
+	//def x = 3
+	//def x: String = 3
+	def x: String = "3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/intermediate-error/project/build.properties b/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
new file mode 100644
index 000000000..c67debabc
--- /dev/null
+++ b/src/sbt-test/source-dependencies/intermediate-error/project/build.properties
@@ -0,0 +1,3 @@
+project.name=intermediate-error
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/intermediate-error/test b/src/sbt-test/source-dependencies/intermediate-error/test
new file mode 100644
index 000000000..64cf407c5
--- /dev/null
+++ b/src/sbt-test/source-dependencies/intermediate-error/test
@@ -0,0 +1,7 @@
+> +compile
+
+$ copy-file changes/A2.scala A.scala
+-> +compile
+
+$ copy-file changes/A3.scala A.scala
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-basic/test b/src/sbt-test/source-dependencies/java-basic/test
index 5dca1b173..0dfee643f 100644
--- a/src/sbt-test/source-dependencies/java-basic/test
+++ b/src/sbt-test/source-dependencies/java-basic/test
@@ -2,60 +2,43 @@
 
 # A is a basic Java file with no dependencies.  Just a basic check for Java compilation
 $ copy-file changes/A.java src/main/java/a/A.java
-[success]
-> compile
-[success]
+> +compile
 
 # A2 is a basic Java file with no dependencies.  This is added to verify
 # that classes are properly mapped back to their source.
 # (There are two files named A.java now, one in a/ and one in a/b)
 $ copy-file changes/A2.java src/main/java/a/b/A.java
-[success]
-> compile
-[success]
+> +compile
 
 # This adds B, another basic Java file with no dependencies
 $ copy-file changes/B1.java src/main/java/a/b/B.java
-[success]
-> compile
-[success]
+> +compile
 
 # Now, modify B so that it depends on a.A
 # This ensures that dependencies on a source not included in the compilation
 # (a/A.java has not changed) are tracked
 $ copy-file changes/B2.java src/main/java/a/b/B.java
-[success]
-> compile
-[success]
+> +compile
 
 # Remove a.b.A and there should be no problem compiling, since B should
 # have recorded a dependency on a.A and not a.b.A
 $ delete src/main/java/a/b/A.java
-[success]
-> compile
-[success]
+> +compile
 
 # Remove a.A and B should be recompiled if the dependency on a.A was properly
 # recorded.  This should be a compile error, since we haven't updated B to not
 # depend on A
 $ delete src/main/java/a/A.java
-[success]
-> compile
-[failure]
+-> +compile
 
 # Replace B with a new B that doesn't depend on a.A and so it should compile
 # It shouldn't run though, because it doesn't have a main method
 $ copy-file changes/B1.java src/main/java/a/b/B.java
-[success]
-> compile
-[success]
-> run
-[failure]
+> +compile
+-> +run
 
 
 # Replace B with a new B that has a main method and should therefore run
 # if the main method was properly detected
 $ copy-file changes/B3.java src/main/java/a/b/B.java
-[success]
-> run
-[success]
\ No newline at end of file
+> +run
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/java-static/test b/src/sbt-test/source-dependencies/java-static/test
index 7a13a1186..d75a1bfdc 100644
--- a/src/sbt-test/source-dependencies/java-static/test
+++ b/src/sbt-test/source-dependencies/java-static/test
@@ -9,24 +9,16 @@
 
 # add and compile the Java source
 $ copy-file changes/J1.java src/main/java/J.java
-[success]
-> compile
-[success]
+> +compile
 
 # add and compile the Scala source
 $ copy-file changes/S.scala src/main/scala/S.scala
-[success]
-> compile
-[success]
+> +compile
 
 # change the Java source so that a compile error should occur if S.scala is also recompiled (which will happen if the dependency was properly recorded)
 $ copy-file changes/J2.java src/main/java/J.java
-[success]
-> compile
-[failure]
+-> +compile
 
 # verify it should have failed by doing a full recompilation
-> clean
-[success]
-> compile
-[failure]
\ No newline at end of file
+> +clean
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/lazy-val/A.scala b/src/sbt-test/source-dependencies/lazy-val/A.scala
new file mode 100644
index 000000000..fc3870856
--- /dev/null
+++ b/src/sbt-test/source-dependencies/lazy-val/A.scala
@@ -0,0 +1,4 @@
+class A
+{
+	val x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/lazy-val/B.scala b/src/sbt-test/source-dependencies/lazy-val/B.scala
new file mode 100644
index 000000000..3ddfddb61
--- /dev/null
+++ b/src/sbt-test/source-dependencies/lazy-val/B.scala
@@ -0,0 +1,4 @@
+class B extends A
+{
+	override val x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/lazy-val/changes/A.scala b/src/sbt-test/source-dependencies/lazy-val/changes/A.scala
new file mode 100644
index 000000000..805901802
--- /dev/null
+++ b/src/sbt-test/source-dependencies/lazy-val/changes/A.scala
@@ -0,0 +1,4 @@
+class A
+{
+	lazy val x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/lazy-val/project/build.properties b/src/sbt-test/source-dependencies/lazy-val/project/build.properties
new file mode 100644
index 000000000..713d6be32
--- /dev/null
+++ b/src/sbt-test/source-dependencies/lazy-val/project/build.properties
@@ -0,0 +1,3 @@
+project.name=lazy-val
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/lazy-val/test b/src/sbt-test/source-dependencies/lazy-val/test
new file mode 100644
index 000000000..5e9230e9c
--- /dev/null
+++ b/src/sbt-test/source-dependencies/lazy-val/test
@@ -0,0 +1,6 @@
+> +compile
+
+# replace val x with lazy val x
+$ copy-file changes/A.scala A.scala
+
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/linearization/A.scala b/src/sbt-test/source-dependencies/linearization/A.scala
new file mode 100644
index 000000000..69399d3fb
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/A.scala
@@ -0,0 +1,3 @@
+trait A {
+	def x = 3
+}
diff --git a/src/sbt-test/source-dependencies/linearization/B.scala b/src/sbt-test/source-dependencies/linearization/B.scala
new file mode 100644
index 000000000..608b53052
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/B.scala
@@ -0,0 +1,3 @@
+trait B extends A {
+	override def x = super.x * 2
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/linearization/C.scala b/src/sbt-test/source-dependencies/linearization/C.scala
new file mode 100644
index 000000000..3fbd747e0
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/C.scala
@@ -0,0 +1,3 @@
+trait C extends A {
+	override def x = super.x + 5
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/linearization/D.scala b/src/sbt-test/source-dependencies/linearization/D.scala
new file mode 100644
index 000000000..7b46ebf97
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/D.scala
@@ -0,0 +1,2 @@
+// define the order
+trait D extends C with B
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/linearization/E.scala b/src/sbt-test/source-dependencies/linearization/E.scala
new file mode 100644
index 000000000..f69ea1d51
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/E.scala
@@ -0,0 +1,2 @@
+// put a level in between D and its concrete class
+trait E extends D
diff --git a/src/sbt-test/source-dependencies/linearization/F.scala b/src/sbt-test/source-dependencies/linearization/F.scala
new file mode 100644
index 000000000..6dda903f5
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/F.scala
@@ -0,0 +1,3 @@
+object F extends E {
+	def main(args: Array[String]) = assert(x == args(0).toInt, x)
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/linearization/changes/D.scala b/src/sbt-test/source-dependencies/linearization/changes/D.scala
new file mode 100644
index 000000000..84c173887
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/changes/D.scala
@@ -0,0 +1 @@
+trait D extends B with C
diff --git a/src/sbt-test/source-dependencies/linearization/project/build.properties b/src/sbt-test/source-dependencies/linearization/project/build.properties
new file mode 100644
index 000000000..713d6be32
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/project/build.properties
@@ -0,0 +1,3 @@
+project.name=lazy-val
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/linearization/test b/src/sbt-test/source-dependencies/linearization/test
new file mode 100644
index 000000000..480962b6c
--- /dev/null
+++ b/src/sbt-test/source-dependencies/linearization/test
@@ -0,0 +1,13 @@
+> +compile
+
+# the value of F.x should be 16
+> +run 16
+
+# modify D.scala so that the linearization changes
+$ copy-file changes/D.scala D.scala
+# F.x becomes 11
+> +compile
+
+# if F is recompiled, the value of x should be 11, otherwise it will still be 16
+# and this will fail
+> +run 11
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/named/A.scala b/src/sbt-test/source-dependencies/named/A.scala
new file mode 100644
index 000000000..42afb874d
--- /dev/null
+++ b/src/sbt-test/source-dependencies/named/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x(zz: Int, yy: Int) = yy - zz
+}
diff --git a/src/sbt-test/source-dependencies/named/B.scala b/src/sbt-test/source-dependencies/named/B.scala
new file mode 100644
index 000000000..5699c4db8
--- /dev/null
+++ b/src/sbt-test/source-dependencies/named/B.scala
@@ -0,0 +1,7 @@
+object B {
+	def main(args: Array[String]): Unit =
+	{
+		val result = A.x(zz = 3, yy = 4)
+		assert(result == args(0).toInt, result)
+	}
+}
diff --git a/src/sbt-test/source-dependencies/named/changes/A.scala b/src/sbt-test/source-dependencies/named/changes/A.scala
new file mode 100644
index 000000000..04b150525
--- /dev/null
+++ b/src/sbt-test/source-dependencies/named/changes/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x(yy: Int, zz: Int) = yy - zz
+}
diff --git a/src/sbt-test/source-dependencies/named/project/build.properties b/src/sbt-test/source-dependencies/named/project/build.properties
new file mode 100644
index 000000000..61029bf16
--- /dev/null
+++ b/src/sbt-test/source-dependencies/named/project/build.properties
@@ -0,0 +1,3 @@
+project.name=named
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/named/test b/src/sbt-test/source-dependencies/named/test
new file mode 100644
index 000000000..55cfc1486
--- /dev/null
+++ b/src/sbt-test/source-dependencies/named/test
@@ -0,0 +1,16 @@
+# named parameters are only in 2.8
+> ++2.8.0-SNAPSHOT
+
+> compile
+
+# result should be 1
+> run 1
+
+# change order of arguments in A.x
+$ copy-file changes/A.scala A.scala
+
+# Recompile
+> compile
+
+# Should still get 1 and not -1
+> run 1
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/new-cyclic/test b/src/sbt-test/source-dependencies/new-cyclic/test
index 1a8ead2f3..aae8fdeaf 100644
--- a/src/sbt-test/source-dependencies/new-cyclic/test
+++ b/src/sbt-test/source-dependencies/new-cyclic/test
@@ -1,8 +1,4 @@
-> compile
-[success]
+> +compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
-[success]
-
-> compile
-[failure]
+-> +compile
diff --git a/src/sbt-test/source-dependencies/parent-change/W.scala b/src/sbt-test/source-dependencies/parent-change/W.scala
new file mode 100644
index 000000000..527676b6d
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-change/W.scala
@@ -0,0 +1,5 @@
+class W
+{
+	def x = 3
+}
+class V extends W
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-change/Y.scala b/src/sbt-test/source-dependencies/parent-change/Y.scala
new file mode 100644
index 000000000..9379ee7b6
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-change/Y.scala
@@ -0,0 +1,5 @@
+object Y
+{
+	def main(args: Array[String]) =
+		println( (new Z).x )
+}
diff --git a/src/sbt-test/source-dependencies/parent-change/Z.scala b/src/sbt-test/source-dependencies/parent-change/Z.scala
new file mode 100644
index 000000000..0f7c79a40
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-change/Z.scala
@@ -0,0 +1 @@
+class Z extends V
diff --git a/src/sbt-test/source-dependencies/parent-change/changes/W.scala b/src/sbt-test/source-dependencies/parent-change/changes/W.scala
new file mode 100644
index 000000000..f2e4dc28f
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-change/changes/W.scala
@@ -0,0 +1,5 @@
+class W
+{
+	def x = 3
+}
+class V
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-change/project/build.properties b/src/sbt-test/source-dependencies/parent-change/project/build.properties
new file mode 100644
index 000000000..14d3f7e07
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-change/project/build.properties
@@ -0,0 +1,3 @@
+project.name=parent-member
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-change/test b/src/sbt-test/source-dependencies/parent-change/test
new file mode 100644
index 000000000..5f45f4756
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-change/test
@@ -0,0 +1,7 @@
+> +compile
+
+# modify V to no longer extend W
+$ copy-file changes/W.scala W.scala
+
+# Should recompile Y.scala and report an error: "value x is not a member of Z"
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-member-change/A.scala b/src/sbt-test/source-dependencies/parent-member-change/A.scala
new file mode 100644
index 000000000..d6f828508
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-member-change/A.scala
@@ -0,0 +1,3 @@
+class A {
+	def x(i: Int) = i+"3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-member-change/B.scala b/src/sbt-test/source-dependencies/parent-member-change/B.scala
new file mode 100644
index 000000000..26e47fd25
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-member-change/B.scala
@@ -0,0 +1 @@
+class B extends A
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-member-change/C.scala b/src/sbt-test/source-dependencies/parent-member-change/C.scala
new file mode 100644
index 000000000..6985a0d2f
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-member-change/C.scala
@@ -0,0 +1,3 @@
+class C extends B {
+	def x(s: String) = s+"5"
+}
diff --git a/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala b/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
new file mode 100644
index 000000000..949655f41
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-member-change/changes/A.scala
@@ -0,0 +1,3 @@
+class A {
+	def x(i: String) = i+"3"
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-member-change/project/build.properties b/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
new file mode 100644
index 000000000..d08e70fba
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-member-change/project/build.properties
@@ -0,0 +1,3 @@
+project.name=parent-member-change
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/parent-member-change/test b/src/sbt-test/source-dependencies/parent-member-change/test
new file mode 100644
index 000000000..6f4ce0df8
--- /dev/null
+++ b/src/sbt-test/source-dependencies/parent-member-change/test
@@ -0,0 +1,7 @@
+> +compile
+
+# modify A.scala so that the signature of its method changes to be identical to
+# that of the method in its descendent in C.scala
+$ copy-file changes/A.scala A.scala
+# Should recompile C.scala and report this error, failing the compile
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/qualified-access/A.scala b/src/sbt-test/source-dependencies/qualified-access/A.scala
new file mode 100644
index 000000000..b1ff88af7
--- /dev/null
+++ b/src/sbt-test/source-dependencies/qualified-access/A.scala
@@ -0,0 +1,10 @@
+package a
+{
+	package b
+	{
+		object A
+		{
+			private[a] def x = 3
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/qualified-access/B.scala b/src/sbt-test/source-dependencies/qualified-access/B.scala
new file mode 100644
index 000000000..d709285f5
--- /dev/null
+++ b/src/sbt-test/source-dependencies/qualified-access/B.scala
@@ -0,0 +1,6 @@
+package a
+
+object B
+{
+	val y = b.A.x
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/qualified-access/changes/A.scala b/src/sbt-test/source-dependencies/qualified-access/changes/A.scala
new file mode 100644
index 000000000..ef50d0ef9
--- /dev/null
+++ b/src/sbt-test/source-dependencies/qualified-access/changes/A.scala
@@ -0,0 +1,6 @@
+package a.b
+
+object A
+{
+	private[b] def x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/qualified-access/project/build.properties b/src/sbt-test/source-dependencies/qualified-access/project/build.properties
new file mode 100644
index 000000000..51409b08c
--- /dev/null
+++ b/src/sbt-test/source-dependencies/qualified-access/project/build.properties
@@ -0,0 +1,3 @@
+project.name=qualified-access
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/qualified-access/test b/src/sbt-test/source-dependencies/qualified-access/test
new file mode 100644
index 000000000..b368fc123
--- /dev/null
+++ b/src/sbt-test/source-dependencies/qualified-access/test
@@ -0,0 +1,7 @@
+> +compile
+
+# change access of A.x
+$ copy-file changes/A.scala A.scala
+
+# Should force recompilation of B.scala because access changed and B's access is now invalid.
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/remove-test-a/test b/src/sbt-test/source-dependencies/remove-test-a/test
index e3d44e4e1..a3ed3425c 100644
--- a/src/sbt-test/source-dependencies/remove-test-a/test
+++ b/src/sbt-test/source-dependencies/remove-test-a/test
@@ -1,14 +1,7 @@
-> compile
-[success]
+> +compile
 
 $ copy-file changes/1.scala src/main/scala/1.scala
-[success]
-
-> compile
-[error]
+-> +compile
 
 $ delete src/main/scala/1.scala
-[success]
-
-> compile
-[success]
\ No newline at end of file
+> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/remove-test-b/test b/src/sbt-test/source-dependencies/remove-test-b/test
index 4d9f786f3..7115a1b3a 100644
--- a/src/sbt-test/source-dependencies/remove-test-b/test
+++ b/src/sbt-test/source-dependencies/remove-test-b/test
@@ -1,50 +1,25 @@
-> compile
-[success]
+> +compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
-[success]
-
-> compile
-[error]
+-> +compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-[success]
-
-> compile
-[success]
+> +compile
 
 $ delete src/main/scala/B.scala
-[success]
-
-> compile
-[failure]
+-> +compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-[success]
-
-> compile
-[success]
+> +compile
 
 $ copy-file changes/B4.scala src/main/scala/B.scala
-[success]
-
-> compile
-[failure]
+-> +compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-[success]
-
-> compile
-[success]
+> +compile
 
 $ copy-file changes/B5.scala src/main/scala/B.scala
-[success]
-
-> compile
-[failure]
+-> +compile
 
 $ copy-file changes/B3.scala src/main/scala/B.scala
-[success]
-
-> compile
-[success]
\ No newline at end of file
+> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/repeated-parameters/A.scala b/src/sbt-test/source-dependencies/repeated-parameters/A.scala
new file mode 100644
index 000000000..df798a859
--- /dev/null
+++ b/src/sbt-test/source-dependencies/repeated-parameters/A.scala
@@ -0,0 +1,4 @@
+object A
+{
+	def x(i: String*) = ()
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/repeated-parameters/B.scala b/src/sbt-test/source-dependencies/repeated-parameters/B.scala
new file mode 100644
index 000000000..a06f3a186
--- /dev/null
+++ b/src/sbt-test/source-dependencies/repeated-parameters/B.scala
@@ -0,0 +1,4 @@
+object B
+{
+	val x = A.x("3")
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala b/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
new file mode 100644
index 000000000..6de960644
--- /dev/null
+++ b/src/sbt-test/source-dependencies/repeated-parameters/changes/A.scala
@@ -0,0 +1,4 @@
+object A
+{
+	def x(i: Seq[String]) = ()
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties b/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
new file mode 100644
index 000000000..245bcfdf1
--- /dev/null
+++ b/src/sbt-test/source-dependencies/repeated-parameters/project/build.properties
@@ -0,0 +1,3 @@
+project.name=repeated-parameters
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/repeated-parameters/test b/src/sbt-test/source-dependencies/repeated-parameters/test
new file mode 100644
index 000000000..e91d8d6ce
--- /dev/null
+++ b/src/sbt-test/source-dependencies/repeated-parameters/test
@@ -0,0 +1,7 @@
+> +compile
+
+# change repeated parameters to Seq
+$ copy-file changes/A.scala A.scala
+
+# B.scala needs recompiling because the type has changed
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/replace-test-a/test b/src/sbt-test/source-dependencies/replace-test-a/test
index cdaf24b09..f8e0dd629 100644
--- a/src/sbt-test/source-dependencies/replace-test-a/test
+++ b/src/sbt-test/source-dependencies/replace-test-a/test
@@ -1,19 +1,9 @@
 $ copy-file changes/first.scala src/main/scala/A.scala
-[success]
-
-> compile
-[success]
-> check-first
-[success]
-> check-second
-[failure]
+> +compile
+> +check-first
+-> +check-second
 
 $ copy-file changes/second.scala src/main/scala/A.scala
-[success]
-
-> compile
-[success]
-> check-first
-[failure]
-> check-second
-[success]
\ No newline at end of file
+> +compile
+-> +check-first
+> +check-second
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/sealed/A.scala b/src/sbt-test/source-dependencies/sealed/A.scala
new file mode 100644
index 000000000..d185a50a9
--- /dev/null
+++ b/src/sbt-test/source-dependencies/sealed/A.scala
@@ -0,0 +1,3 @@
+sealed trait A
+class B extends A
+class C extends A
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/sealed/D.scala b/src/sbt-test/source-dependencies/sealed/D.scala
new file mode 100644
index 000000000..1f49e9d61
--- /dev/null
+++ b/src/sbt-test/source-dependencies/sealed/D.scala
@@ -0,0 +1,8 @@
+
+object D {
+def x(a: A) =
+	a match {
+		case _: B => ()
+		case _: C => ()
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/sealed/changes/A.scala b/src/sbt-test/source-dependencies/sealed/changes/A.scala
new file mode 100644
index 000000000..f00e9c127
--- /dev/null
+++ b/src/sbt-test/source-dependencies/sealed/changes/A.scala
@@ -0,0 +1,4 @@
+sealed trait A
+class B extends A
+class C extends A
+class E extends A
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/sealed/project/build.properties b/src/sbt-test/source-dependencies/sealed/project/build.properties
new file mode 100644
index 000000000..cfd728873
--- /dev/null
+++ b/src/sbt-test/source-dependencies/sealed/project/build.properties
@@ -0,0 +1,3 @@
+project.name=sealed
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/sealed/test b/src/sbt-test/source-dependencies/sealed/test
new file mode 100644
index 000000000..442841a12
--- /dev/null
+++ b/src/sbt-test/source-dependencies/sealed/test
@@ -0,0 +1,9 @@
+> +compile
+
+# have new class E extend A
+$ copy-file changes/A.scala A.scala
+
+# D.scala needs recompiling because the pattern match in D
+# is no longer exhaustive, which should be a warning
+# there is no way to make warnings errors, so this has to be manually checked
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/specialized/A.scala b/src/sbt-test/source-dependencies/specialized/A.scala
new file mode 100644
index 000000000..a9b5e6818
--- /dev/null
+++ b/src/sbt-test/source-dependencies/specialized/A.scala
@@ -0,0 +1,4 @@
+class A
+{
+	def x[T](t: T) = t
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/specialized/B.scala b/src/sbt-test/source-dependencies/specialized/B.scala
new file mode 100644
index 000000000..f2aa2cd24
--- /dev/null
+++ b/src/sbt-test/source-dependencies/specialized/B.scala
@@ -0,0 +1,7 @@
+object B
+{
+	def main(args: Array[String]) {
+		val a = new A
+		a.x(3)
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/specialized/changes/A.scala b/src/sbt-test/source-dependencies/specialized/changes/A.scala
new file mode 100644
index 000000000..76ac39400
--- /dev/null
+++ b/src/sbt-test/source-dependencies/specialized/changes/A.scala
@@ -0,0 +1,4 @@
+class A
+{
+	def x[@specialized T](t: T) = t
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/specialized/project/build.properties b/src/sbt-test/source-dependencies/specialized/project/build.properties
new file mode 100644
index 000000000..c90a11c70
--- /dev/null
+++ b/src/sbt-test/source-dependencies/specialized/project/build.properties
@@ -0,0 +1,3 @@
+project.name=specialized
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala b/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
new file mode 100644
index 000000000..a9fe1bbb0
--- /dev/null
+++ b/src/sbt-test/source-dependencies/specialized/project/build/SpecializeTest.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class SpecializeTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def compileOptions = super.compileOptions ++ Seq(CompileOption("-Yspecialize"))
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/specialized/test b/src/sbt-test/source-dependencies/specialized/test
new file mode 100644
index 000000000..8661bc0d7
--- /dev/null
+++ b/src/sbt-test/source-dependencies/specialized/test
@@ -0,0 +1,16 @@
+# -Yspecialize is 2.8 only
+> ++2.8.0-SNAPSHOT
+> compile
+
+# verify that erased A.x can be called normally and reflectively
+> run false
+
+# make A.x specialized
+$ copy-file changes/A.scala A.scala
+
+# B.scala needs recompiling so that B.y calls the specialized version of A.x
+> compile
+
+# verify that specialized A.x can be called normally and reflectively
+# NOTE: this test doesn't actually work correctly: have to check the output to see that B.scala was recompiled
+> run true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/stability-change/A.scala b/src/sbt-test/source-dependencies/stability-change/A.scala
new file mode 100644
index 000000000..e9b4d7aa6
--- /dev/null
+++ b/src/sbt-test/source-dependencies/stability-change/A.scala
@@ -0,0 +1,4 @@
+object A
+{
+	val x = new C
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/stability-change/B.scala b/src/sbt-test/source-dependencies/stability-change/B.scala
new file mode 100644
index 000000000..fce3e99cf
--- /dev/null
+++ b/src/sbt-test/source-dependencies/stability-change/B.scala
@@ -0,0 +1,5 @@
+object B
+{
+	import A.x.y
+	val z = y
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/stability-change/C.scala b/src/sbt-test/source-dependencies/stability-change/C.scala
new file mode 100644
index 000000000..9b2e3741a
--- /dev/null
+++ b/src/sbt-test/source-dependencies/stability-change/C.scala
@@ -0,0 +1,4 @@
+class C
+{
+  val y = 4
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/stability-change/changes/A.scala b/src/sbt-test/source-dependencies/stability-change/changes/A.scala
new file mode 100644
index 000000000..1b6e8d65a
--- /dev/null
+++ b/src/sbt-test/source-dependencies/stability-change/changes/A.scala
@@ -0,0 +1,4 @@
+object A
+{
+	def x = new C
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/stability-change/project/build.properties b/src/sbt-test/source-dependencies/stability-change/project/build.properties
new file mode 100644
index 000000000..b66876fb0
--- /dev/null
+++ b/src/sbt-test/source-dependencies/stability-change/project/build.properties
@@ -0,0 +1,3 @@
+project.name=stability
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/stability-change/test b/src/sbt-test/source-dependencies/stability-change/test
new file mode 100644
index 000000000..aea970990
--- /dev/null
+++ b/src/sbt-test/source-dependencies/stability-change/test
@@ -0,0 +1,6 @@
+> +compile
+
+# replace val x with var x, invalidating the import in B
+$ copy-file changes/A.scala A.scala
+
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct-usage/A.scala b/src/sbt-test/source-dependencies/struct-usage/A.scala
new file mode 100644
index 000000000..de3effffe
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct-usage/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: { def q: Int } = error("not important")
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct-usage/B.scala b/src/sbt-test/source-dependencies/struct-usage/B.scala
new file mode 100644
index 000000000..0d37132f1
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct-usage/B.scala
@@ -0,0 +1,3 @@
+object B {
+	val y: Int = A.x.q
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct-usage/changes/A.scala b/src/sbt-test/source-dependencies/struct-usage/changes/A.scala
new file mode 100644
index 000000000..bf0e4dfce
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct-usage/changes/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: { def q: String } = error("not important")
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct-usage/project/build.properties b/src/sbt-test/source-dependencies/struct-usage/project/build.properties
new file mode 100644
index 000000000..94ffa9f9c
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct-usage/project/build.properties
@@ -0,0 +1,3 @@
+project.name=struct-usage
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct-usage/test b/src/sbt-test/source-dependencies/struct-usage/test
new file mode 100644
index 000000000..b25104c62
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct-usage/test
@@ -0,0 +1,5 @@
+> +compile
+
+$ copy-file changes/A.scala A.scala
+
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct/A.scala b/src/sbt-test/source-dependencies/struct/A.scala
new file mode 100644
index 000000000..d17a6e20a
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: Int = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct/B.scala b/src/sbt-test/source-dependencies/struct/B.scala
new file mode 100644
index 000000000..635568727
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct/B.scala
@@ -0,0 +1,4 @@
+object B {
+	def onX(m: { def x: Int } ) =
+		m.x
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct/C.scala b/src/sbt-test/source-dependencies/struct/C.scala
new file mode 100644
index 000000000..413cd6d63
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct/C.scala
@@ -0,0 +1,4 @@
+object C {
+	def main(args: Array[String]) =
+		println(B.onX(A))
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct/changes/A.scala b/src/sbt-test/source-dependencies/struct/changes/A.scala
new file mode 100644
index 000000000..dc9bbd3c0
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct/changes/A.scala
@@ -0,0 +1,3 @@
+object A {
+	def x: Byte = 3
+}
diff --git a/src/sbt-test/source-dependencies/struct/project/build.properties b/src/sbt-test/source-dependencies/struct/project/build.properties
new file mode 100644
index 000000000..b7368a54a
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct/project/build.properties
@@ -0,0 +1,3 @@
+project.name=struct
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/struct/test b/src/sbt-test/source-dependencies/struct/test
new file mode 100644
index 000000000..ef218b0d9
--- /dev/null
+++ b/src/sbt-test/source-dependencies/struct/test
@@ -0,0 +1,6 @@
+>+compile
+
+# modify A.scala so that it does not conform to the structural type in B.scala
+$ copy-file changes/A.scala A.scala
+
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/transitive-a/test b/src/sbt-test/source-dependencies/transitive-a/test
index efa71c72b..a0889f9d8 100644
--- a/src/sbt-test/source-dependencies/transitive-a/test
+++ b/src/sbt-test/source-dependencies/transitive-a/test
@@ -1,8 +1,4 @@
-> compile
-[success]
+> +compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
-[success]
-
-> compile
-[failure]
\ No newline at end of file
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/transitive-b/test b/src/sbt-test/source-dependencies/transitive-b/test
index efa71c72b..a0889f9d8 100644
--- a/src/sbt-test/source-dependencies/transitive-b/test
+++ b/src/sbt-test/source-dependencies/transitive-b/test
@@ -1,8 +1,4 @@
-> compile
-[success]
+> +compile
 
 $ copy-file changes/A2.scala src/main/scala/A.scala
-[success]
-
-> compile
-[failure]
\ No newline at end of file
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/type-parameter/A.scala b/src/sbt-test/source-dependencies/type-parameter/A.scala
new file mode 100644
index 000000000..d712f6feb
--- /dev/null
+++ b/src/sbt-test/source-dependencies/type-parameter/A.scala
@@ -0,0 +1 @@
+trait A[T]
diff --git a/src/sbt-test/source-dependencies/type-parameter/B.scala b/src/sbt-test/source-dependencies/type-parameter/B.scala
new file mode 100644
index 000000000..0f996cdc3
--- /dev/null
+++ b/src/sbt-test/source-dependencies/type-parameter/B.scala
@@ -0,0 +1 @@
+trait B[T] extends A[T]
diff --git a/src/sbt-test/source-dependencies/type-parameter/C.scala b/src/sbt-test/source-dependencies/type-parameter/C.scala
new file mode 100644
index 000000000..505a83aa6
--- /dev/null
+++ b/src/sbt-test/source-dependencies/type-parameter/C.scala
@@ -0,0 +1,3 @@
+object C {
+	new A[Int] {}
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/type-parameter/D.scala b/src/sbt-test/source-dependencies/type-parameter/D.scala
new file mode 100644
index 000000000..51273ad98
--- /dev/null
+++ b/src/sbt-test/source-dependencies/type-parameter/D.scala
@@ -0,0 +1,3 @@
+object D {
+	def x[T](a: A[T]) = a
+}
diff --git a/src/sbt-test/source-dependencies/type-parameter/changes/A.scala b/src/sbt-test/source-dependencies/type-parameter/changes/A.scala
new file mode 100644
index 000000000..0eab80adc
--- /dev/null
+++ b/src/sbt-test/source-dependencies/type-parameter/changes/A.scala
@@ -0,0 +1 @@
+trait A
diff --git a/src/sbt-test/source-dependencies/type-parameter/project/build.properties b/src/sbt-test/source-dependencies/type-parameter/project/build.properties
new file mode 100644
index 000000000..707edcb0d
--- /dev/null
+++ b/src/sbt-test/source-dependencies/type-parameter/project/build.properties
@@ -0,0 +1,3 @@
+project.name=type-parameter
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/type-parameter/test b/src/sbt-test/source-dependencies/type-parameter/test
new file mode 100644
index 000000000..8bd892f7a
--- /dev/null
+++ b/src/sbt-test/source-dependencies/type-parameter/test
@@ -0,0 +1,7 @@
+> +compile
+
+# remove type parameter from A
+$ copy-file changes/A.scala A.scala
+
+# should get compile error because B, C, D reference A without a type parameter
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/typeref-return/A.scala b/src/sbt-test/source-dependencies/typeref-return/A.scala
new file mode 100644
index 000000000..8993ad9fa
--- /dev/null
+++ b/src/sbt-test/source-dependencies/typeref-return/A.scala
@@ -0,0 +1,4 @@
+object A {
+	type I = Int
+	def x: I = error("not important")
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/typeref-return/B.scala b/src/sbt-test/source-dependencies/typeref-return/B.scala
new file mode 100644
index 000000000..afb1169fc
--- /dev/null
+++ b/src/sbt-test/source-dependencies/typeref-return/B.scala
@@ -0,0 +1,3 @@
+object B {
+	val y: Int = A.x
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/typeref-return/changes/A.scala b/src/sbt-test/source-dependencies/typeref-return/changes/A.scala
new file mode 100644
index 000000000..ab798d520
--- /dev/null
+++ b/src/sbt-test/source-dependencies/typeref-return/changes/A.scala
@@ -0,0 +1,4 @@
+object A {
+	type I = String
+	def x: I = error("Not important")
+}
diff --git a/src/sbt-test/source-dependencies/typeref-return/project/build.properties b/src/sbt-test/source-dependencies/typeref-return/project/build.properties
new file mode 100644
index 000000000..e086c7b22
--- /dev/null
+++ b/src/sbt-test/source-dependencies/typeref-return/project/build.properties
@@ -0,0 +1,3 @@
+project.name=typeref-return
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/typeref-return/test b/src/sbt-test/source-dependencies/typeref-return/test
new file mode 100644
index 000000000..b25104c62
--- /dev/null
+++ b/src/sbt-test/source-dependencies/typeref-return/test
@@ -0,0 +1,5 @@
+> +compile
+
+$ copy-file changes/A.scala A.scala
+
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/var/A.scala b/src/sbt-test/source-dependencies/var/A.scala
new file mode 100644
index 000000000..1c5d96e09
--- /dev/null
+++ b/src/sbt-test/source-dependencies/var/A.scala
@@ -0,0 +1,5 @@
+class A
+{
+	def x = 3
+	def x_=(x$1: Int) = ()
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/var/B.scala b/src/sbt-test/source-dependencies/var/B.scala
new file mode 100644
index 000000000..3ee290f84
--- /dev/null
+++ b/src/sbt-test/source-dependencies/var/B.scala
@@ -0,0 +1,4 @@
+class B extends A
+{
+	override var x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/var/changes/A.scala b/src/sbt-test/source-dependencies/var/changes/A.scala
new file mode 100644
index 000000000..d1c251596
--- /dev/null
+++ b/src/sbt-test/source-dependencies/var/changes/A.scala
@@ -0,0 +1,4 @@
+class A
+{
+	var x = 3
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/var/project/build.properties b/src/sbt-test/source-dependencies/var/project/build.properties
new file mode 100644
index 000000000..7dc1118ac
--- /dev/null
+++ b/src/sbt-test/source-dependencies/var/project/build.properties
@@ -0,0 +1,3 @@
+project.name=var
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/var/test b/src/sbt-test/source-dependencies/var/test
new file mode 100644
index 000000000..4debd1fd1
--- /dev/null
+++ b/src/sbt-test/source-dependencies/var/test
@@ -0,0 +1,6 @@
+> +compile
+
+# replace var x with def x, def x_=
+$ copy-file changes/A.scala A.scala
+
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/variance/A.scala b/src/sbt-test/source-dependencies/variance/A.scala
new file mode 100644
index 000000000..4581bfec8
--- /dev/null
+++ b/src/sbt-test/source-dependencies/variance/A.scala
@@ -0,0 +1,2 @@
+class A[+T]
+ 
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/variance/C.scala b/src/sbt-test/source-dependencies/variance/C.scala
new file mode 100644
index 000000000..8b526d9af
--- /dev/null
+++ b/src/sbt-test/source-dependencies/variance/C.scala
@@ -0,0 +1,3 @@
+object C {
+	val a: A[Any] = new A[Int]
+}
diff --git a/src/sbt-test/source-dependencies/variance/changes/A.scala b/src/sbt-test/source-dependencies/variance/changes/A.scala
new file mode 100644
index 000000000..e9c64dff6
--- /dev/null
+++ b/src/sbt-test/source-dependencies/variance/changes/A.scala
@@ -0,0 +1,2 @@
+class A[T]
+ 
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/variance/project/build.properties b/src/sbt-test/source-dependencies/variance/project/build.properties
new file mode 100644
index 000000000..7550db3ca
--- /dev/null
+++ b/src/sbt-test/source-dependencies/variance/project/build.properties
@@ -0,0 +1,3 @@
+project.name=variance
+project.version=1.0
+project.scratch=true
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/variance/test b/src/sbt-test/source-dependencies/variance/test
new file mode 100644
index 000000000..db6d5af10
--- /dev/null
+++ b/src/sbt-test/source-dependencies/variance/test
@@ -0,0 +1,6 @@
+> +compile
+
+# make T invariant
+$ copy-file changes/A.scala A.scala
+
+-> +compile
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-nested/project/build/src/TestProject.scala b/src/sbt-test/tests/Class.forName/project/build/TestProject.scala
old mode 100755
new mode 100644
similarity index 61%
rename from src/sbt-test/tests/specs-nested/project/build/src/TestProject.scala
rename to src/sbt-test/tests/Class.forName/project/build/TestProject.scala
index e06023159..f8cb6a639
--- a/src/sbt-test/tests/specs-nested/project/build/src/TestProject.scala
+++ b/src/sbt-test/tests/Class.forName/project/build/TestProject.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class TestProject(info: ProjectInfo) extends DefaultProject(info)
 {
-	val scalacheck = "org.specs" % "specs" % "1.4.1"
+	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/tests/Class.forName/test b/src/sbt-test/tests/Class.forName/test
index 401921be5..b506a5a67 100644
--- a/src/sbt-test/tests/Class.forName/test
+++ b/src/sbt-test/tests/Class.forName/test
@@ -1,23 +1,17 @@
 # Create a jar that contains two classes: Test and OtherTest
 #  Test loads OtherTest using Class.forName
 > package
-[success]
 
 # get the specs jar
 > update
-[success]
 
 # copy to the lib_managed/test directory to simulate
 #  a library on the 'test' configuration
 $ copy-file target/class-forname-1.0.jar lib_managed/test/forname.jar
-[success]
 
 # Remove the classes that created the jar
 $ delete src/main/ target/
-[success]
 
 # Compile and run the test that calls into the jar created above
 #  It won't succeed if something is messed up with class loading
 > test
-[success]
-
diff --git a/src/sbt-test/tests/extend/changes/ScalaCheck.scala b/src/sbt-test/tests/extend/changes/ScalaCheck.scala
deleted file mode 100644
index 4a436c7aa..000000000
--- a/src/sbt-test/tests/extend/changes/ScalaCheck.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-/** This tests implementing a test framework in a project definition.  To ensure sbt's builtin ScalaCheck
-* test framework is not used, it flips success and failure so that a failing test is marked as succeeding and
-* a suceeding test is marked as failing. */
-
-package framework
-
-import sbt._
-
-object FrameworkScalaCheck extends LazyTestFramework
-{
-	val name = "ScalaCheck"
-
-	def testSuperClassName = "org.scalacheck.Properties"
-	def testSubClassType = ClassType.Module
-
-	def testRunnerClassName = "framework.RunnerScalaCheck"
-}
-
-class RunnerScalaCheck(val log: Logger, val listeners: Seq[TestReportListener], val testLoader: ClassLoader) extends BasicTestRunner
-{
-	import org.scalacheck.{Pretty, Properties, Test}
-	def runTest(testClassName: String): Result.Value =
-	{
-		val test = ModuleUtilities.getObject(testClassName, testLoader).asInstanceOf[Properties]
-		val result = Test.checkProperties(test, Test.defaultParams, propReport, testReport).find(!_._2.passed)
-		if(result.isEmpty)
-			Result.Failed // intentionally flipped (see top comment)
-		else
-			Result.Passed // intentionally flipped (see top comment)
-	}
-	private def propReport(pName: String, s: Int, d: Int) {}
-	private def testReport(name: String, res: Test.Result)
-	{
-		val msg = Pretty.pretty(res)
-		if(res.passed)
-			log.info("+ " + name + ": " + msg)
-		else
-			log.error("! " + name + ": " + msg)
-		
-	}
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/extend/changes/TestFailure.scala b/src/sbt-test/tests/extend/changes/TestFailure.scala
deleted file mode 100644
index cbf7461ac..000000000
--- a/src/sbt-test/tests/extend/changes/TestFailure.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-
-import org.scalacheck._
-object TestFailure extends Properties("Success -> Failure")
-{
-	specify("Always true", (i: Int) => true)
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/extend/changes/TestProject2.scala b/src/sbt-test/tests/extend/changes/TestProject2.scala
deleted file mode 100644
index 2f0a0c805..000000000
--- a/src/sbt-test/tests/extend/changes/TestProject2.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import sbt._
-
-class TestProject2(info: ProjectInfo) extends DefaultProject(info)
-{
-	override def testFrameworks = framework.FrameworkScalaCheck :: Nil
-	override def useMavenConfigurations = true	
-	val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default"
-}
diff --git a/src/sbt-test/tests/extend/changes/TestProject3.scala b/src/sbt-test/tests/extend/changes/TestProject3.scala
deleted file mode 100644
index 80205752d..000000000
--- a/src/sbt-test/tests/extend/changes/TestProject3.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import sbt._
-
-class TestProject3(info: ProjectInfo) extends ParentProject(info)
-{
-	lazy val child = project("child", "Main", new ChildProject(_))
-	class ChildProject(info: ProjectInfo) extends DefaultProject(info)
-	{
-		override def testFrameworks = framework.FrameworkScalaCheck :: Nil
-		override def useMavenConfigurations = true
-		val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default"
-	}
-}
diff --git a/src/sbt-test/tests/extend/changes/TestSuccess.scala b/src/sbt-test/tests/extend/changes/TestSuccess.scala
deleted file mode 100644
index 06cd573d0..000000000
--- a/src/sbt-test/tests/extend/changes/TestSuccess.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-
-import org.scalacheck._
-object TestSuccess extends Properties("Failure -> Success")
-{
-	specify("Always false", (i: Int) => false)
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/extend/project/build.properties b/src/sbt-test/tests/extend/project/build.properties
deleted file mode 100644
index 6a367a1d6..000000000
--- a/src/sbt-test/tests/extend/project/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Project properties
-#Wed Apr 29 15:43:25 EDT 2009
-project.organization=sbt
-project.name=framework
-project.version=1.0
diff --git a/src/sbt-test/tests/extend/project/build/src/TestProject.scala b/src/sbt-test/tests/extend/project/build/src/TestProject.scala
deleted file mode 100644
index 95e20dce2..000000000
--- a/src/sbt-test/tests/extend/project/build/src/TestProject.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-import sbt._
-
-class TestProject(info: ProjectInfo) extends DefaultProject(info)
-{
-	val sc = "org.scalacheck" % "scalacheck" % "1.5"
-
-	override def updateAction = super.updateAction dependsOn addSbt
-	lazy val addSbt = task { FileUtilities.copyFile(FileUtilities.sbtJar, (dependencyPath / "sbt.jar").asFile, log) }
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/extend/test b/src/sbt-test/tests/extend/test
deleted file mode 100644
index 3b0a9ba30..000000000
--- a/src/sbt-test/tests/extend/test
+++ /dev/null
@@ -1,72 +0,0 @@
-# get ScalaCheck library and copy the main sbt jar to the lib directory
-> update
-[success]
-
-# Copy the source file implementing the framework to the src tree
-$ copy-file changes/ScalaCheck.scala src/main/scala/ScalaCheck.scala
-[success]
-
-# compile and package the framework
-> package
-[success]
-
-# move the test framework jar to the build project and delete the sources and the sbt jar
-# The test framework runs ScalaCheck tests, but swaps success and failure
-# to ensure the custom framework is being used and not sbt's built-in ScalaCheck support
-$ copy-file target/framework-1.0.jar project/build/lib/framework-1.0.jar
-[success]
-$ delete target/framework-1.0.jar
-[success]
-$ delete src/main
-[success]
-$ delete lib
-[success]
-
-# replace the project definition with the one that uses the framework, reload, and update
-# (update moves scalatest.jar to the 'test' configuration)
-$ copy-file changes/TestProject2.scala project/build/src/TestProject.scala
-[success]
-$ reload
-[success]
-> update
-[success]
-
-# Copy a source containing a failing test that the framework should mark as succeeding
-$ copy-file changes/TestSuccess.scala src/test/scala/TestSuccess.scala
-[success]
-> test
-[success]
-
-
-# Copy a source containing a successful test that the framework should mark as failing
-# First, delete the previous test
-$ delete src/test/scala/TestSuccess.scala
-[success]
-$ copy-file changes/TestFailure.scala src/test/scala/TestFailure.scala
-[success]
-> test
-[failure]
-
-
-# replace the project definition with one that tests a child project
-# reload, and update
-$ copy-file changes/TestProject3.scala project/build/src/TestProject.scala
-[success]
-$ reload
-[success]
-> update
-[success]
-
-# remove sources in the parent project
-$ delete src
-[success]
-# Copy a source containing a failing test that the framework should mark as succeeding
-$ copy-file changes/TestSuccess.scala child/src/test/scala/TestSuccess.scala
-[success]
-> test
-[success]
-# Copy a source containing a successful test that the framework should mark as failing
-$ copy-file changes/TestFailure.scala child/src/test/scala/TestFailure.scala
-[success]
-> test
-[failure]
\ No newline at end of file
diff --git a/src/sbt-test/tests/resources/test b/src/sbt-test/tests/resources/test
index 3653c1158..5fbb5d887 100644
--- a/src/sbt-test/tests/resources/test
+++ b/src/sbt-test/tests/resources/test
@@ -1,5 +1,2 @@
 > update
-[success]
-
-> test
-[success]
\ No newline at end of file
+> test
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-a/changes/BasicTest.scala b/src/sbt-test/tests/scalacheck-a/changes/BasicTest.scala
deleted file mode 100755
index 9478475b2..000000000
--- a/src/sbt-test/tests/scalacheck-a/changes/BasicTest.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-import org.scalacheck._
-
-object BasicTest extends Properties("A basic runnable test")
-{
-	specify("startsWith", (a: String, b: String) => (a+b).startsWith(a))
-}
-
-abstract class AbstractNotATest extends Properties("Not a runnable test")
-{
-	specify("Fail", (a: Int, b: Int) => false)
-}
-
-class ClassNotATest extends Properties("Not a runnable test")
-{
-	specify("Fail", (a: Int, b: Int) => false)
-}
-
-trait TraitNotATest
-{ self: Properties =>
-	specify("Fail", (a: Int, b: Int) => false)
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-a/changes/FailedTest.scala b/src/sbt-test/tests/scalacheck-a/changes/FailedTest.scala
deleted file mode 100755
index 079d0da20..000000000
--- a/src/sbt-test/tests/scalacheck-a/changes/FailedTest.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-import org.scalacheck._
-
-object BasicTest extends Properties("A basic runnable test")
-{
-	specify("startsWith", (a: String, b: String) => (a+b).startsWith(a))
-}
-
-abstract class AbstractNotATest extends Properties("Not a runnable test")
-{
-	specify("Fail", (a: Int, b: Int) => false)
-}
-
-object ClassNotATest extends Properties("A failing test")
-{
-	specify("Fail", (a: Int, b: Int) => false)
-}
-
-trait TraitNotATest extends Properties("Not a runnable test")
-{
-	specify("Fail", (a: Int, b: Int) => false)
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-a/project/build.properties b/src/sbt-test/tests/scalacheck-a/project/build.properties
deleted file mode 100755
index f9da83551..000000000
--- a/src/sbt-test/tests/scalacheck-a/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Tue Feb 03 14:43:21 EST 2009
-project.name=ScalaCheck Support Test
-project.version=9.3
diff --git a/src/sbt-test/tests/scalacheck-a/project/build/src/TestProject.scala b/src/sbt-test/tests/scalacheck-a/project/build/src/TestProject.scala
deleted file mode 100755
index e5ab1f803..000000000
--- a/src/sbt-test/tests/scalacheck-a/project/build/src/TestProject.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import sbt._
-
-class TestProject(info: ProjectInfo) extends DefaultProject(info)
-{
-	val scalacheck = "org.scalacheck" % "scalacheck" % "1.5"
-	val cacheDirectory = outputPath / "cache"
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-a/src/test/scala/DummyTest.scala b/src/sbt-test/tests/scalacheck-a/src/test/scala/DummyTest.scala
deleted file mode 100755
index e33905e34..000000000
--- a/src/sbt-test/tests/scalacheck-a/src/test/scala/DummyTest.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-
-class DummyTest 
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-a/test b/src/sbt-test/tests/scalacheck-a/test
deleted file mode 100755
index d75fcb579..000000000
--- a/src/sbt-test/tests/scalacheck-a/test
+++ /dev/null
@@ -1,23 +0,0 @@
-> test
-[success]
-
-$ copy-file changes/BasicTest.scala src/test/scala/BasicTest.scala
-[success]
-
-$ delete src/test/scala/DummyTest.scala
-[success]
-
-> test-compile
-[error]
-
-> update
-[success]
-
-> test
-[success]
-
-$ copy-file changes/FailedTest.scala src/test/scala/BasicTest.scala
-[success]
-
-> test
-[failure]
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalatest-ignore/project/build.properties b/src/sbt-test/tests/scalatest-ignore/project/build.properties
deleted file mode 100644
index 2f60fce89..000000000
--- a/src/sbt-test/tests/scalatest-ignore/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=Ignore Test
-project.version=3.9.2
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalatest-ignore/project/build/Test.scala b/src/sbt-test/tests/scalatest-ignore/project/build/Test.scala
deleted file mode 100644
index 14c47cd63..000000000
--- a/src/sbt-test/tests/scalatest-ignore/project/build/Test.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import sbt._
-
-class Test(info: ProjectInfo) extends DefaultProject(info)
-{
-	override def useMavenConfigurations = true
-	val st = "org.scala-tools.testing" % "scalatest" % "0.9.5" % "test->default"
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala b/src/sbt-test/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
deleted file mode 100644
index beb547e75..000000000
--- a/src/sbt-test/tests/scalatest-ignore/src/test/scala/IgnoreTest.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-import org.scalatest._
-import org.scalatest.matchers._
-
-class IgnoreTest extends Spec with BeforeAndAfter with MustMatchers {
-
-        describe("This test") {
-                ignore("should be ignored") {
-                   error("Test ran")
-                }
-        }
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalatest-ignore/test b/src/sbt-test/tests/scalatest-ignore/test
deleted file mode 100644
index 3653c1158..000000000
--- a/src/sbt-test/tests/scalatest-ignore/test
+++ /dev/null
@@ -1,5 +0,0 @@
-> update
-[success]
-
-> test
-[success]
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-a/changes/BasicTest.scala b/src/sbt-test/tests/specs-a/changes/BasicTest.scala
deleted file mode 100755
index 6c6d4ac8f..000000000
--- a/src/sbt-test/tests/specs-a/changes/BasicTest.scala
+++ /dev/null
@@ -1,35 +0,0 @@
-import org.specs._
-
-object BasicTest extends Specification
-{
- // from specs example
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 11
-  }
-  "'hello world' matches 'h.* w.*'" in {
-     "hello world" must beMatching("h.* w.*")
-  }
-}
-
-trait TraitNotATest extends Specification
-{
-	// would fail if called
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 12
-  }
-}
-
-abstract class AbstractNotATest extends Specification
-{
-	// would fail if called
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 12
-  }
-}
-
-class ClassCanBeATest extends Specification
-{
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 11
-  }
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-a/changes/FailTest.scala b/src/sbt-test/tests/specs-a/changes/FailTest.scala
deleted file mode 100755
index b55799891..000000000
--- a/src/sbt-test/tests/specs-a/changes/FailTest.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-import org.specs._
-
-object BasicTest extends Specification
-{
- // from specs example
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 11
-  }
-  "'hello world' matches 'h.* w.*'" in {
-     "hello world" must beMatching("h.* w.*")
-  }
-}
-
-trait TraitNotATest extends Specification
-{
-	// would fail if called
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 12
-  }
-}
-
-object FailTest extends Specification
-{
-	// would fail if called
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 12
-  }
-}
-
-class ClassCanBeATest extends Specification
-{
-	// would fail if called
-  "'hello world' has 11 characters" in {
-     "hello world".size mustEqual 11
-  }
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-a/project/build.properties b/src/sbt-test/tests/specs-a/project/build.properties
deleted file mode 100755
index ec1f47dd0..000000000
--- a/src/sbt-test/tests/specs-a/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Tue Feb 03 15:05:44 EST 2009
-project.name=Specs Support Test
-project.version=5.5.4
diff --git a/src/sbt-test/tests/specs-a/project/build/src/TestProject.scala b/src/sbt-test/tests/specs-a/project/build/src/TestProject.scala
deleted file mode 100755
index a286ac738..000000000
--- a/src/sbt-test/tests/specs-a/project/build/src/TestProject.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import sbt._
-
-class TestProject(info: ProjectInfo) extends DefaultProject(info)
-{
-	val scalacheck = "org.specs" % "specs" % "1.4.1"
-	val cacheDirectory = outputPath / "cache"
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-a/src/test/scala/DummyTest.scala b/src/sbt-test/tests/specs-a/src/test/scala/DummyTest.scala
deleted file mode 100755
index 71c316a47..000000000
--- a/src/sbt-test/tests/specs-a/src/test/scala/DummyTest.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-
-class DummyTest
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-a/test b/src/sbt-test/tests/specs-a/test
deleted file mode 100755
index 9325193a0..000000000
--- a/src/sbt-test/tests/specs-a/test
+++ /dev/null
@@ -1,23 +0,0 @@
-> test
-[success]
-
-$ copy-file changes/BasicTest.scala src/test/scala/BasicTest.scala
-[success]
-
-$ delete src/test/scala/DummyTest.scala
-[success]
-
-> test-compile
-[error]
-
-> update
-[success]
-
-> test
-[success]
-
-$ copy-file changes/FailTest.scala src/test/scala/BasicTest.scala
-[success]
-
-> test
-[failure]
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-nested/project/build.properties b/src/sbt-test/tests/specs-nested/project/build.properties
deleted file mode 100755
index cc9a4d3b6..000000000
--- a/src/sbt-test/tests/specs-nested/project/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Project properties
-#Wed Feb 25 18:38:37 EST 2009
-project.name=Nested Specifications
-project.version=1.0
diff --git a/src/sbt-test/tests/specs-nested/src/test/scala/TestSpecification.scala b/src/sbt-test/tests/specs-nested/src/test/scala/TestSpecification.scala
deleted file mode 100755
index 2380afab5..000000000
--- a/src/sbt-test/tests/specs-nested/src/test/scala/TestSpecification.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-import org.specs._
-
-object TestSpecification extends Specification {
-  "A sample specification1" should {
-    "return something" in {
-      "hello" mustNotBe "world"
-    }
-  }
-  
-  object sampleSpecification extends Specification {
-    "the first system" should {
-      "skip one example" in { skip("skipped") }
-      "have one example ok" in {}
-      "have one example ko" in { 1 mustBe 2 }
-      "have one example in error" in { throw new Error("error") }
-    }    
-  }
-
-}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-nested/test b/src/sbt-test/tests/specs-nested/test
deleted file mode 100755
index 3653c1158..000000000
--- a/src/sbt-test/tests/specs-nested/test
+++ /dev/null
@@ -1,5 +0,0 @@
-> update
-[success]
-
-> test
-[success]
\ No newline at end of file
diff --git a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
index b8f8efd3d..3c7232f01 100644
--- a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
+++ b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
@@ -1,5 +1,6 @@
 import sbt._
 
 class TestQuickProject(info: ProjectInfo) extends DefaultProject(info) {
-    val scalatest = "org.scalatest" % "scalatest" % "0.9.3"
+	val snapshots = ScalaToolsSnapshots
+    val scalatest = "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-RC1-with-test-interfaces-0.2-SNAPSHOT"
 }
diff --git a/src/sbt-test/tests/test-failed/test b/src/sbt-test/tests/test-failed/test
index 244aea8ac..b33f1c120 100644
--- a/src/sbt-test/tests/test-failed/test
+++ b/src/sbt-test/tests/test-failed/test
@@ -1,26 +1,12 @@
+> ++2.8.0.Beta1-RC1
 > update
-[success]
 
 $ copy-file changes/Fail.scala src/test/scala/TestQuickSuite.scala
-[success]
-
-> test-failed
-[failure]
-
-> test-failed *
-[failure]
-
-> test-failed TestQuickSuite
-[failure]
+-> test-failed
+-> test-failed *
+-> test-failed TestQuickSuite
 
 $ copy-file changes/Success.scala src/test/scala/TestQuickSuite.scala
-[success]
-
 > test-failed
-[success]
-
 > test-failed *
-[success]
-
-> test-failed TestQuickSuite
-[success]
\ No newline at end of file
+> test-failed TestQuickSuite
\ No newline at end of file

From 0df26ca3144db5260e6903b2023f2bf31cace718 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 20 Dec 2009 23:54:29 -0500
Subject: [PATCH 187/268] version bump for building locally

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 5a25df349..4e3420c59 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -3,5 +3,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.8-SNAPSHOT
+project.version=0.6.9-SNAPSHOT
 scala.version=2.7.7

From 04e50bd21814b1074e22af12cab7e493fec6a751 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 21 Dec 2009 21:32:10 -0500
Subject: [PATCH 188/268] Add szeiger's implementation of test-interface for
 JUnit to list of known frameworks

---
 src/main/scala/sbt/DefaultProject.scala | 4 ++--
 src/main/scala/sbt/TestFramework.scala  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 397981119..3b8e2eb50 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -178,8 +178,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	* run*/
 	def testFrameworks: Seq[TestFramework] = 
 	{
-		import TestFrameworks.{ScalaCheck, ScalaTest, Specs}
-		ScalaCheck :: Specs :: ScalaTest :: Nil
+		import TestFrameworks.{JUnit, ScalaCheck, ScalaTest, Specs}
+		ScalaCheck :: Specs :: ScalaTest :: JUnit :: Nil
 	}
 	/** The list of listeners for testing. */
 	def testListeners: Seq[TestReportListener] = TestLogger(log) :: Nil
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index a1ea479ed..eec1bde59 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -17,6 +17,7 @@ object TestFrameworks
 	val ScalaCheck = new TestFramework("org.scalacheck.ScalaCheckFramework")
 	val ScalaTest = new TestFramework("org.scalatest.tools.ScalaTestFramework")
 	val Specs = new TestFramework("org.specs.runner.SpecsFramework")
+	val JUnit = new TestFramework("com.novocode.junit.JUnitFramework")
 }
 
 class TestFramework(val implClassName: String) extends NotNull

From 3fcdca4ef762129c9f1a44a55bf4f5dbafd55f94 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 23 Dec 2009 00:10:53 -0500
Subject: [PATCH 189/268] Josh's patch for passing arguments to test-* tasks.

---
 src/main/scala/sbt/DefaultProject.scala     | 22 ++++++-----
 src/main/scala/sbt/IntegrationTesting.scala |  8 ++--
 src/main/scala/sbt/ScalaProject.scala       | 44 +++++++++++++--------
 src/main/scala/sbt/TestFramework.scala      | 39 ++++++++++--------
 4 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 3b8e2eb50..11720c2e7 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009  Mark Harrah, David MacIver
+ * Copyright 2008, 2009  Mark Harrah, David MacIver, Josh Cough
  */
 package sbt
 
@@ -255,15 +255,17 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def consoleAction = basicConsoleTask.dependsOn(testCompile, copyResources, copyTestResources) describedAs ConsoleDescription
 	protected def docAction = scaladocTask(mainLabel, mainSources, mainDocPath, docClasspath, documentOptions).dependsOn(compile) describedAs DocDescription
 	protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription
-	protected def testAction = defaultTestTask(testOptions)
-	protected def testOnlyAction = testQuickMethod(testCompileConditional.analysis, testOptions)(options =>
-		defaultTestTask(options)) describedAs(TestOnlyDescription)
-	protected def testQuickAction = defaultTestQuickMethod(false) describedAs(TestQuickDescription)
-	protected def testFailedAction = defaultTestQuickMethod(true) describedAs(TestFailedDescription)
-	protected def defaultTestQuickMethod(failedOnly: Boolean) =
-		testQuickMethod(testCompileConditional.analysis, testOptions)(options => defaultTestTask(quickOptions(failedOnly) ::: options.toList))
-	protected def defaultTestTask(testOptions: => Seq[TestOption]) =
-		testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription
+
+       protected def testAction = defaultTestTask(Nil, testOptions)
+       protected def testOnlyAction = testQuickMethod(testCompileConditional.analysis, testOptions)((testArgs, options) => {
+		   defaultTestTask(testArgs, options)
+       }) describedAs(TestOnlyDescription)
+       protected def testQuickAction = defaultTestQuickMethod(false) describedAs(TestQuickDescription)
+       protected def testFailedAction = defaultTestQuickMethod(true) describedAs(TestFailedDescription)
+       protected def defaultTestQuickMethod(failedOnly: Boolean) =
+         testQuickMethod(testCompileConditional.analysis, testOptions)((args, options) => defaultTestTask(args, quickOptions(failedOnly) ::: options.toList))
+       protected def defaultTestTask(testArgs: Seq[String], testOptions: => Seq[TestOption]) =
+         testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testArgs, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription
 
 	override def packageToPublishActions: Seq[ManagedTask] = `package` :: Nil
 
diff --git a/src/main/scala/sbt/IntegrationTesting.scala b/src/main/scala/sbt/IntegrationTesting.scala
index f31797747..5edcb9dce 100644
--- a/src/main/scala/sbt/IntegrationTesting.scala
+++ b/src/main/scala/sbt/IntegrationTesting.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2009  Steven Blundy, Mark Harrah
+ * Copyright 2009  Steven Blundy, Mark Harrah, Josh Cough
  */
 package sbt
 
@@ -15,8 +15,8 @@ trait IntegrationTesting extends NotNull
 trait ScalaIntegrationTesting extends IntegrationTesting
 { self: ScalaProject =>
 
-	protected def integrationTestTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) =
-		testTask(frameworks, classpath, analysis, options)
+	protected def integrationTestTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, testArgs: Seq[String], options: => Seq[TestOption]) =
+		testTask(frameworks, classpath, analysis, testArgs, options)
 }
 
 trait BasicScalaIntegrationTesting extends BasicIntegrationTesting with MavenStyleIntegrationTestPaths
@@ -34,7 +34,7 @@ trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTe
 
 	val integrationTestCompileConditional = new CompileConditional(integrationTestCompileConfiguration, buildCompiler)
 
-	protected def integrationTestAction = integrationTestTask(integrationTestFrameworks, integrationTestClasspath, integrationTestCompileConditional.analysis, integrationTestOptions) dependsOn integrationTestCompile describedAs IntegrationTestCompileDescription
+	protected def integrationTestAction = integrationTestTask(integrationTestFrameworks, integrationTestClasspath, integrationTestCompileConditional.analysis, Nil, integrationTestOptions) dependsOn integrationTestCompile describedAs IntegrationTestCompileDescription
 	protected def integrationTestCompileAction = integrationTestCompileTask() dependsOn compile describedAs IntegrationTestDescription
 
 	protected def integrationTestCompileTask() = task{ integrationTestCompileConditional.run }
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 31d7101bb..032787d1c 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah, David MacIver
+ * Copyright 2008, 2009 Mark Harrah, David MacIver, Josh Cough
  */
 package sbt
 
@@ -67,6 +67,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	case class ExcludeTests(tests: Iterable[String]) extends TestOption
 	case class TestListeners(listeners: Iterable[TestReportListener]) extends TestOption
 	case class TestFilter(filterTest: String => Boolean) extends TestOption
+  case class TestFrameworkArgument(arg: String) extends TestOption
 
 	case class JarManifest(m: Manifest) extends PackageOption
 	{
@@ -149,13 +150,14 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	def copyTask(sources: PathFinder, destinationDirectory: Path): Task =
 		task { FileUtilities.copy(sources.get, destinationDirectory, log).left.toOption }
 
-	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: TestOption*): Task =
-		testTask(frameworks, classpath, analysis, options)
-	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]): Task =
+	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, testArgs: Seq[String], options: TestOption*): Task =
+		testTask(frameworks, classpath, analysis, testArgs, options)
+	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis,
+               testArgs: Seq[String], options: => Seq[TestOption]): Task =
 	{
 		def work =
 		{
-			val (begin, work, end) = testTasks(frameworks, classpath, analysis, options)
+			val (begin, work, end) = testTasks(frameworks, classpath, analysis, testArgs, options)
 			val beginTasks = begin.map(toTask).toSeq // test setup tasks
 			val workTasks = work.map(w => toTask(w) dependsOn(beginTasks : _*)) // the actual tests
 			val endTasks = end.map(toTask).toSeq // tasks that perform test cleanup and are run regardless of success of tests
@@ -249,7 +251,8 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		}
 	}
 	protected def incrementImpl(v: BasicVersion): Version = v.incrementMicro
-	protected def testTasks(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) = {
+	protected def testTasks(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, testArgs: Seq[String],
+                          options: => Seq[TestOption]) = {
 		import scala.collection.mutable.HashSet
 
 			val testFilters = new ListBuffer[String => Boolean]
@@ -276,18 +279,22 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 			}
 			def includeTest(test: TestDefinition) = !excludeTestsSet.contains(test.testClassName) && testFilters.forall(filter => filter(test.testClassName))
 			val tests = HashSet.empty[TestDefinition] ++ analysis.allTests.filter(includeTest)
-			TestFramework.testTasks(frameworks, classpath.get, buildScalaInstance.loader, tests.toSeq, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly)
+			TestFramework.testTasks(frameworks, classpath.get, buildScalaInstance.loader, tests.toSeq, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly, testArgs)
 	}
 	private def flatten[T](i: Iterable[Iterable[T]]) = i.flatMap(x => x)
 
-	protected def testQuickMethod(testAnalysis: CompileAnalysis, options: => Seq[TestOption])(toRun: Seq[TestOption] => Task) =
-		multiTask(testAnalysis.allTests.map(_.testClassName).toList) { includeFunction =>
-			toRun(TestFilter(includeFunction) :: options.toList)
+	protected def testQuickMethod(testAnalysis: CompileAnalysis, options: => Seq[TestOption])(toRun: (Seq[String],Seq[TestOption]) => Task) = {
+    val analysis = testAnalysis.allTests.map(_.testClassName).toList
+		multiTask(analysis) { (args,includeFunction) => {
+			  toRun(args, TestFilter(includeFunction) :: options.toList)
+      }
 		}
+  }
 
 	protected final def maximumErrors[T <: ActionOption](options: Seq[T]) =
 		(for( MaxCompileErrors(maxErrors) <- options) yield maxErrors).firstOption.getOrElse(DefaultMaximumCompileErrors)
 }
+
 trait WebScalaProject extends ScalaProject
 {
 	@deprecated protected def prepareWebappTask(webappContents: PathFinder, warPath: => Path, classpath: PathFinder, extraJars: => Iterable[File]): Task =
@@ -344,14 +351,19 @@ object ScalaProject
 }
 trait MultiTaskProject extends Project
 {
-	def multiTask(allTests: => List[String])(run: (String => Boolean) => Task) =
+	def multiTask(allTests: => List[String])(run: (List[String], (String => Boolean)) => Task): MethodTask = {
+
 		task { tests =>
+
+      val (testNames, separator :: testArgs) = tests.toList.span(! _.startsWith("--"))
+
 			def filterInclude =
 			{
-				val (exactFilters, testFilters) = tests.toList.map(GlobFilter.apply).partition(_.isInstanceOf[ExactFilter])
+				val (exactFilters, testFilters) = testNames.toList.map(GlobFilter.apply).partition(_.isInstanceOf[ExactFilter])
 				val includeTests = exactFilters.map(_.asInstanceOf[ExactFilter].matchName)
 				val toCheck = scala.collection.mutable.HashSet(includeTests: _*)
 				toCheck --= allTests
+
 				if(!toCheck.isEmpty && log.atLevel(Level.Warn))
 				{
 					log.warn("Test(s) not found:")
@@ -361,13 +373,13 @@ trait MultiTaskProject extends Project
 				(test: String) => includeTestsSet.contains(test) || testFilters.exists(_.accept(test))
 			}
 			val includeFunction =
-				if(tests.isEmpty)
+				if(testNames.isEmpty)
 					(test: String) => true
 				else
 					filterInclude
-			run(includeFunction)
+			run(testArgs, includeFunction)
 		} completeWith allTests
-
+  }
 }
 trait ExecProject extends Project
 {
@@ -396,4 +408,4 @@ trait Exec extends SimpleScalaProject
 {
 	lazy val sh = task { args =>  execOut { Process("sh" :: "-c" :: args.mkString(" ") :: Nil) } }
 	lazy val exec = task { args => execOut { Process(args) } }
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index eec1bde59..c872dce96 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009  Steven Blundy, Mark Harrah
+ * Copyright 2008, 2009  Steven Blundy, Mark Harrah, Josh Cough
  */
 package sbt
 
@@ -69,15 +69,15 @@ final class NamedTestTask(val name: String, action: => Option[String]) extends N
 
 object TestFramework
 {
-	def runTests(frameworks: Seq[TestFramework], classpath: Iterable[Path], scalaLoader: ClassLoader, tests: Seq[TestDefinition], log: Logger,
-		listeners: Seq[TestReportListener]) =
-	{
-		val (start, runTests, end) = testTasks(frameworks, classpath, scalaLoader, tests, log, listeners, true, Nil, Nil)
-		def run(tasks: Iterable[NamedTestTask]) = tasks.foreach(_.run())
-		run(start)
-		run(runTests)
-		run(end)
-	}
+//	def runTests(frameworks: Seq[TestFramework], classpath: Iterable[Path], scalaLoader: ClassLoader,
+//               tests: Seq[TestDefinition], testArgs: Seq[String], log: Logger, listeners: Seq[TestReportListener]) =
+//	{
+//		val (start, runTests, end) = testTasks(frameworks, classpath, scalaLoader, tests, log, listeners, true, Nil, Nil, Nil)
+//		def run(tasks: Iterable[NamedTestTask]) = tasks.foreach(_.run())
+//		run(start)
+//		run(runTests)
+//		run(end)
+//	}
 	
 	private val ScalaCompilerJarPackages = "scala.tools.nsc." :: "jline." :: "ch.epfl.lamp." :: Nil
 
@@ -89,9 +89,16 @@ object TestFramework
 
 		import scala.collection.{Map, Set}
 	
-	def testTasks(frameworks: Seq[TestFramework], classpath: Iterable[Path], scalaLoader: ClassLoader, tests: Seq[TestDefinition], log: Logger,
-		listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
-		cleanup: Iterable[() => Option[String]]): (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
+	def testTasks(frameworks: Seq[TestFramework],
+                classpath: Iterable[Path],
+                scalaLoader: ClassLoader,
+                tests: Seq[TestDefinition],
+                log: Logger,
+		            listeners: Seq[TestReportListener],
+                endErrorsEnabled: Boolean,
+                setup: Iterable[() => Option[String]],
+		            cleanup: Iterable[() => Option[String]],
+                testArgs: Seq[String]): (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
 	{
 		val loader = createTestLoader(classpath, scalaLoader)
 		val rawFrameworks = frameworks.flatMap(_.create(loader, log))
@@ -99,7 +106,7 @@ object TestFramework
 		if(mappedTests.isEmpty)
 			(new NamedTestTask(TestStartName, None) :: Nil, Nil, new NamedTestTask(TestFinishName, { log.info("No tests to run."); None }) :: Nil )
 		else
-			createTestTasks(loader, mappedTests, log, listeners, endErrorsEnabled, setup, cleanup)
+			createTestTasks(loader, mappedTests, log, listeners, endErrorsEnabled, setup, cleanup, testArgs)
 	}
 	private def testMap(frameworks: Seq[Framework], tests: Seq[TestDefinition]): Map[Framework, Set[TestDefinition]] =
 	{
@@ -127,7 +134,7 @@ object TestFramework
 		
 	private def createTestTasks(loader: ClassLoader, tests: Map[Framework, Set[TestDefinition]], log: Logger,
 		listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
-		cleanup: Iterable[() => Option[String]]) =
+		cleanup: Iterable[() => Option[String]], testArgs: Seq[String]) =
 	{
 		val testsListeners = listeners.filter(_.isInstanceOf[TestsListener]).map(_.asInstanceOf[TestsListener])
 		def foreachListenerSafe(f: TestsListener => Unit): Unit = safeForeach(testsListeners, log)(f)
@@ -151,7 +158,7 @@ object TestFramework
 							val oldLoader = Thread.currentThread.getContextClassLoader
 							Thread.currentThread.setContextClassLoader(loader)
 							try {
-								runner.run(testDefinition, Nil) match
+								runner.run(testDefinition, testArgs) match
 								{
 									case Error => result() = Error; Some("ERROR occurred during testing.")
 									case Failed => result() = Failed; Some("Test FAILED")

From 852a69e2e66d9b33e43f9e3cf21f46bfac8867cf Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 29 Dec 2009 22:16:28 -0500
Subject: [PATCH 190/268] Add forkRun methods to make implementing fork
 straightforward.

---
 project/build.properties                          |  4 ++--
 project/build/SbtProject.scala                    |  2 +-
 project/plugins/Plugins.scala                     |  2 +-
 scripted/project/build.properties                 |  2 +-
 scripted/src/main/scala/ScriptedTests.scala       |  8 ++++----
 src/main/scala/sbt/DefaultProject.scala           | 12 ++++++++++++
 src/main/scala/sbt/Fork.scala                     | 15 +++------------
 .../run/ForkFail/project/build.properties         |  5 +++++
 .../ForkFail/project/build/ForkFailProject.scala  |  6 ++++++
 .../run/ForkFail/src/main/scala/ForkFail.scala    |  5 +++++
 src/sbt-test/run/ForkFail/test                    |  1 +
 11 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 src/sbt-test/run/ForkFail/project/build.properties
 create mode 100644 src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala
 create mode 100644 src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala
 create mode 100644 src/sbt-test/run/ForkFail/test

diff --git a/project/build.properties b/project/build.properties
index 4e3420c59..6c315ab40 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,7 @@
 #Project properties
-#Sun Dec 06 21:31:48 EST 2009
+#Tue Dec 29 21:41:25 EST 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.9-SNAPSHOT
+project.version=0.6.9
 scala.version=2.7.7
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 4b8817504..3f1b91fd2 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -57,7 +57,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
 
-	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.2"
+	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.3"
 
 	// xsbt components
 	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % projectVersion.value.toString % "provided"
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index a21f23274..c3f30360e 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,6 +4,6 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.7"
+	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.9"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 67ee86e12..19ee2b67e 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,6 +1,6 @@
 project.organization=org.scala-tools.sbt
 project.name=scripted
 sbt.version=0.5.6
-project.version=0.6.7
+project.version=0.6.9
 scala.version=2.7.7
 project.initialize=false
diff --git a/scripted/src/main/scala/ScriptedTests.scala b/scripted/src/main/scala/ScriptedTests.scala
index 8e7597873..1d8ab4493 100644
--- a/scripted/src/main/scala/ScriptedTests.scala
+++ b/scripted/src/main/scala/ScriptedTests.scala
@@ -88,11 +88,11 @@ object FillProperties
 		import CompatibilityLevel._
 		level match
 		{
-			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1-RC2 2.8.0-SNAPSHOT"
-			case Basic =>  "2.7.7 2.7.2 2.8.0.Beta1-RC2"
-			case Minimal => "2.7.7 2.8.0.Beta1-RC2" 
+			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1-RC6 2.8.0-SNAPSHOT"
+			case Basic =>  "2.7.7 2.7.2 2.8.0.Beta1-RC6"
+			case Minimal => "2.7.7 2.8.0.Beta1-RC6" 
 			case Minimal27 => "2.7.7"
-			case Minimal28 => "2.8.0.Beta1-RC2"
+			case Minimal28 => "2.8.0.Beta1-RC6"
 		}
 	}
 	def extraProperties(sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) = 
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 11720c2e7..dc65ce101 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -232,6 +232,18 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 
 	/** Configures forking the compiler and runner.  Use ForkScalaCompiler, ForkScalaRun or mix together.*/
 	def fork: Option[ForkScala] = None
+	def forkRun: Option[ForkScala] = forkRun(None, Nil)
+	def forkRun(workingDirectory: File): Option[ForkScala] = forkRun(Some(workingDirectory), Nil)
+	def forkRun(jvmOptions: Seq[String]): Option[ForkScala] = forkRun(None, jvmOptions)
+	def forkRun(workingDirectory0: Option[File], jvmOptions: Seq[String]): Option[ForkScala] =
+	{
+		val si = buildScalaInstance
+		Some(new ForkScalaRun {
+			override def scalaJars = si.libraryJar :: si.compilerJar :: Nil
+			override def workingDirectory: Option[File] = workingDirectory0
+			override def runJVMOptions: Seq[String] = jvmOptions
+		})
+	}
 	private def doCompile(conditional: CompileConditional) = conditional.run
 	implicit def defaultRunner: ScalaRun =
 	{
diff --git a/src/main/scala/sbt/Fork.scala b/src/main/scala/sbt/Fork.scala
index 281258783..ddd97aca7 100644
--- a/src/main/scala/sbt/Fork.scala
+++ b/src/main/scala/sbt/Fork.scala
@@ -12,7 +12,7 @@ abstract class ForkJava extends NotNull
 }
 abstract class ForkScala extends ForkJava
 {
-	def scalaJars: Iterable[File] = None
+	def scalaJars: Iterable[File] = Nil
 }
 trait ForkScalaRun extends ForkScala
 {
@@ -20,11 +20,6 @@ trait ForkScalaRun extends ForkScala
 	def runJVMOptions: Seq[String] = Nil
 }
 
-trait ForkScalaCompiler extends ForkScala
-{
-	def compileJVMOptions: Seq[String] = Nil
-}
-
 sealed abstract class OutputStrategy extends NotNull
 case object StdoutOutput extends OutputStrategy
 case class BufferedOutput(logger: Logger) extends OutputStrategy
@@ -84,12 +79,8 @@ object Fork
 			apply(javaHome, jvmOptions, scalaJars, arguments, workingDirectory, BufferedOutput(log))
 		def apply(javaHome: Option[File], jvmOptions: Seq[String], scalaJars: Iterable[File], arguments: Seq[String], workingDirectory: Option[File], outputStrategy: OutputStrategy): Int =
 		{
-			val scalaClasspath =
-				if(scalaJars.isEmpty)
-					FileUtilities.scalaLibraryJar :: FileUtilities.scalaCompilerJar :: Nil
-				else
-					scalaJars
-			val scalaClasspathString = "-Xbootclasspath/a:" + scalaClasspath.map(_.getAbsolutePath).mkString(File.pathSeparator)
+			if(scalaJars.isEmpty) error("Scala jars not specified")
+			val scalaClasspathString = "-Xbootclasspath/a:" + scalaJars.map(_.getAbsolutePath).mkString(File.pathSeparator)
 			val mainClass = if(mainClassName.isEmpty) Nil else mainClassName :: Nil
 			val options = jvmOptions ++ (scalaClasspathString :: mainClass ::: arguments.toList)
 			Fork.java(javaHome, options, workingDirectory, Map.empty, outputStrategy)
diff --git a/src/sbt-test/run/ForkFail/project/build.properties b/src/sbt-test/run/ForkFail/project/build.properties
new file mode 100644
index 000000000..08046db15
--- /dev/null
+++ b/src/sbt-test/run/ForkFail/project/build.properties
@@ -0,0 +1,5 @@
+#Project properties
+#Tue Dec 22 16:14:08 CST 2009
+project.organization=Cough
+project.name=ForkFail
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala b/src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala
new file mode 100644
index 000000000..d0cda9326
--- /dev/null
+++ b/src/sbt-test/run/ForkFail/project/build/ForkFailProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class ForkFailProject(info: ProjectInfo) extends DefaultProject(info) {
+  override def fork = forkRun
+}
+
diff --git a/src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala b/src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala
new file mode 100644
index 000000000..d68bee32e
--- /dev/null
+++ b/src/sbt-test/run/ForkFail/src/main/scala/ForkFail.scala
@@ -0,0 +1,5 @@
+object ForkFail {
+  def main(args:Array[String]) {
+    println(scala.util.Properties.versionString)
+  }
+}
diff --git a/src/sbt-test/run/ForkFail/test b/src/sbt-test/run/ForkFail/test
new file mode 100644
index 000000000..4210a0425
--- /dev/null
+++ b/src/sbt-test/run/ForkFail/test
@@ -0,0 +1 @@
+> ++2.8.0.Beta1-RC6 run 

From 821f8744095810230110d4937c8f1ca0a2abec7e Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 29 Dec 2009 22:26:45 -0500
Subject: [PATCH 191/268] bump to development versions

---
 project/build.properties          | 2 +-
 scripted/project/build.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 6c315ab40..66c6dd626 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -3,5 +3,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.9
+project.version=0.6.10-SNAPSHOT
 scala.version=2.7.7
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 19ee2b67e..93b1658d7 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,6 +1,6 @@
 project.organization=org.scala-tools.sbt
 project.name=scripted
 sbt.version=0.5.6
-project.version=0.6.9
+project.version=0.6.10-SNAPSHOT
 scala.version=2.7.7
 project.initialize=false

From 8e289a262af9da8f8cc65f00eb4e05048dc9bcd3 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 30 Dec 2009 15:21:40 -0500
Subject: [PATCH 192/268] fix issue #67

---
 src/main/scala/sbt/ScalaProject.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 032787d1c..b7e6405d5 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -355,7 +355,8 @@ trait MultiTaskProject extends Project
 
 		task { tests =>
 
-      val (testNames, separator :: testArgs) = tests.toList.span(! _.startsWith("--"))
+			val (testNames, separatorAndArgs) = tests.toList.span(! _.startsWith("--"))
+			val testArgs = separatorAndArgs.drop(1)
 
 			def filterInclude =
 			{
@@ -372,6 +373,7 @@ trait MultiTaskProject extends Project
 				val includeTestsSet = Set(includeTests: _*)
 				(test: String) => includeTestsSet.contains(test) || testFilters.exists(_.accept(test))
 			}
+			
 			val includeFunction =
 				if(testNames.isEmpty)
 					(test: String) => true

From 694c45ca03291fcd4f5093e2719d0b8e467ddb4d Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 2 Jan 2010 19:24:24 -0500
Subject: [PATCH 193/268] Cleanup on Conditional

---
 src/main/scala/sbt/Conditional.scala | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
index 817465615..e85e1c68e 100644
--- a/src/main/scala/sbt/Conditional.scala
+++ b/src/main/scala/sbt/Conditional.scala
@@ -339,16 +339,10 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 		{
 			/** This checks that the plugin accounted for all classes in the output directory.*/
 			val classes = scala.collection.mutable.HashSet(analysis.allProducts.toSeq: _*)
-			var missed = 0
-			for(c <- (outputDirectory ** GlobFilter("*.class")).get)
-			{
-				if(!classes.contains(c))
-				{
-					missed += 1
-					log.debug("Missed class: " + c)
-				}
-			}
-			log.debug("Total missed classes: " + missed)
+			val actualClasses = (outputDirectory ** GlobFilter("*.class")).get
+			val missedClasses = actualClasses.toList.remove(classes.contains)
+			missedClasses.foreach(c => log.debug("Missed class: " + c))
+			log.debug("Total missed classes: " + missedClasses.length)
 		}
 		r
 	}

From 7a88494af590c92f36e4eca80d796be86b18e11a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 10 Jan 2010 19:06:16 -0500
Subject: [PATCH 194/268] Fix scope of scalacheck dependency

---
 project/build/SbtProject.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 3f1b91fd2..87105540b 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -41,6 +41,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val default = Configurations.Default
 	val optional = Configurations.Optional
 	val provided = Configurations.Provided
+	val testConf = Configurations.Test
 
 	/* Versions of Scala to cross-build against. */
 	private val Version2_7_7 = "2.7.7"
@@ -51,7 +52,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	override def crossScalaVersions = Set(Version2_7_7)
 
 	//testing
-	val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6"
+	val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6" % "test"
 
 	val ivy = "org.apache.ivy" % "ivy" % "2.1.0" intransitive()
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()

From 8516a40ec2fc368f5ee280e9780295c67df7d3c5 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 10 Jan 2010 22:02:01 -0500
Subject: [PATCH 195/268] bump to test-interface 0.4

---
 project/build/SbtProject.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 87105540b..23d538774 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -58,7 +58,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
 
-	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.3"
+	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.4"
 
 	// xsbt components
 	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % projectVersion.value.toString % "provided"

From 76b31e4fcf50fe1ef824266b5d666d71467ba5bc Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 11 Jan 2010 20:21:55 -0500
Subject: [PATCH 196/268] Fix console-project

---
 src/main/scala/sbt/Run.scala | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 770789969..4d8a68ad6 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -106,16 +106,17 @@ object Run
 	{
 		override def createInterpreter()
 		{
-			def urlClassLoader(c: Class[_]) = c.getClassLoader.asInstanceOf[URLClassLoader]
-			val loader = urlClassLoader(project.getClass)
-			val urls = List(loader, urlClassLoader(classOf[xsbti.Launcher])).flatMap(_.getURLs) // TODO: this is fragile and should be done better
-			compilerSettings.classpath.value = urls.flatMap(ClasspathUtilities.asFile).map(_.getAbsolutePath).mkString(File.pathSeparator)
+			val projectLoader = project.getClass.getClassLoader
+			val launcherJar = FileUtilities.classLocationFile[xsbti.Launcher]
+			val app = project.info.app
+			val classpathFiles = app.mainClasspath ++ app.scalaProvider.jars ++ Array(launcherJar)
+			compilerSettings.classpath.value = classpathFiles.map(_.getAbsolutePath).mkString(File.pathSeparator)
 			project.log.debug("  Compiler classpath: " + compilerSettings.classpath.value)
 
 			in = InteractiveReader.createDefault()
 			interpreter = new Interpreter(settings)
 			{
-				override protected def parentClassLoader = loader
+				override protected def parentClassLoader = projectLoader
 				override protected def newCompiler(settings: Settings, reporter: Reporter) = super.newCompiler(compilerSettings, reporter)
 			}
 			interpreter.setContextClassLoader()

From 3c6b5f79c1de17a34c7c9cf28c3034ee5c6505a3 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 11 Jan 2010 20:27:52 -0500
Subject: [PATCH 197/268] Added basic console-project test and fixed
 default-params and test-failed tests

---
 .../run/console-project/project/build.properties  |  2 ++
 src/sbt-test/run/console-project/test             |  1 +
 .../source-dependencies/default-params/test       |  2 +-
 src/sbt-test/tests/test-failed/changes/Fail.scala | 15 +++++++++------
 .../tests/test-failed/changes/Success.scala       | 15 +++++++++------
 .../project/build/TestQuickProject.scala          |  2 +-
 src/sbt-test/tests/test-failed/test               | 10 +++++-----
 7 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 src/sbt-test/run/console-project/project/build.properties
 create mode 100644 src/sbt-test/run/console-project/test

diff --git a/src/sbt-test/run/console-project/project/build.properties b/src/sbt-test/run/console-project/project/build.properties
new file mode 100644
index 000000000..2b4d7e5a1
--- /dev/null
+++ b/src/sbt-test/run/console-project/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/run/console-project/test b/src/sbt-test/run/console-project/test
new file mode 100644
index 000000000..671942e06
--- /dev/null
+++ b/src/sbt-test/run/console-project/test
@@ -0,0 +1 @@
+> console-project
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/default-params/test b/src/sbt-test/source-dependencies/default-params/test
index 666b17986..32defd9a8 100644
--- a/src/sbt-test/source-dependencies/default-params/test
+++ b/src/sbt-test/source-dependencies/default-params/test
@@ -1,5 +1,5 @@
 # default parameters are only in 2.8
-> ++2.8.0-SNAPSHOT
+> ++2.8.0.Beta1-RC7
 > compile
 
 # switch which 'x' method has a default for the second parameter in A
diff --git a/src/sbt-test/tests/test-failed/changes/Fail.scala b/src/sbt-test/tests/test-failed/changes/Fail.scala
index 1fa4e4bdd..5b03dff12 100644
--- a/src/sbt-test/tests/test-failed/changes/Fail.scala
+++ b/src/sbt-test/tests/test-failed/changes/Fail.scala
@@ -1,7 +1,10 @@
-import org.scalatest._
+import org.specs._
 
-class TestQuickSuite extends FunSuite {
-	test("a test") {
-		throw new IllegalStateException
-	}
-}
+class helloWorldFailure extends Specification {
+  "'hello world' has 11 characters" in {
+     "hello world".size must be equalTo(12)
+  }
+  "'hello world' matches 'h.* w.*'" in {
+     "hello world" must be matching("h.* w.*")
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/test-failed/changes/Success.scala b/src/sbt-test/tests/test-failed/changes/Success.scala
index 85489d7e6..eb88b25f6 100644
--- a/src/sbt-test/tests/test-failed/changes/Success.scala
+++ b/src/sbt-test/tests/test-failed/changes/Success.scala
@@ -1,7 +1,10 @@
-import org.scalatest._
+import org.specs._
 
-class TestQuickSuite extends FunSuite {
-	test("a test") {
-		true
-	}
-}
+class helloWorldSuccess extends Specification {
+  "'hello world' has 11 characters" in {
+     "hello world".size must be equalTo(11)
+  }
+  "'hello world' matches 'h.* w.*'" in {
+     "hello world" must be matching("h.* w.*")
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
index 3c7232f01..92c151476 100644
--- a/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
+++ b/src/sbt-test/tests/test-failed/project/build/TestQuickProject.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class TestQuickProject(info: ProjectInfo) extends DefaultProject(info) {
 	val snapshots = ScalaToolsSnapshots
-    val scalatest = "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-RC1-with-test-interfaces-0.2-SNAPSHOT"
+	val specs = "org.scala-tools.testing" %% "specs" % "1.6.1"
 }
diff --git a/src/sbt-test/tests/test-failed/test b/src/sbt-test/tests/test-failed/test
index b33f1c120..826a46d29 100644
--- a/src/sbt-test/tests/test-failed/test
+++ b/src/sbt-test/tests/test-failed/test
@@ -1,12 +1,12 @@
-> ++2.8.0.Beta1-RC1
+> ++2.8.0.Beta1-RC7
 > update
 
-$ copy-file changes/Fail.scala src/test/scala/TestQuickSuite.scala
+$ copy-file changes/Fail.scala src/test/scala/TestQuick.scala
 -> test-failed
 -> test-failed *
--> test-failed TestQuickSuite
+-> test-failed helloWorldFailure
 
-$ copy-file changes/Success.scala src/test/scala/TestQuickSuite.scala
+$ copy-file changes/Success.scala src/test/scala/TestQuick.scala
 > test-failed
 > test-failed *
-> test-failed TestQuickSuite
\ No newline at end of file
+> test-failed helloWorldSuccess
\ No newline at end of file

From 1474afb68082a13374617d7da9e77af230c170a0 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 11 Jan 2010 21:02:36 -0500
Subject: [PATCH 198/268] console-project fix

---
 src/main/scala/sbt/Run.scala          | 3 ++-
 src/sbt-test/run/console-project/test | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 4d8a68ad6..10d3682c1 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -109,7 +109,8 @@ object Run
 			val projectLoader = project.getClass.getClassLoader
 			val launcherJar = FileUtilities.classLocationFile[xsbti.Launcher]
 			val app = project.info.app
-			val classpathFiles = app.mainClasspath ++ app.scalaProvider.jars ++ Array(launcherJar)
+			val projectJars: Array[File] = projectLoader.asInstanceOf[URLClassLoader].getURLs.flatMap(ClasspathUtilities.asFile).toArray[File]
+			val classpathFiles = app.mainClasspath ++ app.scalaProvider.jars ++ Array(launcherJar) ++ projectJars
 			compilerSettings.classpath.value = classpathFiles.map(_.getAbsolutePath).mkString(File.pathSeparator)
 			project.log.debug("  Compiler classpath: " + compilerSettings.classpath.value)
 
diff --git a/src/sbt-test/run/console-project/test b/src/sbt-test/run/console-project/test
index 671942e06..4f355b10b 100644
--- a/src/sbt-test/run/console-project/test
+++ b/src/sbt-test/run/console-project/test
@@ -1 +1,4 @@
+> console-project
+$ copy-file changes/BlankProject.scala project/build/BlankProject.scala
+> reload
 > console-project
\ No newline at end of file

From e02afb36c815eb61f4f52f8c9bbe5f078e5c7bcf Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 12 Jan 2010 18:50:47 -0500
Subject: [PATCH 199/268]  * Fix 'reload' behavior with respect to sbt.version 
 * Add test for artifacts

---
 src/main/scala/sbt/BasicProjectTypes.scala    |  3 +-
 src/main/scala/sbt/Main.scala                 |  2 +-
 .../artifact/project/build.properties         |  2 +
 .../artifact/project/build/ArtifactTest.scala | 42 +++++++++++++++++++
 .../artifact/src/main/scala/Test.scala        |  2 +
 .../dependency-management/artifact/test       | 20 +++++++++
 6 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/artifact/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
 create mode 100644 src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala
 create mode 100644 src/sbt-test/dependency-management/artifact/test

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 4e48504d9..12cfa6f54 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -170,7 +170,8 @@ trait ManagedProject extends ClasspathProject
 	* so that the Ivy 'extends' mechanism is not required.  That way, the jars are only copied to one configuration.*/
 	def managedClasspath(config: Configuration): PathFinder = configurationClasspath(config)
 	/** All dependencies in the given configuration. */
-	final def configurationClasspath(config: Configuration): PathFinder = descendents(configurationPath(config), "*.jar")
+	final def configurationClasspath(config: Configuration): PathFinder = descendents(configurationPath(config), classpathFilter)
+	def classpathFilter: FileFilter = "*.jar"
 	/** The base path to which dependencies in configuration 'config' are downloaded.*/
 	def configurationPath(config: Configuration): Path = managedDependencyPath / config.toString
 
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 918114f0a..8578429d8 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -151,7 +151,7 @@ class xMain extends xsbti.AppMain
 			{
 				case "" :: tail => continue(project, tail, failAction)
 				case (ExitCommand | QuitCommand) :: _ => result( Exit(NormalExitCode) )
-				case RebootCommand :: tail => result( Reboot(project.defScalaVersion.value, rememberCurrent(tail), configuration) )
+				case RebootCommand :: tail => throw new xsbti.FullReload(rememberCurrent(tail).toArray)
 				case InteractiveCommand :: _ => continue(project, prompt(baseProject, project) :: arguments, interactiveContinue)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)
diff --git a/src/sbt-test/dependency-management/artifact/project/build.properties b/src/sbt-test/dependency-management/artifact/project/build.properties
new file mode 100644
index 000000000..2b4d7e5a1
--- /dev/null
+++ b/src/sbt-test/dependency-management/artifact/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala b/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
new file mode 100644
index 000000000..f2dcc858d
--- /dev/null
+++ b/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
@@ -0,0 +1,42 @@
+import sbt._
+
+class ArtifactTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	// use cache specific to this test
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+
+	// define a test repository to publish to
+	override def managedStyle = ManagedStyle.Maven
+	val publishTo = Resolver.file("Test Repo", ("test-repo") asFile)
+
+	// define strings for defining the artifact
+	override def artifactID = "test"
+	def ext = "test2"
+	def classifier = "test3"
+	def tpe = "test1"
+	def vers = "1.1"
+	def org = "test"
+	// define the jar
+	override def jarPath = outputPath / (artifactID + "-" + vers + "-" + classifier + "." + ext)
+	def artifact = Artifact(artifactID, tpe, ext, classifier)
+	
+	// define the IDs to use for publishing and retrieving
+	def publishedID = org % artifactID % vers artifacts(artifact)
+	def retrieveID = org % "test-retrieve" % "2.0"
+	
+	override def projectID = if(retrieve) retrieveID else publishedID
+	override def libraryDependencies = if(retrieve) Set(publishedID) else super.libraryDependencies
+	
+	// switches between publish and retrieve mode
+	def retrieve = "retrieve".asFile.exists
+	// needed to add a jar with a different extension to the classpath
+	override def classpathFilter = "*." + ext
+	
+	// check that the test class is on the compile classpath, either because it was compiled or because it was properly retrieved
+	lazy val check  = task { check0 }
+	def check0 =
+		try { Class.forName("test.Test", false, loader); None }
+		catch { case _: ClassNotFoundException | _: NoClassDefFoundError => Some("Dependency not retrieved properly") }
+	def loader = new java.net.URLClassLoader(compileClasspath.get.map(_.asURL).toSeq.toArray, buildScalaInstance.loader)
+}
diff --git a/src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala b/src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala
new file mode 100644
index 000000000..b01b6da1c
--- /dev/null
+++ b/src/sbt-test/dependency-management/artifact/src/main/scala/Test.scala
@@ -0,0 +1,2 @@
+package test
+class Test
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/artifact/test b/src/sbt-test/dependency-management/artifact/test
new file mode 100644
index 000000000..2e317d56f
--- /dev/null
+++ b/src/sbt-test/dependency-management/artifact/test
@@ -0,0 +1,20 @@
+# verify that check fails when test class is not present
+-> check
+
+# compile and jar test class
+> package
+# verify that check succeeds
+> check
+
+# publish test jar to test repository
+>publish
+
+# delete test jar and verify check fails again
+> clean
+-> check
+
+# tell project definition to switch to retrieve mode
+$ touch retrieve
+# verify that artifact with extension, type, and classifier can be retreieved
+> update
+> check
\ No newline at end of file

From 791c7a2a14614af687f4df8134f005afc1a8fbd4 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 13 Jan 2010 20:01:06 -0500
Subject: [PATCH 200/268]  * Remove -linksource as a default option for doc  *
 First attempt at fixing webapp classloading  * Additional tests

---
 src/main/scala/sbt/DefaultProject.scala       |  4 +-
 src/main/scala/sbt/WebApp.scala               | 54 +++++++++++--------
 .../project/build.properties                  |  2 +
 .../project/build/Test.scala                  | 34 ++++++++++++
 .../src/main/scala/Test.scala                 |  1 +
 .../package-to-publish/test                   |  3 ++
 src/sbt-test/web/jsp/changes/index.jsp        |  5 ++
 src/sbt-test/web/jsp/project/build/JSP.scala  | 18 ++-----
 src/sbt-test/web/jsp/test                     | 12 ++++-
 .../web/servlet/changes/MyServlet.scala       | 20 +++++++
 .../web/servlet/project/build.properties      |  3 ++
 .../project/build/src/WebappBuild.scala       | 19 +++++++
 .../src/main/scala/test/MyServlet.scala       | 20 +++++++
 .../servlet/src/main/webapp/WEB-INF/web.xml   | 18 +++++++
 src/sbt-test/web/servlet/test                 | 13 +++++
 15 files changed, 187 insertions(+), 39 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/package-to-publish/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
 create mode 100644 src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala
 create mode 100644 src/sbt-test/dependency-management/package-to-publish/test
 create mode 100644 src/sbt-test/web/jsp/changes/index.jsp
 create mode 100644 src/sbt-test/web/servlet/changes/MyServlet.scala
 create mode 100644 src/sbt-test/web/servlet/project/build.properties
 create mode 100644 src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
 create mode 100644 src/sbt-test/web/servlet/src/main/scala/test/MyServlet.scala
 create mode 100644 src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
 create mode 100644 src/sbt-test/web/servlet/test

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index dc65ce101..f5d62213d 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -75,7 +75,6 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 
 	/** The options provided to the 'doc' and 'docTest' actions.*/
 	def documentOptions: Seq[ScaladocOption] =
-		LinkSource ::
 		documentTitle(name + " " + version + " API") ::
 		windowTitle(name + " " + version + " API") ::
 		Nil
@@ -404,6 +403,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	/** The port that Jetty runs on. */
 	def jettyPort: Int = JettyRunner.DefaultPort
 
+	lazy val jettyReload = task { jettyInstance.reload(); None } describedAs(JettyReloadDescription)
 	lazy val jettyRestart = jettyStop && jettyRun
 	lazy val jettyStop = jettyStopAction
 	protected def jettyStopAction = jettyStopTask(jettyInstance) describedAs(JettyStopDescription)
@@ -489,6 +489,8 @@ object BasicWebScalaProject
 		"Starts the Jetty server and serves this project as a web application."
 	val JettyDescription =
 		"Starts the Jetty server and serves this project as a web application.  Waits until interrupted, so it is suitable to call this batch-style."
+	val JettyReloadDescription =
+		"Forces a reload of a web application running in a Jetty server started by 'jetty-run'.  Does nothing if Jetty is not running."
 }
 /** Analyzes the dependencies of a project after compilation.  All methods except `snapshot` return a
 * `PathFinder`.  The underlying calculations are repeated for each call to PathFinder.get. */
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index d8b748b99..b1d8404dc 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -25,6 +25,7 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 		running.foreach(_.stop())
 		running = None
 	}
+	def reload() = running.foreach(_.reload())
 	def apply(): Option[String] =
 	{
 		import configuration._
@@ -32,10 +33,17 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 		{
 			val baseLoader = this.getClass.getClassLoader
 			val classpathURLs = jettyClasspath.get.map(_.asURL).toSeq
-			val loader: ClassLoader = new java.net.URLClassLoader(classpathURLs.toArray, baseLoader)
-			val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.classLocation[Stoppable].toURI.toURL), loader, baseLoader)
+			val jettyParentLoader = configuration match { case d: DefaultJettyConfiguration => d.parentLoader; case _ => ClassLoader.getSystemClassLoader }
+			val jettyLoader: ClassLoader = new java.net.URLClassLoader(classpathURLs.toArray, jettyParentLoader)
+			
+			val jettyFilter = (name: String) => name.startsWith("org.mortbay.")
+			val notJettyFilter = (name: String) => !jettyFilter(name)
+			
+			val dual = new xsbt.DualLoader(baseLoader, notJettyFilter, x => true, jettyLoader, jettyFilter, x => false)
+			
+			val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.classLocation[Stoppable].toURI.toURL), dual, baseLoader)
 			val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
-			runner(configuration)
+			runner(configuration, jettyLoader)
 		}
 
 		if(running.isDefined)
@@ -66,10 +74,11 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 private trait Stoppable
 {
 	def stop(): Unit
+	def reload(): Unit
 }
 private trait JettyRun
 {
-	def apply(configuration: JettyConfiguration): Stoppable
+	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable
 }
 sealed trait JettyConfiguration extends NotNull
 {
@@ -105,7 +114,7 @@ private object LazyJettyRun extends JettyRun
 {
 	import org.mortbay.jetty.{Handler, Server}
 	import org.mortbay.jetty.nio.SelectChannelConnector
-	import org.mortbay.jetty.webapp.WebAppContext
+	import org.mortbay.jetty.webapp.{WebAppClassLoader, WebAppContext}
 	import org.mortbay.log.Log
 	import org.mortbay.util.Scanner
 	import org.mortbay.xml.XmlConfiguration
@@ -114,7 +123,7 @@ private object LazyJettyRun extends JettyRun
 
 	val DefaultMaxIdleTime = 30000
 
-	def apply(configuration: JettyConfiguration): Stoppable =
+	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =
 	{
 		val oldLog = Log.getLog
 		Log.setLog(new JettyLogger(configuration.log))
@@ -127,15 +136,17 @@ private object LazyJettyRun extends JettyRun
 					import c._
 					configureDefaultConnector(server, port)
 					def classpathURLs = classpath.get.map(_.asURL).toSeq
-					def createLoader = new URLClassLoader(classpathURLs.toArray, parentLoader)
 					val webapp = new WebAppContext(war.absolutePath, contextPath)
-					webapp.setClassLoader(createLoader)
+					
+					def createLoader = new WebAppClassLoader(jettyLoader, webapp) { override def getURLs = classpathURLs.toArray }
+					def setLoader() = webapp.setClassLoader(createLoader)
+					
+					setLoader()
 					server.setHandler(webapp)
 
-					Some(new Scanner.BulkListener {
-						def filesChanged(files: java.util.List[_]) {
-							reload(server, webapp.setClassLoader(createLoader), log)
-						}
+					Some(new Scanner.BulkListener with Reload {
+						def reloadApp() = reload(server, setLoader(), log)
+						def filesChanged(files: java.util.List[_]) { reloadApp() }
 					})
 				case c: CustomJettyConfiguration =>
 					for(x <- c.jettyConfigurationXML)
@@ -169,7 +180,7 @@ private object LazyJettyRun extends JettyRun
 		try
 		{
 			server.start()
-			new StopServer(new WeakReference(server), configureScanner(), oldLog)
+			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), configureScanner(), oldLog)
 		}
 		catch { case e => server.stop(); throw e }
 	}
@@ -180,19 +191,16 @@ private object LazyJettyRun extends JettyRun
 		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
 		server.addConnector(defaultConnector)
 	}
-	private class StopServer(serverReference: Reference[Server], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: org.mortbay.log.Logger) extends Stoppable
+	trait Reload { def reloadApp(): Unit }
+	private class StopServer(serverReference: Reference[Server], reloadReference: Option[Reference[Reload]], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: org.mortbay.log.Logger) extends Stoppable
 	{
+		def reload(): Unit = on(reloadReference)(_.reloadApp())
+		private def on[T](refOpt: Option[Reference[T]])(f: T => Unit): Unit = refOpt.foreach(ref => onReferenced(ref.get)(f))
+		private def onReferenced[T](t: T)(f: T => Unit): Unit = if(t == null) () else f(t)
 		def stop()
 		{
-			val server = serverReference.get
-			if(server != null)
-				server.stop()
-			for(scannerReference <- scannerReferenceOpt)
-			{
-				val scanner = scannerReference.get
-				if(scanner != null)
-					scanner.stop()
-			}
+			onReferenced(serverReference.get)(_.stop())
+			on(scannerReferenceOpt)(_.stop())
 			Log.setLog(oldLog)
 		}
 	}
diff --git a/src/sbt-test/dependency-management/package-to-publish/project/build.properties b/src/sbt-test/dependency-management/package-to-publish/project/build.properties
new file mode 100644
index 000000000..5a5bc0dec
--- /dev/null
+++ b/src/sbt-test/dependency-management/package-to-publish/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Publish Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala b/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
new file mode 100644
index 000000000..f7a1dd0f2
--- /dev/null
+++ b/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
@@ -0,0 +1,34 @@
+import sbt._
+
+class Test(info: ProjectInfo) extends DefaultProject(info)
+{
+	def ivyCacheDirectory = outputPath / "ivy-cache"
+	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	
+  override def managedStyle = ManagedStyle.Maven
+	def testRepoPath = path("test-repo")
+	val publishTo = Resolver.file("test repo", testRepoPath asFile)
+	
+	def srcExt = "-sources.jar"
+	def srcFilter = extFilter(srcExt)
+	def docExt = "-javadoc.jar"
+	def docFilter = extFilter(docExt)
+	def extFilter(ext: String) = "*" + ext
+	
+	override def packageDocsJar = defaultJarPath(docExt)
+	override def packageSrcJar= defaultJarPath(srcExt)
+	
+	val sourceArtifact = Artifact(artifactID, "src", "jar", "sources")
+	val docsArtifact = Artifact(artifactID, "docs", "jar", Some("javadoc"), Nil, None)
+	override def packageToPublishActions = super.packageToPublishActions ++ Seq(packageDocs, packageSrc)
+	
+	lazy val check = task { check0 }
+	
+	def check0 = checkPom orElse checkBin orElse checkSource orElse checkDoc
+	def checkPom = exists("pom", "*.pom")
+	def checkDoc = exists("javadoc", docFilter)
+	def checkSource = exists("sources", srcFilter)
+	def checkBin = exists("binary", "*.jar" - (srcFilter | docFilter))
+	def exists(label: String, filter: sbt.NameFilter) = 
+		if( (testRepoPath ** filter).get.isEmpty) Some("No " + label + " published") else None
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala b/src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala
new file mode 100644
index 000000000..7396cec1d
--- /dev/null
+++ b/src/sbt-test/dependency-management/package-to-publish/src/main/scala/Test.scala
@@ -0,0 +1 @@
+class TestClass
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/package-to-publish/test b/src/sbt-test/dependency-management/package-to-publish/test
new file mode 100644
index 000000000..6bae15e55
--- /dev/null
+++ b/src/sbt-test/dependency-management/package-to-publish/test
@@ -0,0 +1,3 @@
+-> check
+> publish
+> check
\ No newline at end of file
diff --git a/src/sbt-test/web/jsp/changes/index.jsp b/src/sbt-test/web/jsp/changes/index.jsp
new file mode 100644
index 000000000..2a7d1f317
--- /dev/null
+++ b/src/sbt-test/web/jsp/changes/index.jsp
@@ -0,0 +1,5 @@
+<html>
+	<body>
+		<% out.println(" Hello World!"); %>
+	</body>
+</html>
\ No newline at end of file
diff --git a/src/sbt-test/web/jsp/project/build/JSP.scala b/src/sbt-test/web/jsp/project/build/JSP.scala
index 48aa9c5fd..b248512f8 100644
--- a/src/sbt-test/web/jsp/project/build/JSP.scala
+++ b/src/sbt-test/web/jsp/project/build/JSP.scala
@@ -9,20 +9,12 @@ class JSP(info: ProjectInfo) extends DefaultWebProject(info)
 	def indexFile = new java.io.File("index.html")
 	import Process._
 	lazy val getPage = execTask { indexURL #> indexFile }
-	lazy val checkPage = task { checkHelloWorld() } dependsOn getPage
 	
-	private def checkHelloWorld() =
+	lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage }
+	
+	private def checkHelloWorld(checkString: String) =
 	{
-		try
-		{
-			FileUtilities.readString(indexFile, log) match
-			{
-				case Right(value) =>
-					if(value.contains("Hello World!")) None
-					else Some("index.html did not contain 'Hello World!' :\n" +value)
-				case Left(msg) => Some(msg)
-			}
-		}
-		finally { jettyInstance.stop() }
+		val value = xsbt.FileUtilities.read(indexFile)
+		if(value.contains(checkString)) None else Some("index.html did not contain '" + checkString + "' :\n" +value)
 	}
 }
\ No newline at end of file
diff --git a/src/sbt-test/web/jsp/test b/src/sbt-test/web/jsp/test
index 0ea28e8a8..04a09d4e2 100644
--- a/src/sbt-test/web/jsp/test
+++ b/src/sbt-test/web/jsp/test
@@ -1,4 +1,12 @@
 > update
 > jetty-run
-> check-page
-> jetty-stop
\ No newline at end of file
+> check-page "Hello World!"
+
+$ copy-file changes/index.jsp src/main/webapp/index.jsp
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello World 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
\ No newline at end of file
diff --git a/src/sbt-test/web/servlet/changes/MyServlet.scala b/src/sbt-test/web/servlet/changes/MyServlet.scala
new file mode 100644
index 000000000..15dc6f7eb
--- /dev/null
+++ b/src/sbt-test/web/servlet/changes/MyServlet.scala
@@ -0,0 +1,20 @@
+package test
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+class MyServlet extends HttpServlet {
+
+	val html = <HTML>
+		<HEAD><TITLE>Hello, Scala 2!</TITLE></HEAD>
+		<BODY>Hello, Scala 2! This is a servlet.</BODY>
+	</HTML>
+
+	override def doGet(req:HttpServletRequest, resp:HttpServletResponse) {
+		resp.setContentType("text/html")
+		resp.getWriter().print(html.toString)
+	}
+	def check28(f: Int = 3) = f
+}
+
diff --git a/src/sbt-test/web/servlet/project/build.properties b/src/sbt-test/web/servlet/project/build.properties
new file mode 100644
index 000000000..34162cdcd
--- /dev/null
+++ b/src/sbt-test/web/servlet/project/build.properties
@@ -0,0 +1,3 @@
+project.organization=tester
+project.name=sbtweb
+project.version=1.0
diff --git a/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala b/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
new file mode 100644
index 000000000..20edda2f6
--- /dev/null
+++ b/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
@@ -0,0 +1,19 @@
+import sbt._
+
+class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) {
+
+	val servlet_api = "org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default"
+	val jetty_servlet = "org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default"
+
+	def indexURL = new java.net.URL("http://localhost:8080")
+	def indexFile = new java.io.File("index.html")
+	import Process._
+	lazy val getPage = execTask { indexURL #> indexFile }
+	lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage }
+	
+	private def checkHelloWorld(checkString: String) =
+	{
+		val value = xsbt.FileUtilities.read(indexFile)
+		if(value.contains(checkString)) None else Some("index.html did not contain '" + checkString + "' :\n" +value)
+	}
+}
diff --git a/src/sbt-test/web/servlet/src/main/scala/test/MyServlet.scala b/src/sbt-test/web/servlet/src/main/scala/test/MyServlet.scala
new file mode 100644
index 000000000..9d0365c5a
--- /dev/null
+++ b/src/sbt-test/web/servlet/src/main/scala/test/MyServlet.scala
@@ -0,0 +1,20 @@
+package test
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+class MyServlet extends HttpServlet {
+
+	val html = <HTML>
+		<HEAD><TITLE>Hello, Scala!</TITLE></HEAD>
+		<BODY>Hello, Scala! This is a servlet.</BODY>
+	</HTML>
+
+	override def doGet(req:HttpServletRequest, resp:HttpServletResponse) {
+		resp.setContentType("text/html")
+		resp.getWriter().print(html.toString)
+	}
+	def check28(f: Int = 3) = f
+}
+
diff --git a/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml b/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..bff12b49b
--- /dev/null
+++ b/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,18 @@
+<!DOCTYPE web-app PUBLIC
+	"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+	"http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+	<display-name>Archetype Created Web Application</display-name>
+
+	<servlet>
+		<servlet-name>Home</servlet-name>
+		<servlet-class>test.MyServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Home</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+
+</web-app>
+
diff --git a/src/sbt-test/web/servlet/test b/src/sbt-test/web/servlet/test
new file mode 100644
index 000000000..5e153ca61
--- /dev/null
+++ b/src/sbt-test/web/servlet/test
@@ -0,0 +1,13 @@
+> ++2.8.0.Beta1-RC6
+> update
+> jetty-run
+> check-page "Hello, Scala!"
+
+$ copy-file changes/MyServlet.scala src/main/scala/test/MyServlet.scala
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello, Scala 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
\ No newline at end of file

From b6cb89fea49c2f6f0bc883bf455329d9f80bfdaf Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 14 Jan 2010 00:15:21 -0500
Subject: [PATCH 201/268]  * limit stack trace length: trace 'on' | 'off' |
 'nosbt' | 1 | 2 | ...  * updating license/copyright

---
 LICENSE                                       |  2 +-
 NOTICE                                        | 29 ++-------
 licenses/LICENSE_sbt                          |  4 +-
 src/main/scala/sbt/Logger.scala               | 40 ++++++------
 src/main/scala/sbt/Main.scala                 | 22 +++++--
 src/main/scala/sbt/Project.scala              |  1 -
 src/main/scala/sbt/Resources.scala            |  1 -
 src/main/scala/sbt/StackTrace.scala           | 63 +++++++++++++++++++
 src/main/scala/sbt/WebApp.scala               | 61 +++++++++---------
 .../changes/BlankProject.scala                |  3 +
 10 files changed, 144 insertions(+), 82 deletions(-)
 create mode 100644 src/main/scala/sbt/StackTrace.scala
 create mode 100644 src/sbt-test/run/console-project/changes/BlankProject.scala

diff --git a/LICENSE b/LICENSE
index be586c877..6d1f89b26 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2008, 2009 Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
+Copyright (c) 2008, 2009, 2010 Steven Blundy, Josh Cough, Nathan Hamblen, Mark Harrah, David MacIver, Mikko Peltonen, Tony Sloane, Vesa Vilhonen
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/NOTICE b/NOTICE
index 07766ee52..1c90f88f5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,6 @@
 Simple Build Tool (sbt)
-Copyright 2008, 2009 Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
+Copyright 2008, 2009, 2010 Steven Blundy, Josh Cough, Nathan Hamblen, Mark Harrah, David MacIver, Mikko Peltonen, Tony Sloane, Vesa Vilhonen
+Licensed under BSD-style license (see LICENSE)
 
 
 Portions based on code by Mike Clark in JDepend
@@ -14,30 +15,12 @@ Portions based on code from the Scala compiler
 Copyright 2002-2008 EPFL, Lausanne
 Licensed under BSD-style license (see licenses/LICENSE_Scala)
 
-Portions based on code from specs
-Copyright 2007-2008 Eric Torreborre
-Licensed under MIT license (see licenses/LICENSE_specs)
-
-Portions based on code from ScalaTest
-Copyright 2001-2008 Artima, Inc.
-Licensed under the Apache License, Version 2.0(see licenses/LICENSE_Apache)
-
-Portions based on code from ScalaCheck
-Copyright 2007, Rickard Nilsson
-Licensed under BSD-style license (see licenses/LICENSE_ScalaCheck)
-
-Jetty is licensed under the Apache License, Version 2.0 (see licenses/LICENSE_Apache).
-
-ScalaTest is distributed with sbt (in the subversion repository)
-and requires the following notice:
-
- This product includes software developed by
-    Artima, Inc. (http://www.artima.com/).
-
+JLine is distributed with the sbt launcher.
+It is licensed under a BSD-style license (see licenses/LICENSE_JLine)
 
 Apache Ivy, licensed under the Apache License, Version 2.0
-(see licenses/LICENSE_Apache) is distributed with sbt and
-requires the following notice:
+(see licenses/LICENSE_Apache) is distributed with the sbt launcher.
+It requires the following notice:
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/licenses/LICENSE_sbt b/licenses/LICENSE_sbt
index 1b82fe7ca..b28d901b0 100644
--- a/licenses/LICENSE_sbt
+++ b/licenses/LICENSE_sbt
@@ -1,4 +1,4 @@
-Copyright (c) 2008 Mark Harrah, David MacIver
+Copyright (c) 2008, 2009, 2010 Steven Blundy, Josh Cough, Nathan Hamblen, Mark Harrah, David MacIver, Mikko Peltonen, Tony Sloane, Vesa Vilhonen
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -22,4 +22,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
+
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index b4d9de0d3..86e014125 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -10,7 +10,7 @@ final class Success(val msg: String) extends LogEvent
 final class Log(val level: Level.Value, val msg: String) extends LogEvent
 final class Trace(val exception: Throwable) extends LogEvent
 final class SetLevel(val newLevel: Level.Value) extends LogEvent
-final class SetTrace(val enabled: Boolean) extends LogEvent
+final class SetTrace(val level: Int) extends LogEvent
 final class ControlEvent(val event: ControlEvent.Value, val msg: String) extends LogEvent
 
 object ControlEvent extends Enumeration
@@ -22,8 +22,9 @@ abstract class Logger extends xsbt.CompileLogger with xsbt.IvyLogger
 {
 	def getLevel: Level.Value
 	def setLevel(newLevel: Level.Value)
-	def enableTrace(flag: Boolean)
-	def traceEnabled: Boolean
+	def setTrace(flag: Int)
+	def getTrace: Int
+	final def traceEnabled = getTrace >= 0
 	def ansiCodesSupported = false
 
 	def atLevel(level: Level.Value) = level.id >= getLevel.id
@@ -47,7 +48,7 @@ abstract class Logger extends xsbt.CompileLogger with xsbt.IvyLogger
 			case l: Log => log(l.level, l.msg)
 			case t: Trace => trace(t.exception)
 			case setL: SetLevel => setLevel(setL.newLevel)
-			case setT: SetTrace => enableTrace(setT.enabled)
+			case setT: SetTrace => setTrace(setT.level)
 			case c: ControlEvent => control(c.event, c.msg)
 		}
 	}
@@ -64,12 +65,12 @@ abstract class Logger extends xsbt.CompileLogger with xsbt.IvyLogger
 /** Implements the level-setting methods of Logger.*/
 abstract class BasicLogger extends Logger
 {
-	private var traceEnabledVar = true
+	private var traceEnabledVar = java.lang.Integer.MAX_VALUE
 	private var level: Level.Value = Level.Info
 	def getLevel = level
 	def setLevel(newLevel: Level.Value) { level = newLevel }
-	def enableTrace(flag: Boolean) { traceEnabledVar = flag }
-	def traceEnabled = traceEnabledVar
+	def setTrace(level: Int) { traceEnabledVar = level }
+	def getTrace = traceEnabledVar
 }
 
 final class SynchronizedLogger(delegate: Logger) extends Logger
@@ -77,8 +78,8 @@ final class SynchronizedLogger(delegate: Logger) extends Logger
 	override lazy val ansiCodesSupported = delegate.ansiCodesSupported
 	def getLevel = { synchronized { delegate.getLevel } }
 	def setLevel(newLevel: Level.Value) { synchronized { delegate.setLevel(newLevel) } }
-	def enableTrace(enabled: Boolean) { synchronized { delegate.enableTrace(enabled) } }
-	def traceEnabled: Boolean = { synchronized { delegate.traceEnabled } }
+	def setTrace(level: Int) { synchronized { delegate.setTrace(level) } }
+	def getTrace: Int = { synchronized { delegate.getTrace } }
 
 	def trace(t: => Throwable) { synchronized { delegate.trace(t) } }
 	def log(level: Level.Value, message: => String) { synchronized { delegate.log(level, message) } }
@@ -95,10 +96,10 @@ final class MultiLogger(delegates: List[Logger]) extends BasicLogger
 		super.setLevel(newLevel)
 		dispatch(new SetLevel(newLevel))
 	}
-	override def enableTrace(enabled: Boolean)
+	override def setTrace(level: Int)
 	{
-		super.enableTrace(enabled)
-		dispatch(new SetTrace(enabled))
+		super.setTrace(level)
+		dispatch(new SetTrace(level))
 	}
 	def trace(t: => Throwable) { dispatch(new Trace(t)) }
 	def log(level: Level.Value, message: => String) { dispatch(new Log(level, message)) }
@@ -119,6 +120,8 @@ final class FilterLogger(delegate: Logger) extends BasicLogger
 		if(traceEnabled)
 			delegate.trace(t)
 	}
+	override def setTrace(level: Int) { delegate.setTrace(level) }
+	override def getTrace = delegate.getTrace 
 	def log(level: Level.Value, message: => String)
 	{
 		if(atLevel(level))
@@ -216,12 +219,12 @@ final class BufferedLogger(delegate: Logger) extends Logger
 			delegate.setLevel(newLevel)
 		}
 	def getLevel = synchronized { delegate.getLevel }
-	def traceEnabled = synchronized { delegate.traceEnabled }
-	def enableTrace(flag: Boolean): Unit =
+	def getTrace = synchronized { delegate.getTrace }
+	def setTrace(level: Int): Unit =
 		synchronized
 		{
-			buffer.foreach{_  += new SetTrace(flag) }
-			delegate.enableTrace(flag)
+			buffer.foreach{_  += new SetTrace(level) }
+			delegate.setTrace(level)
 		}
 
 	def trace(t: => Throwable): Unit =
@@ -295,8 +298,9 @@ class ConsoleLogger extends BasicLogger
 	def trace(t: => Throwable): Unit =
 		System.out.synchronized
 		{
-			if(traceEnabled)
-				t.printStackTrace
+			val traceLevel = getTrace
+			if(traceLevel >= 0)
+				System.out.synchronized { System.out.print(StackTrace.trimmed(t, traceLevel)) }
 		}
 	def log(level: Level.Value, message: => String)
 	{
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 8578429d8..b16851136 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -29,6 +29,7 @@ object Main
 	val UsageErrorExitCode = 4
 	val BuildErrorExitCode = 5
 	val ProgramErrorExitCode = 6
+	val MaxInt = java.lang.Integer.MAX_VALUE
 }
 
 import Main._
@@ -385,6 +386,8 @@ class xMain extends xsbti.AppMain
 					setProperty(currentProject, action.substring(SetAction.length + 1))
 				else if(action.startsWith(GetAction + " "))
 					getProperty(currentProject, action.substring(GetAction.length + 1))
+				else if(action.startsWith(TraceCommand + " "))
+					setTrace(currentProject, action.substring(TraceCommand.length + 1))
 				else
 					handleCommand(currentProject, action)
 		}
@@ -432,6 +435,7 @@ class xMain extends xsbti.AppMain
 			case GetAction => getArgumentError(project.log)
 			case SetAction => setArgumentError(project.log)
 			case ProjectAction => setProjectError(project.log)
+			case TraceCommand => setTraceError(project.log); true
 			case ShowCurrent =>
 				printProject("Current project is ", project)
 				Console.println("Current Scala version is " + project.buildScalaVersion)
@@ -439,7 +443,6 @@ class xMain extends xsbti.AppMain
 				printTraceEnabled(project)
 				true
 			case ShowActions => showActions(project); true
-			case TraceCommand => toggleTrace(project); true
 			case Level(level) => setLevel(project, level); true
 			case ContinuousCompileCommand => compileContinuously(project)
 			case action if action.startsWith(ContinuousExecutePrefix) => executeContinuously(project, action.substring(ContinuousExecutePrefix.length).trim)
@@ -493,15 +496,21 @@ class xMain extends xsbti.AppMain
 	}
 
 	/** Toggles whether stack traces are enabled.*/
-	private def toggleTrace(project: Project)
+	private def setTrace(project: Project, value: String): Boolean =
 	{
-		val newValue = !project.log.traceEnabled
-		project.projectClosure.foreach(_.log.enableTrace(newValue))
-		printTraceEnabled(project)
+		try
+		{
+			val newValue = if(value == "on") MaxInt else if(value == "off") -1 else if(value == "nosbt") 0 else value.toInt
+			project.projectClosure.foreach(_.log.setTrace(newValue))
+			printTraceEnabled(project)
+			true
+		}
+		catch { case _: NumberFormatException => setTraceError(project.log) }
 	}
 	private def printTraceEnabled(project: Project)
 	{
-		Console.println("Stack traces are " + (if(project.log.traceEnabled) "enabled" else "disabled"))
+		def traceLevel(level: Int) = if(level == 0) " (no stack elements)" else if(level == MaxInt) "" else " (maximum " + level + " stack elements per exception)"
+		Console.println("Stack traces are " + (if(project.log.traceEnabled) "enabled" + traceLevel(project.log.getTrace) else "disabled"))
 	}
 	/** Sets the logging level on the given project.*/
 	private def setLevel(project: Project, level: Level.Value)
@@ -688,6 +697,7 @@ class xMain extends xsbti.AppMain
 	}
 
 	private def isTerminateAction(s: String) = TerminateActions.elements.contains(s.toLowerCase)
+	private def setTraceError(log: Logger) = logError(log)("Invalid arguments for 'trace': expected 'on', 'off', or integer number of stack elements to show per exception.")
 	private def setArgumentError(log: Logger) = logError(log)("Invalid arguments for 'set': expected property name and new value.")
 	private def getArgumentError(log: Logger) = logError(log)("Invalid arguments for 'get': expected property name.")
 	private def setProjectError(log: Logger) = logError(log)("Invalid arguments for 'project': expected project name.")
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 53f67a754..ca3dda3de 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -311,7 +311,6 @@ object Project
 	{
 		val log = new ConsoleLogger
 		log.setLevel(Level.Debug)
-		log.enableTrace(true)
 		log
 	}
 
diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
index 1aa906358..28668ddae 100644
--- a/src/main/scala/sbt/Resources.scala
+++ b/src/main/scala/sbt/Resources.scala
@@ -82,7 +82,6 @@ class Resources(val baseDirectory: File, additional: ClassLoader, app: AppProvid
 			{
 				val buffered = new BufferedLogger(log)
 				buffered.setLevel(Level.Debug)
-				buffered.enableTrace(true)
 				def error(msg: String) =
 				{
 					buffered.stopAll()
diff --git a/src/main/scala/sbt/StackTrace.scala b/src/main/scala/sbt/StackTrace.scala
new file mode 100644
index 000000000..1ecd6e8bf
--- /dev/null
+++ b/src/main/scala/sbt/StackTrace.scala
@@ -0,0 +1,63 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010 Tony Sloane
+ */
+package sbt
+
+object StackTrace
+{
+	def isSbtClass(name: String) = name.startsWith("sbt") || name.startsWith("xsbt")
+	/**
+		* Return a printable representation of the stack trace associated
+		* with t.  Information about t and its Throwable causes is included.
+		* The number of lines to be included for each Throwable is configured
+		* via d which should be greater than or equal to zero.  If d is zero,
+		* then all elements are included up to (but not including) the first
+		* element that comes from sbt. If d is greater than zero, then up to
+		* that many lines are included, where the line for the Throwable is
+		* counted plus one line for each stack element.  Less lines will be
+		* included if there are not enough stack elements.
+		*/
+	def trimmed(t : Throwable, d : Int) : String = {
+		require(d >= 0)
+		val b = new StringBuilder ()
+
+		def appendStackTrace (t : Throwable, first : Boolean) {
+
+			val include : StackTraceElement => Boolean =
+				if (d == 0)
+					element => !isSbtClass(element.getClassName)
+				else {
+					var count = d - 1
+					(_ => { count -= 1; count >= 0 })
+				}
+
+			def appendElement (e : StackTraceElement) {
+				b.append ("\tat ")
+				b.append (e)
+				b.append ('\n')
+			}
+
+			if (!first)
+				b.append ("Caused by: ")
+			b.append (t)
+			b.append ('\n')
+
+			val els = t.getStackTrace ()
+			var i = 0
+			while ((i < els.size) && include (els (i))) {
+				appendElement (els (i))
+				i += 1
+			}
+
+		}
+
+		appendStackTrace (t, true)
+		var c = t
+		while (c.getCause () != null) {
+			c = c.getCause ()
+			appendStackTrace (c, false)
+		}
+		b.toString ()
+
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index b1d8404dc..54292a652 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008 Mark Harrah
+ * Copyright 2008, 2009, 2010 Mark Harrah
  */
 package sbt
 
@@ -82,9 +82,6 @@ private trait JettyRun
 }
 sealed trait JettyConfiguration extends NotNull
 {
-	def war: Path
-	def scanDirectories: Seq[File]
-	def scanInterval: Int
 	/** The classpath to get Jetty from. */
 	def jettyClasspath: PathFinder
 	def classpathName: String
@@ -92,6 +89,10 @@ sealed trait JettyConfiguration extends NotNull
 }
 trait DefaultJettyConfiguration extends JettyConfiguration
 {
+	def war: Path
+	def scanDirectories: Seq[File]
+	def scanInterval: Int
+
 	def contextPath: String
 	def port: Int
 	/** The classpath containing the classes, jars, and resources for the web application. */
@@ -129,7 +130,27 @@ private object LazyJettyRun extends JettyRun
 		Log.setLog(new JettyLogger(configuration.log))
 		val server = new Server
 
-		val listener =
+		def configureScanner(listener: Scanner.BulkListener, scanDirectories: Seq[File], scanInterval: Int) =
+		{
+			if(scanDirectories.isEmpty)
+				None
+			else
+			{
+				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
+				val scanner = new Scanner
+				val list = new java.util.ArrayList[File]
+				scanDirectories.foreach(x => list.add(x))
+				scanner.setScanDirs(list)
+				scanner.setRecursive(true)
+				scanner.setScanInterval(scanInterval)
+				scanner.setReportExistingFilesOnStartup(false)
+				scanner.addListener(listener)
+				scanner.start()
+				Some(new WeakReference(scanner))
+			}
+		}
+
+		val (listener, scanner) =
 			configuration match
 			{
 				case c: DefaultJettyConfiguration =>
@@ -144,43 +165,23 @@ private object LazyJettyRun extends JettyRun
 					setLoader()
 					server.setHandler(webapp)
 
-					Some(new Scanner.BulkListener with Reload {
+					val listener = new Scanner.BulkListener with Reload {
 						def reloadApp() = reload(server, setLoader(), log)
 						def filesChanged(files: java.util.List[_]) { reloadApp() }
-					})
+					}
+					(Some(listener), configureScanner(listener, c.scanDirectories, c.scanInterval))
 				case c: CustomJettyConfiguration =>
 					for(x <- c.jettyConfigurationXML)
 						(new XmlConfiguration(x.toString)).configure(server)
 					for(file <- c.jettyConfigurationFiles)
 						(new XmlConfiguration(file.toURI.toURL)).configure(server)
-					None
+					(None, None)
 			}
 
-		def configureScanner() =
-		{
-			val scanDirectories = configuration.scanDirectories
-			if(listener.isEmpty || scanDirectories.isEmpty)
-				None
-			else
-			{
-				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
-				val scanner = new Scanner
-				val list = new java.util.ArrayList[File]
-				scanDirectories.foreach(x => list.add(x))
-				scanner.setScanDirs(list)
-				scanner.setRecursive(true)
-				scanner.setScanInterval(configuration.scanInterval)
-				scanner.setReportExistingFilesOnStartup(false)
-				scanner.addListener(listener.get)
-				scanner.start()
-				Some(new WeakReference(scanner))
-			}
-		}
-
 		try
 		{
 			server.start()
-			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), configureScanner(), oldLog)
+			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), scanner, oldLog)
 		}
 		catch { case e => server.stop(); throw e }
 	}
diff --git a/src/sbt-test/run/console-project/changes/BlankProject.scala b/src/sbt-test/run/console-project/changes/BlankProject.scala
new file mode 100644
index 000000000..b18e9f09b
--- /dev/null
+++ b/src/sbt-test/run/console-project/changes/BlankProject.scala
@@ -0,0 +1,3 @@
+import sbt._
+
+class BlankProject(info: ProjectInfo) extends DefaultProject(info)
\ No newline at end of file

From ab9d92b8b449285cab8598432ff18d53470f94e8 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 15 Jan 2010 19:06:36 -0500
Subject: [PATCH 202/268] Replace Ivy interface with component from xsbt

---
 project/build.properties                      |   4 +-
 src/main/scala/sbt/BasicProjectTypes.scala    | 247 ++++---
 src/main/scala/sbt/BuilderProject.scala       |   2 +-
 src/main/scala/sbt/Compile.scala              |   2 +-
 src/main/scala/sbt/Credentials.scala          |  44 ++
 src/main/scala/sbt/Logger.scala               |   2 +-
 src/main/scala/sbt/ManageDependencies.scala   | 651 ------------------
 src/main/scala/sbt/ManagedInterface.scala     | 426 ------------
 src/main/scala/sbt/Project.scala              |   4 +-
 src/main/scala/sbt/impl/ConvertResolver.scala | 100 ---
 src/main/scala/sbt/impl/ManagedImpl.scala     |  71 --
 .../artifact/project/build/ArtifactTest.scala |   3 +-
 .../classifier/project/build/Test.scala       |   3 +-
 .../extra/changes/UseColor.scala              |   3 +-
 .../extra/project/build/DefineColor.scala     |   3 +-
 .../info/project/build/InfoTest.scala         |   3 +-
 .../inherit-repo/changes/CorrectProject.scala |   6 +-
 .../changes/CorrectProject2.scala             |   6 +-
 .../changes/CorrectProject3.scala             |   6 +-
 .../project/build/src/TestProject.scala       |   6 +-
 .../project/build/src/UpdateTestProject.scala |   3 +-
 .../project/build/TestProject.scala           |   1 +
 .../project/build/src/UpdateTestProject.scala |   1 +
 .../project/build/src/TestProject.scala       |   1 +
 .../module-confs/changes/WrongOrg.scala       |   5 +-
 .../module-confs/changes/WrongPattern.scala   |   5 +-
 .../module-confs/changes/WrongVersion.scala   |   5 +-
 .../module-confs/project/build/Test.scala     |   5 +-
 .../project/build/Test.scala                  |   3 +-
 .../project/build/MultiPublishTest.scala      |   3 +-
 30 files changed, 199 insertions(+), 1425 deletions(-)
 create mode 100644 src/main/scala/sbt/Credentials.scala
 delete mode 100644 src/main/scala/sbt/ManageDependencies.scala
 delete mode 100644 src/main/scala/sbt/ManagedInterface.scala
 delete mode 100644 src/main/scala/sbt/impl/ConvertResolver.scala
 delete mode 100644 src/main/scala/sbt/impl/ManagedImpl.scala

diff --git a/project/build.properties b/project/build.properties
index 66c6dd626..e5c1ce7f9 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,7 +1,5 @@
-#Project properties
-#Tue Dec 29 21:41:25 EST 2009
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.10-SNAPSHOT
+project.version=0.6.11-SNAPSHOT
 scala.version=2.7.7
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 12cfa6f54..581317951 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -53,107 +53,53 @@ trait UnmanagedClasspathProject extends ClasspathProject
 	def fullUnmanagedClasspath(config: Configuration): PathFinder
 }
 
-/** A project that provides automatic dependency management.*/
-trait ManagedProject extends ClasspathProject
+trait IvyTasks extends Project
 {
-	trait ManagedOption extends ActionOption
-	final class ManagedFlagOption extends ManagedOption
-	/** An update option that specifies that unneeded files should be pruned from the managed library directory
-	* after updating. */
-	final val Synchronize = new ManagedFlagOption
-	/** An update option that specifies that Ivy should validate configurations.*/
-	final val Validate = new ManagedFlagOption
-	/** An update option that puts Ivy into a quieter logging mode.*/
-	final val QuietUpdate = new ManagedFlagOption
-	/** An update option that adds the scala-tools.org releases repository to the set of resolvers, unless
-	* no inline repositories are present and an ivysettings.xml file is present.*/
-	final val AddScalaToolsReleases = new ManagedFlagOption
-	/** An update option that specifies that an error should be generated if no inline dependencies, resolvers,
-	* XML file, or Ivy or Maven configuration files are present.*/
-	final val ErrorIfNoConfiguration = new ManagedFlagOption
-	/** An update option that explicitly specifies the dependency manager to use.  This can be used to
-	* override the default precendence. */
-	final case class LibraryManager(m: Manager) extends ManagedOption
-	/** An update option that overrides the default Ivy cache location. */
-	final case class CacheDirectory(dir: Path) extends ManagedOption
-	final case class CheckScalaVersion(configs: Iterable[Configuration], checkExplicit: Boolean, filterImplicit: Boolean) extends ManagedOption
-
-	protected def withConfigurations(outputPattern: String, managedDependencyPath: Path, options: Seq[ManagedOption])
-		(doWith: (IvyConfiguration, UpdateConfiguration) => Option[String]) =
-	{
-		var synchronize = false
-		var validate = false
-		var quiet = false
-		var addScalaTools = false
-		var errorIfNoConfiguration = false
-		var manager: Manager = new AutoDetectManager(projectID)
-		var cacheDirectory: Option[Path] = None
-		var checkScalaVersion: Option[IvyScala] = None
-		for(option <- options)
-		{
-			option match
-			{
-				case Synchronize => synchronize = true
-				case Validate => validate = true
-				case LibraryManager(m) => manager = m
-				case QuietUpdate => quiet = true
-				case AddScalaToolsReleases => addScalaTools = true
-				case ErrorIfNoConfiguration => errorIfNoConfiguration = true
-				case CacheDirectory(dir) => cacheDirectory = Some(dir)
-				case CheckScalaVersion(configs, checkExplicit, filterImplicit) =>
-					checkScalaVersion = Some(new IvyScala(buildScalaVersion, configs, checkExplicit, filterImplicit))
-				case _ => log.warn("Ignored unknown managed option " + option)
-			}
-		}
-		val ivyPaths = new IvyPaths(info.projectPath, managedDependencyPath, cacheDirectory)
-		val ivyFlags = new IvyFlags(validate, addScalaTools, errorIfNoConfiguration)
-		val ivyConfiguration = new IvyConfiguration(ivyPaths, manager, ivyFlags, checkScalaVersion, log)
-		val updateConfiguration = new UpdateConfiguration(outputPattern, synchronize, quiet)
-		doWith(ivyConfiguration, updateConfiguration)
-	}
-	protected def withIvyTask(doTask: => Option[String]) =
+	def ivyTask(action: => Unit) =
 		task
 		{
-			try { doTask }
-			catch
-			{
-				case e: NoClassDefFoundError =>
+			try { action; None }
+			catch {
+				case e: Exception =>
 					log.trace(e)
-					Some("Apache Ivy is required for dependency management (" + e.toString + ")")
+					log.error(e.toString)
+					Some(e.toString)
 			}
 		}
-	def updateTask(outputPattern: String, managedDependencyPath: Path, options: ManagedOption*): Task =
-		updateTask(outputPattern, managedDependencyPath, options)
-	def updateTask(outputPattern: String, managedDependencyPath: Path, options: => Seq[ManagedOption]) =
-		withIvyTask(withConfigurations(outputPattern, managedDependencyPath, options)(ManageDependencies.update))
+	def updateTask(module: => IvySbt#Module, configuration: => UpdateConfiguration) =
+		ivyTask { IvyActions.update(module, configuration) }
 
-	def publishTask(publishConfiguration: => PublishConfiguration, options: => Seq[ManagedOption]) =
-		withIvyTask
+	def publishTask(module: => IvySbt#Module, publishConfiguration: => PublishConfiguration) =
+		ivyTask
 		{
 			val publishConfig = publishConfiguration
 			import publishConfig._
-			withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) =>
-				val delivered = if(publishIvy) Some(deliveredPattern) else None
-				ManageDependencies.publish(ivyConf, resolverName, srcArtifactPatterns, delivered, configurations) }
+			val deliveredIvy = if(publishIvy) Some(deliveredPattern) else None
+			IvyActions.publish(module, resolverName, srcArtifactPatterns, deliveredIvy, configurations)
 		}
-	def deliverTask(deliverConfiguration: => PublishConfiguration, options: => Seq[ManagedOption]) =
-		withIvyTask
+	def deliverTask(module: => IvySbt#Module, deliverConfiguration: => PublishConfiguration, quiet: Boolean) =
+		ivyTask
 		{
 			val deliverConfig = deliverConfiguration
 			import deliverConfig._
-			withConfigurations("", managedDependencyPath, options) { (ivyConf, updateConf) =>
-				ManageDependencies.deliver(ivyConf, updateConf, status, deliveredPattern, extraDependencies, configurations)
-			}
+			IvyActions.deliver(module, status, deliveredPattern, extraDependencies, configurations, quiet)
 		}
-	def makePomTask(output: => Path, extraDependencies: => Iterable[ModuleID], configurations: => Option[Iterable[Configuration]], options: => Seq[ManagedOption]) =
-		withIvyTask(withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) =>
-			ManageDependencies.makePom(ivyConf, extraDependencies, configurations, output.asFile) })
+	def makePomTask(module: => IvySbt#Module, output: => Path, extraDependencies: => Iterable[ModuleID], configurations: => Option[Iterable[Configuration]]) =
+		ivyTask { IvyActions.makePom(module, extraDependencies, configurations, output asFile) }
 
-	def cleanCacheTask(managedDependencyPath: Path, options: => Seq[ManagedOption]) =
-		withIvyTask(withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) => ManageDependencies.cleanCache(ivyConf) })
+	def installTask(module: IvySbt#Module, from: Resolver, to: Resolver) =
+		ivyTask { IvyActions.install(module, from.name, to.name) }
+		
+	def cleanCacheTask(ivySbt: => IvySbt) =
+		ivyTask { IvyActions.cleanCache(ivySbt) }
 
-	def cleanLibTask(managedDependencyPath: Path) = task { FileUtilities.clean(managedDependencyPath.get, log) }
+	def cleanLibTask(managedDependencyPath: Path) = 
+		task { FileUtilities.clean(managedDependencyPath.get, log) }
+}
 
+/** A project that provides automatic dependency management.*/
+trait ManagedProject extends ClasspathProject with IvyTasks
+{
 	/** This is the public ID of the project (used for publishing, for example) */
 	def moduleID: String = normalizedName + appendable(crossScalaVersionString)
 	/** This is the full public ID of the project (used for publishing, for example) */
@@ -224,10 +170,73 @@ import ManagedStyle.{Auto, Ivy, Maven, Value => ManagedType}
 trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject with BasicDependencyPaths
 {
 	import BasicManagedProject._
-	/** The dependency manager that represents inline declarations.  The default manager packages the information
-	* from 'ivyXML', 'projectID', 'repositories', and 'libraryDependencies' and does not typically need to be
-	* be overridden. */
-	def manager = new SimpleManager(ivyXML, true, projectID, repositories.toSeq, moduleConfigurations.toSeq, ivyConfigurations, defaultConfiguration, libraryDependencies.toList: _*)
+
+	def ivyUpdateConfiguration =  new UpdateConfiguration(managedDependencyPath.asFile, outputPattern, true/*sync*/, true/*quiet*/)
+
+	def ivyRepositories: Seq[Resolver] =
+	{
+		val repos = repositories.toSeq
+		if(repos.isEmpty) Nil else Resolver.withDefaultResolvers(repos)
+	}
+	def ivyValidate = true
+	def ivyScala: Option[IvyScala] = Some(new IvyScala(buildScalaVersion, checkScalaInConfigurations, checkExplicitScalaDependencies, filterScalaJars))
+	def ivyCacheDirectory: Option[Path] = None
+	
+	def ivyPaths: IvyPaths = new IvyPaths(info.projectPath.asFile, ivyCacheDirectory.map(_.asFile))
+	def inlineIvyConfiguration = new InlineIvyConfiguration(ivyPaths, ivyRepositories.toSeq, moduleConfigurations.toSeq, log)
+	def ivyConfiguration: IvyConfiguration =
+	{
+		val in = inlineIvyConfiguration
+		def parentIvyConfiguration(default: IvyConfiguration)(p: Project) = p match { case b: BasicManagedProject => b.ivyConfiguration; case _ => default }
+		if(in.resolvers.isEmpty)
+		{
+			 if(in.moduleConfigurations.isEmpty)
+			 {
+				IvyConfiguration(in.paths, in.log) match
+				{
+					case e: ExternalIvyConfiguration => e
+					case i => info.parent map(parentIvyConfiguration(i)) getOrElse(i)
+				}
+			}
+			else
+				new InlineIvyConfiguration(in.paths, Resolver.withDefaultResolvers(Nil), in.moduleConfigurations, in.log)
+		}
+		else
+			in
+	}
+	
+	def moduleSettings: ModuleSettings = defaultModuleSettings
+	def byIvyFile(path: Path): IvyFileConfiguration = new IvyFileConfiguration(path.asFile, ivyScala, ivyValidate)
+	def byPom(path: Path): PomConfiguration = new PomConfiguration(path.asFile, ivyScala, ivyValidate)
+	/** The settings that represent inline declarations.  The default settings combines the information
+	* from 'ivyXML', 'projectID', 'repositories', ivyConfigurations, defaultConfiguration,
+	* ivyScala, and 'libraryDependencies' and does not typically need to be be overridden. */
+	def inlineSettings = new InlineConfiguration(projectID, libraryDependencies, ivyXML, ivyConfigurations, defaultConfiguration, ivyScala, ivyValidate)
+	def defaultModuleSettings: ModuleSettings =
+	{
+		val in = inlineSettings
+		if(in.configurations.isEmpty)
+		{
+			if(in.dependencies.isEmpty && in.ivyXML.isEmpty && in.module.explicitArtifacts.isEmpty && in.configurations.isEmpty)
+				externalSettings
+			else if(useDefaultConfigurations)
+				in withConfigurations ( Configurations.defaultMavenConfigurations )
+			else
+				in
+		}
+		else
+			in
+	}
+	def externalSettings = ModuleSettings(ivyScala, ivyValidate, projectID)(info.projectPath.asFile, log)
+	
+	def ivySbt: IvySbt = new IvySbt(ivyConfiguration)
+	def ivyModule: IvySbt#Module = newIvyModule(moduleSettings)
+	def newIvyModule(moduleSettings: ModuleSettings): IvySbt#Module =
+	{
+		val i = ivySbt
+		new i.Module(moduleSettings)
+	}
+	
 
 	/** The pattern for Ivy to use when retrieving dependencies into the local project.  Classpath management
 	* depends on the first directory being [conf] and the extension being [ext].*/
@@ -235,8 +244,11 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	/** Override this to specify the publications, configurations, and/or dependencies sections of an Ivy file.
 	* See http://code.google.com/p/simple-build-tool/wiki/LibraryManagement for details.*/
 	def ivyXML: scala.xml.NodeSeq = scala.xml.NodeSeq.Empty
-	/** The base options passed to the 'update' action. */
-	def baseUpdateOptions = checkScalaVersion :: Validate :: Synchronize :: QuietUpdate :: AddScalaToolsReleases :: Nil
+	def expandedIvyConfigurations =
+	{
+		val confs = ivyConfigurations
+		if(confs.isEmpty) Configurations.defaultMavenConfigurations else confs
+	}
 	override def ivyConfigurations: Iterable[Configuration] =
 	{
 		val reflective = super.ivyConfigurations
@@ -271,20 +283,13 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 			case Auto => Resolver.defaultPatterns
 		}
 	}
-	/** The options provided to the 'update' action.  This is by default the options in 'baseUpdateOptions'.
-	* If 'manager' has any dependencies, resolvers, or inline Ivy XML (which by default happens when inline
-	* dependency management is used), it is passed as the dependency manager.*/
-	def updateOptions: Seq[ManagedOption] = baseUpdateOptions ++ managerOption
-	def managerOption: Seq[ManagedOption] =
-	{
-		val m = manager
-		if(m.dependencies.isEmpty && m.resolvers.isEmpty && ivyXML.isEmpty && m.module.explicitArtifacts.isEmpty && m.configurations.isEmpty)
-			Nil
-		else
-			LibraryManager(m) :: Nil
-	}
-	def deliverOptions: Seq[ManagedOption] = updateOptions.filter { case _: CheckScalaVersion => false; case _ => true }
-	def publishOptions: Seq[ManagedOption] = deliverOptions
+	
+	def updateModuleSettings = moduleSettings
+	def updateIvyModule = newIvyModule(updateModuleSettings)
+	def deliverModuleSettings = moduleSettings.noScala
+	def deliverIvyModule = newIvyModule(deliverModuleSettings)
+	def publishModuleSettings = deliverModuleSettings
+	def publishIvyModule = newIvyModule(publishModuleSettings)
 	/** True if the 'provided' configuration should be included on the 'compile' classpath.  The default value is true.*/
 	def includeProvidedWithCompile = true
 	/** True if the default implicit extensions should be used when determining classpaths.  The default value is true. */
@@ -304,7 +309,6 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		else
 			all
 	}
-	def checkScalaVersion = CheckScalaVersion(checkScalaInConfigurations, checkExplicitScalaDependencies, filterScalaJars)
 	def defaultPublishRepository: Option[Resolver] =
 	{
 		reflectiveRepositories.get("publish-to") orElse
@@ -336,9 +340,9 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		}
 	}
 
-	protected def updateAction = updateTask(outputPattern, managedDependencyPath, updateOptions) describedAs UpdateDescription
+	protected def updateAction = updateTask(updateIvyModule, ivyUpdateConfiguration) describedAs UpdateDescription
 	protected def cleanLibAction = cleanLibTask(managedDependencyPath) describedAs CleanLibDescription
-	protected def cleanCacheAction = cleanCacheTask(managedDependencyPath, updateOptions) describedAs CleanCacheDescription
+	protected def cleanCacheAction = cleanCacheTask(ivySbt) describedAs CleanCacheDescription
 
 	protected def deliverProjectDependencies: Iterable[ModuleID] =
 	{
@@ -349,19 +353,19 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		interDependencies.readOnly
 	}
 	protected def deliverScalaDependencies: Iterable[ModuleID] = Nil
-	protected def makePomAction = makePomTask(pomPath, deliverProjectDependencies, None, updateOptions)
-	protected def deliverLocalAction = deliverTask(publishLocalConfiguration, deliverOptions)
+	protected def makePomAction = makePomTask(deliverIvyModule, pomPath, deliverProjectDependencies, None)
+	protected def deliverLocalAction = deliverTask(deliverIvyModule, publishLocalConfiguration, true /*quiet*/)
 	protected def publishLocalAction =
 	{
 		val dependencies = deliverLocal :: publishPomDepends
-		publishTask(publishLocalConfiguration, publishOptions) dependsOn(dependencies : _*)
+		publishTask(publishIvyModule, publishLocalConfiguration) dependsOn(dependencies : _*)
 	}
 	protected def publishLocalConfiguration = new DefaultPublishConfiguration("local", "release", true)
-	protected def deliverAction = deliverTask(publishConfiguration, deliverOptions)
+	protected def deliverAction = deliverTask(deliverIvyModule, publishConfiguration, true)
 	protected def publishAction =
 	{
 		val dependencies = deliver :: publishPomDepends
-		publishTask(publishConfiguration, publishOptions) dependsOn(dependencies : _*)
+		publishTask(publishIvyModule, publishConfiguration) dependsOn(dependencies : _*)
 	}
 	private def publishPomDepends = if(managedStyle == Maven) makePom :: Nil else Nil
 	protected def publishConfiguration =
@@ -425,19 +429,12 @@ class DefaultInstallProject(val info: ProjectInfo) extends InstallProject with M
 }
 trait InstallProject extends BasicManagedProject
 {
-	def installOptions: Seq[ManagedOption] = updateOptions
-	override def filterScalaJars = false
-	override def checkExplicitScalaDependencies = false
-	lazy val install = installTask(updateOptions)
-	def installTask(options: => Seq[ManagedOption]) =
-		withIvyTask
-		{
-			withConfigurations("", managedDependencyPath, options) { (ivyConf, ignore) =>
-				val toResolver = reflectiveRepositories.get("publish-to").getOrElse(error("No repository to publish to was specified"))
-				val fromResolver = reflectiveRepositories.get("retrieve-from").getOrElse(error("No repository to retrieve from was specified"))
-				ManageDependencies.install(ivyConf, fromResolver.name, toResolver.name, true, true)
-			}
-		}
+	def installModuleSettings: ModuleSettings = moduleSettings.noScala
+	def installIvyModule: IvySbt#Module = newIvyModule(installModuleSettings)
+	
+	lazy val install = installTask(installIvyModule, fromResolver, toResolver)
+	def toResolver = reflectiveRepositories.get("publish-to").getOrElse(error("No repository to publish to was specified"))
+	def fromResolver = reflectiveRepositories.get("retrieve-from").getOrElse(error("No repository to retrieve from was specified"))
 }
 
 trait BasicDependencyPaths extends ManagedProject
@@ -538,7 +535,7 @@ trait ReflectiveProject extends ReflectiveModules with ReflectiveTasks with Refl
 /** This Project subclass is used to contain other projects as dependencies.*/
 class ParentProject(val info: ProjectInfo) extends BasicDependencyProject
 {
-	override def managerOption: Seq[ManagedOption] = LibraryManager(new AutoDetectManager(projectID, false)) :: Nil
+	override def moduleSettings = externalSettings
 	def dependencies: Iterable[Project] = info.dependencies ++ subProjects.values.toList
 	/** The directories to which a project writes are listed here and is used
 	* to check a project and its dependencies for collisions.*/
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index 611180c40..dff01c173 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -57,7 +57,7 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 
 	def tpe: String
 
-		import xsbt.{ComponentManager, ScalaInstance}
+		import xsbt.ScalaInstance
 
 	val definitionCompileConditional = new BuilderCompileConditional(definitionCompileConfiguration, buildCompiler, tpe)
 	final class BuilderCompileConditional(config: BuilderCompileConfiguration, compiler: xsbt.AnalyzingCompiler, tpe: String) extends AbstractCompileConditional(config, compiler)
diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index ec8f44617..bf65dded7 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -4,7 +4,7 @@
 package sbt
 
 import java.io.File
-import xsbt.{AnalyzingCompiler, CompileFailed, CompilerArguments, ComponentManager, ScalaInstance}
+import xsbt.{AnalyzingCompiler, CompileFailed, CompilerArguments, ScalaInstance}
 
 object CompileOrder extends Enumeration
 {
diff --git a/src/main/scala/sbt/Credentials.scala b/src/main/scala/sbt/Credentials.scala
new file mode 100644
index 000000000..f258296c3
--- /dev/null
+++ b/src/main/scala/sbt/Credentials.scala
@@ -0,0 +1,44 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009 Mark Harrah
+ */
+package sbt
+
+import java.io.File
+import org.apache.ivy.util.url.CredentialsStore
+
+object Credentials
+{
+	/** Add the provided credentials to Ivy's credentials cache.*/
+	def add(realm: String, host: String, userName: String, passwd: String): Unit =
+		CredentialsStore.INSTANCE.addCredentials(realm, host, userName, passwd)
+	/** Load credentials from the given file into Ivy's credentials cache.*/
+	def apply(file: String, log: Logger): Unit = apply(Path.fromFile(file), log)
+	/** Load credentials from the given file into Ivy's credentials cache.*/
+	def apply(file: File, log: Logger): Unit = apply(Path.fromFile(file), log)
+	/** Load credentials from the given file into Ivy's credentials cache.*/
+	def apply(path: Path, log: Logger)
+	{
+		val msg =
+			if(path.exists)
+			{
+				val properties = new scala.collection.mutable.HashMap[String, String]
+				def get(keys: List[String]) = keys.flatMap(properties.get).firstOption.toRight(keys.head + " not specified in credentials file: " + path)
+
+					impl.MapUtilities.read(properties, path, log) orElse
+					{
+						List.separate( List(RealmKeys, HostKeys, UserKeys, PasswordKeys).map(get) ) match
+						{
+							case (Nil, List(realm, host, user, pass)) => add(realm, host, user, pass); None
+							case (errors, _) => Some(errors.mkString("\n"))
+						}
+					}
+			}
+			else
+				Some("Credentials file " + path + " does not exist")
+		msg.foreach(x => log.warn(x))
+	}
+	private[this] val RealmKeys = List("realm")
+	private[this] val HostKeys = List("host", "hostname")
+	private[this] val UserKeys = List("user", "user.name", "username")
+	private[this] val PasswordKeys = List("password", "pwd", "pass", "passwd")
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Logger.scala b/src/main/scala/sbt/Logger.scala
index 86e014125..b71f4b650 100644
--- a/src/main/scala/sbt/Logger.scala
+++ b/src/main/scala/sbt/Logger.scala
@@ -18,7 +18,7 @@ object ControlEvent extends Enumeration
 	val Start, Header, Finish = Value
 }
 
-abstract class Logger extends xsbt.CompileLogger with xsbt.IvyLogger
+abstract class Logger extends xsbt.CompileLogger with IvyLogger
 {
 	def getLevel: Level.Value
 	def setLevel(newLevel: Level.Value)
diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala
deleted file mode 100644
index adfb6f208..000000000
--- a/src/main/scala/sbt/ManageDependencies.scala
+++ /dev/null
@@ -1,651 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
- */
-package sbt
-
-import java.io.File
-import java.net.URL
-import java.util.Collections
-import scala.collection.mutable.HashSet
-
-import Artifact.{defaultExtension, defaultType}
-
-import org.apache.ivy.{core, plugins, util, Ivy}
-import core.{IvyPatternHelper, LogOptions}
-import core.cache.DefaultRepositoryCacheManager
-import core.deliver.DeliverOptions
-import core.install.InstallOptions
-import core.module.descriptor.{DefaultArtifact, DefaultDependencyArtifactDescriptor, MDArtifact}
-import core.module.descriptor.{DefaultDependencyDescriptor, DefaultModuleDescriptor, DependencyDescriptor, ModuleDescriptor}
-import core.module.descriptor.{DefaultExcludeRule, ExcludeRule}
-import core.module.id.{ArtifactId,ModuleId, ModuleRevisionId}
-import core.publish.PublishOptions
-import core.resolve.ResolveOptions
-import core.retrieve.RetrieveOptions
-import core.settings.IvySettings
-import plugins.matcher.{ExactPatternMatcher, PatternMatcher}
-import plugins.parser.m2.{PomModuleDescriptorParser,PomModuleDescriptorWriter}
-import plugins.parser.xml.XmlModuleDescriptorParser
-import plugins.repository.{BasicResource, Resource}
-import plugins.repository.url.URLResource
-import plugins.resolver.ChainResolver
-import util.Message
-
-final class IvyScala(val scalaVersion: String, val configurations: Iterable[Configuration], val checkExplicit: Boolean, val filterImplicit: Boolean) extends NotNull
-final class IvyPaths(val projectDirectory: Path, val managedLibDirectory: Path, val cacheDirectory: Option[Path]) extends NotNull
-final class IvyFlags(val validate: Boolean, val addScalaTools: Boolean, val errorIfNoConfiguration: Boolean) extends NotNull
-final class IvyConfiguration(val paths: IvyPaths, val manager: Manager, val flags: IvyFlags, val ivyScala: Option[IvyScala], val log: Logger) extends NotNull
-final class UpdateConfiguration(val outputPattern: String, val synchronize: Boolean, val quiet: Boolean) extends NotNull
-object ScalaArtifacts
-{
-	val Organization = "org.scala-lang"
-	val LibraryID = "scala-library"
-	val CompilerID = "scala-compiler"
-}
-object ManageDependencies
-{
-	val DefaultIvyConfigFilename = "ivysettings.xml"
-	val DefaultIvyFilename = "ivy.xml"
-	val DefaultMavenFilename = "pom.xml"
-
-	private def defaultIvyFile(project: Path) = project / DefaultIvyFilename
-	private def defaultIvyConfiguration(project: File) = new File(project, DefaultIvyConfigFilename)
-	private def defaultPOM(project: Path) = project / DefaultMavenFilename
-
-	/** Configures Ivy using the provided configuration 'config' and calls 'doWithIvy'.  This method takes care of setting up and cleaning up Ivy.*/
-	private def withIvy(config: IvyConfiguration)(doWithIvy: (Ivy, ModuleDescriptor, String) => Option[String]) =
-		withIvyValue(config)( (ivy, module, default) => doWithIvy(ivy, module, default).toLeft(()) ).left.toOption
-	/** Configures Ivy using the provided configuration 'config' and calls 'doWithIvy'.  This method takes care of setting up and cleaning up Ivy.*/
-	private def withIvyValue[T](config: IvyConfiguration)(doWithIvy: (Ivy, ModuleDescriptor, String) => Either[String, T]) =
-	{
-		import config._
-		log.debug("\nwithIvyValue...\n")
-		val logger = new IvyLogger(log)
-		val originalLogger = Message.getDefaultLogger
-		Message.setDefaultLogger(logger)
-		log.debug("\nSet default logger...\n")
-		val settings = new IvySettings
-		settings.setBaseDir(paths.projectDirectory.asFile)
-		log.debug("\nCreated settings...\n")
-
-		/** Parses the given Maven pom 'pomFile'.*/
-		def readPom(pomFile: File) =
-			Control.trap("Could not read pom: ", log)
-				{ Right((PomModuleDescriptorParser.getInstance.parseDescriptor(settings, toURL(pomFile), flags.validate)), "compile") }
-		/** Parses the given Ivy file 'ivyFile'.*/
-		def readIvyFile(ivyFile: File) =
-			Control.trap("Could not read Ivy file: ", log)
-			{
-				val url = toURL(ivyFile)
-				val parser = new CustomXmlParser.CustomParser(settings, None)
-				parser.setValidate(flags.validate)
-				parser.setSource(url)
-				parser.parse()
-				Right((parser.getModuleDescriptor(), parser.getDefaultConf))
-			}
-		/** Parses the given in-memory Ivy file 'xml', using the existing 'moduleID' and specifying the given 'defaultConfiguration'. */
-		def parseXMLDependencies(xml: scala.xml.NodeSeq, moduleID: DefaultModuleDescriptor, defaultConfiguration: String) =
-			parseDependencies(xml.toString, moduleID, defaultConfiguration)
-		/** Parses the given in-memory Ivy file 'xml', using the existing 'moduleID' and specifying the given 'defaultConfiguration'. */
-		def parseDependencies(xml: String, moduleID: DefaultModuleDescriptor, defaultConfiguration: String): Either[String, CustomXmlParser.CustomParser] =
-			Control.trap("Could not read dependencies: ", log)
-			{
-				val parser = new CustomXmlParser.CustomParser(settings, Some(defaultConfiguration))
-				parser.setMd(moduleID)
-				parser.setValidate(flags.validate)
-				val resource = new ByteResource(xml.getBytes)
-				parser.setInput(resource.openStream)
-				parser.setResource(resource)
-				parser.parse()
-				Right(parser)
-			}
-		/** Configures Ivy using the specified Ivy configuration file.  This method is used when the manager is explicitly requested to be MavenManager or
-		* IvyManager.  If a file is not specified, Ivy is configured with defaults.*/
-		def configure(configFile: Option[Path])
-		{
-			configFile match
-			{
-				case Some(path) => settings.load(path.asFile)
-				case None => configureDefaults(defaultResolvers)
-			}
-		}
-		def defaultResolvers: Seq[Resolver] = withDefaultResolvers(Nil)
-		def withDefaultResolvers(user: Seq[Resolver]): Seq[Resolver] =
-			Seq(Resolver.defaultLocal) ++
-			user ++
-			Seq(DefaultMavenRepository) ++
-			(if(flags.addScalaTools) Seq(ScalaToolsReleases) else Nil)
-
-		/** Configures Ivy using defaults.  This is done when no ivy-settings.xml exists. */
-		def configureDefaults(resolvers: Seq[Resolver])
-		{
-			configureCache(settings, paths.cacheDirectory)
-			setResolvers(settings, resolvers, log)
-		}
-		/** Called to configure Ivy when the configured dependency manager is SbtManager and inline configuration is specified or if the manager
-		* is AutodetectManager.  It will configure Ivy with an 'ivy-settings.xml' file if there is one, or configure the defaults and add scala-tools as
-		* a repository otherwise.*/
-		def autodetectConfiguration()
-		{
-			log.debug("Autodetecting configuration.")
-			def autodetect(dir: File): Boolean =
-				(dir != null) &&
-				{
-					val defaultIvyConfigFile = defaultIvyConfiguration(dir)
-					if(defaultIvyConfigFile.canRead)
-					{
-						settings.load(defaultIvyConfigFile)
-						true
-					}
-					else
-						autodetect(dir.getParentFile)
-				}
-			if(!autodetect(paths.projectDirectory.asFile))
-				configureDefaults(defaultResolvers)
-		}
-		/** Called to determine dependencies when the dependency manager is SbtManager and no inline dependencies (Scala or XML) are defined
-		* or if the manager is AutodetectManager.  It will try to read from pom.xml first and then ivy.xml if pom.xml is not found.  If neither is found,
-		* Ivy is configured with defaults unless IvyFlags.errorIfNoConfiguration is true, in which case an error is generated.*/
-		def autodetectDependencies(module: ModuleRevisionId, defaultArtifact: Boolean) =
-		{
-			log.debug("Autodetecting dependencies.")
-			val defaultPOMFile = defaultPOM(paths.projectDirectory).asFile
-			if(defaultPOMFile.canRead)
-				readPom(defaultPOMFile)
-			else
-			{
-				val defaultIvy = defaultIvyFile(paths.projectDirectory).asFile
-				if(defaultIvy.canRead)
-					readIvyFile(defaultIvy)
-				else if(flags.errorIfNoConfiguration)
-					Left("No readable dependency configuration found.  Need " + DefaultIvyFilename + " or " + DefaultMavenFilename)
-				else
-				{
-					val defaultConf = ModuleDescriptor.DEFAULT_CONFIGURATION
-					log.warn("No readable dependency configuration found, using defaults.")
-					val moduleID = new DefaultModuleDescriptor(module, "release", null, false)
-					moduleID.setLastModified(System.currentTimeMillis)
-					moduleID.addConfiguration(toIvyConfiguration(Configurations.Default))
-					addMainArtifact(moduleID)
-					if(defaultArtifact)
-						addDefaultArtifact(defaultConf, moduleID)
-					Right((moduleID, defaultConf))
-				}
-			}
-		}
-		/** Creates an Ivy module descriptor according the manager configured.  The default configuration for dependencies
-		* is also returned.*/
-		def moduleDescriptor: Either[String, (ModuleDescriptor, String)] =
-			config.manager match
-			{
-				case mm: MavenManager =>
-				{
-					log.debug("Maven configuration explicitly requested.")
-					configure(mm.configuration)
-					readPom(mm.pom.asFile)
-				}
-				case im: IvyManager =>
-				{
-					log.debug("Ivy configuration explicitly requested.")
-					configure(im.configuration)
-					readIvyFile(im.dependencies.asFile)
-				}
-				case adm: AutoDetectManager =>
-				{
-					log.debug("No dependency manager explicitly specified.")
-					autodetectConfiguration()
-					autodetectDependencies(toID(adm.module), adm.defaultArtifact)
-				}
-				case sm: SbtManager =>
-				{
-					import sm._
-					if(resolvers.isEmpty && moduleConfigurations.isEmpty && autodetectUnspecified)
-						autodetectConfiguration()
-					else
-					{
-						log.debug("Using inline repositories.")
-						configureDefaults(withDefaultResolvers(resolvers))
-						setModuleConfigurations(settings, moduleConfigurations)
-					}
-					if(autodetect)
-						autodetectDependencies(toID(module), true)
-					else
-					{
-						val moduleID =
-							{
-								val mod = new DefaultModuleDescriptor(toID(module), "release", null, false)
-								mod.setLastModified(System.currentTimeMillis)
-								configurations.foreach(config => mod.addConfiguration(toIvyConfiguration(config)))
-								mod
-							}
-						val defaultConf = defaultConfiguration getOrElse Configurations.config(ModuleDescriptor.DEFAULT_CONFIGURATION)
-						log.debug("Using inline dependencies specified in Scala" + (if(dependenciesXML.isEmpty) "." else " and XML."))
-						for(parser <- parseXMLDependencies(wrapped(module, dependenciesXML), moduleID, defaultConf.name).right) yield
-						{
-							addArtifacts(moduleID, module.explicitArtifacts)
-							addDependencies(moduleID, dependencies, parser)
-							addMainArtifact(moduleID)
-							(moduleID, parser.getDefaultConf)
-						}
-					}
-				}
-			}
-		/** Creates a full ivy file for 'module' using the 'dependencies' XML as the part after the &lt;info&gt;...&lt;/info&gt; section. */
-		def wrapped(module: ModuleID, dependencies: scala.xml.NodeSeq) =
-		{
-			import module._
-			<ivy-module version="2.0">
-				{ if(hasInfo(dependencies))
-					scala.xml.NodeSeq.Empty
-				else
-					<info organisation={organization} module={name} revision={revision}/>
-				}
-				{dependencies}
-			</ivy-module>
-		}
-		def hasInfo(x: scala.xml.NodeSeq) = !(<g>{x}</g> \ "info").isEmpty
-		/** Performs checks/adds filters on Scala dependencies (if enabled in IvyScala). */
-		def checkModule(moduleAndConf: (ModuleDescriptor, String)): Either[String, (ModuleDescriptor, String)] =
-			ivyScala match
-			{
-				case Some(check) =>
-					val (module, conf) = moduleAndConf
-					val explicitCheck =
-						if(check.checkExplicit)
-						{
-							log.debug("Checking explicit Scala dependencies")
-							checkDependencies(module, check.scalaVersion, check.configurations)
-						}
-						else
-							None
-					explicitCheck match
-					{
-						case None =>
-							if(check.filterImplicit)
-							{
-								log.debug("Filtering transitive Scala dependencies")
-								val asDefault = toDefaultModuleDescriptor(module)
-								excludeScalaJars(asDefault, check.configurations, config.log)
-								Right( (asDefault, conf) )
-							}
-							else
-								Right(moduleAndConf)
-						case Some(err) => Left(err)
-					}
-				case None =>
-					log.debug("Not checking Scala dependencies")
-					Right(moduleAndConf)
-			}
-
-		this.synchronized // Ivy is not thread-safe.  In particular, it uses a static DocumentBuilder, which is not thread-safe
-		{
-			val ivy = Ivy.newInstance(settings)
-			ivy.getLoggerEngine.pushLogger(logger)
-			ivy.pushContext()
-			try
-			{
-				moduleDescriptor.right.flatMap(checkModule).right.flatMap { case (md, conf) =>
-					addExtraNamespaces(toDefaultModuleDescriptor(md))
-					doWithIvy(ivy, md, conf)
-				}
-			}
-			finally
-			{
-				ivy.popContext()
-				Message.setDefaultLogger(originalLogger)
-			}
-		}
-	}
-	private def addExtraNamespaces(md: DefaultModuleDescriptor): Unit =
-		md.getExtraAttributesNamespaces.asInstanceOf[java.util.Map[String,String]].put("e", "http://ant.apache.org/ivy/extra")
-	/** Checks the immediate dependencies of module for dependencies on scala jars and verifies that the version on the
-	* dependencies matches scalaVersion. */
-	private def checkDependencies(module: ModuleDescriptor, scalaVersion: String, configurations: Iterable[Configuration]): Option[String] =
-	{
-		val configSet = configurationSet(configurations)
-		Control.lazyFold(module.getDependencies.toList)
-		{ dep =>
-			val id = dep.getDependencyRevisionId
-			if(id.getOrganisation == ScalaArtifacts.Organization && id.getRevision != scalaVersion && dep.getModuleConfigurations.exists(configSet.contains))
-				Some("Different Scala version specified in dependency ("+ id.getRevision + ") than in project (" + scalaVersion + ").")
-			else
-				None
-		}
-	}
-	private def configurationSet(configurations: Iterable[Configuration]) =
-		HashSet(configurations.map(_.toString).toSeq : _*)
-	/** Adds exclusions for the scala library and compiler jars so that they are not downloaded.  This is
-	* done because normally these jars are already on the classpath and cannot/should not be overridden.  The version
-	* of Scala to use is done by setting scala.version in the project definition. */
-	private def excludeScalaJars(module: DefaultModuleDescriptor, configurations: Iterable[Configuration], log: Logger)
-	{
-		val configurationNames =
-		{
-			val names = module.getConfigurationsNames
-			if(configurations.isEmpty)
-				names
-			else
-			{
-				import scala.collection.mutable.HashSet
-				val configSet = configurationSet(configurations)
-				configSet.intersect(HashSet(names : _*))
-				configSet.toArray
-			}
-		}
-		def excludeScalaJar(name: String): Unit =
-			module.addExcludeRule(excludeRule(ScalaArtifacts.Organization, name, configurationNames, log))
-		excludeScalaJar(ScalaArtifacts.LibraryID)
-		excludeScalaJar(ScalaArtifacts.CompilerID)
-	}
-	private def configureCache(settings: IvySettings, dir: Option[Path])
-	{
-		val cacheDir = dir.map(_.asFile).getOrElse(settings.getDefaultRepositoryCacheBasedir())
-		val manager = new DefaultRepositoryCacheManager("default-cache", settings, cacheDir)
-		manager.setUseOrigin(true)
-		manager.setChangingMatcher(PatternMatcher.REGEXP);
-		manager.setChangingPattern(".*-SNAPSHOT");
-		settings.setDefaultRepositoryCacheManager(manager)
-		dir.foreach(dir => settings.setDefaultResolutionCacheBasedir(dir.absolutePath))
-	}
-	/** Creates an ExcludeRule that excludes artifacts with the given module organization and name for
-	* the given configurations. */
-	private def excludeRule(organization: String, name: String, configurationNames: Iterable[String], log: Logger): ExcludeRule =
-	{
-		val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*")
-		log.debug("Excluding " + artifact + " in " + configurationNames.mkString(", "))
-		val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, Collections.emptyMap[AnyRef,AnyRef])
-		configurationNames.foreach(rule.addConfiguration)
-		rule
-	}
-	/** Clears the Ivy cache, as configured by 'config'. */
-	def cleanCache(config: IvyConfiguration) =
-	{
-		def doClean(ivy: Ivy, module: ModuleDescriptor, default: String) =
-			Control.trapUnit("Could not clean cache: ", config.log)
-				{ ivy.getSettings.getRepositoryCacheManagers.foreach(_.clean()); None }
-
-		withIvy(config)(doClean)
-	}
-	/** Creates a Maven pom from the given Ivy configuration*/
-	def makePom(config: IvyConfiguration, extraDependencies: Iterable[ModuleID], configurations: Option[Iterable[Configuration]], output: File) =
-	{
-		def doMakePom(ivy: Ivy, md: ModuleDescriptor, default: String) =
-			Control.trapUnit("Could not make pom: ", config.log)
-			{
-				val module = addLateDependencies(ivy, md, default, extraDependencies)
-				val pomModule = keepConfigurations(module, configurations)
-				PomModuleDescriptorWriter.write(pomModule, DefaultConfigurationMapping, output)
-				config.log.info("Wrote " + output.getAbsolutePath)
-				None
-			}
-		withIvy(config)(doMakePom)
-	}
-	private def addDefaultArtifact(defaultConf: String, moduleID: DefaultModuleDescriptor) =
-		moduleID.addArtifact(defaultConf, new MDArtifact(moduleID, moduleID.getModuleRevisionId.getName, defaultType, defaultExtension))
-	// todo: correct default configuration for extra dependencies
-	private def addLateDependencies(ivy: Ivy, md: ModuleDescriptor, defaultConfiguration: String, extraDependencies: Iterable[ModuleID]) =
-	{
-		val module = toDefaultModuleDescriptor(md)
-		val parser = new CustomXmlParser.CustomParser(ivy.getSettings, Some(defaultConfiguration))
-		parser.setMd(module)
-		addDependencies(module, extraDependencies, parser)
-		module
-	}
-	private def getConfigurations(module: ModuleDescriptor, configurations: Option[Iterable[Configuration]]) =
-		configurations match
-		{
-			case Some(confs) => confs.map(_.name).toList.toArray
-			case None => module.getPublicConfigurationsNames
-		}
-	/** Retain dependencies only with the configurations given, or all public configurations of `module` if `configurations` is None.
-	* This is currently only preserves the information required by makePom*/
-	private def keepConfigurations(module: ModuleDescriptor, configurations: Option[Iterable[Configuration]]): ModuleDescriptor =
-	{
-		val keepConfigurations = getConfigurations(module, configurations)
-		val keepSet = Set(keepConfigurations.toSeq : _*)
-		def translate(dependency: DependencyDescriptor) =
-		{
-			val keep = dependency.getModuleConfigurations.filter(keepSet.contains)
-			if(keep.isEmpty)
-				None
-			else // TODO: translate the dependency to contain only configurations to keep
-				Some(dependency)
-		}
-		val newModule = new DefaultModuleDescriptor(module.getModuleRevisionId, "", null)
-		newModule.setHomePage(module.getHomePage)
-		for(dependency <- module.getDependencies; translated <- translate(dependency))
-			newModule.addDependency(translated)
-		newModule
-	}
-	def install(ivyConfig: IvyConfiguration, from: String, to: String, validate: Boolean, overwrite: Boolean) =
-	{
-		def doInstall(ivy: Ivy, md: ModuleDescriptor, default: String) =
-			Control.trapUnit("Could not install: ", ivyConfig.log)
-			{
-				for(dependency <- md.getDependencies)
-				{
-					ivyConfig.log.info("Installing " + dependency)
-					val options = new InstallOptions
-					options.setOverwrite(overwrite)
-					options.setValidate(validate)
-					options.setTransitive(dependency.isTransitive)
-					ivy.install(dependency.getDependencyRevisionId, from, to, options)
-				}
-				None
-			}
-		withIvy(ivyConfig)(doInstall)
-	}
-	def deliver(ivyConfig: IvyConfiguration, updateConfig: UpdateConfiguration, status: String, deliverIvyPattern: String, extraDependencies: Iterable[ModuleID], configurations: Option[Iterable[Configuration]]) =
-	{
-		def doDeliver(ivy: Ivy, md: ModuleDescriptor, default: String) =
-			Control.trapUnit("Could not deliver: ", ivyConfig.log)
-			{
-				val module = addLateDependencies(ivy, md, default, extraDependencies)
-				resolve(ivy, updateConfig, module) orElse // todo: set download = false for resolve
-				{
-					val revID = module.getModuleRevisionId
-					val options = DeliverOptions.newInstance(ivy.getSettings).setStatus(status)
-					options.setConfs(getConfigurations(module, configurations))
-
-					ivy.deliver(revID, revID.getRevision, deliverIvyPattern, options)
-					None
-				}
-			}
-		withIvy(ivyConfig)(doDeliver)
-	}
-	// todo: map configurations, extra dependencies
-	def publish(ivyConfig: IvyConfiguration, resolverName: String, srcArtifactPatterns: Iterable[String], deliveredIvyPattern: Option[String], configurations: Option[Iterable[Configuration]]) =
-	{
-		def doPublish(ivy: Ivy, md: ModuleDescriptor, default: String) =
-			Control.trapUnit("Could not publish: ", ivyConfig.log)
-			{
-				val revID = md.getModuleRevisionId
-				val patterns = new java.util.ArrayList[String]
-				srcArtifactPatterns.foreach(pattern => patterns.add(pattern))
-				val options = (new PublishOptions).setOverwrite(true)
-				deliveredIvyPattern.foreach(options.setSrcIvyPattern)
-				options.setConfs(getConfigurations(md, configurations))
-				ivy.publish(revID, patterns, resolverName, options)
-				None
-			}
-		withIvy(ivyConfig)(doPublish)
-	}
-	/** Resolves and retrieves dependencies.  'ivyConfig' is used to produce an Ivy file and configuration.
-	* 'updateConfig' configures the actual resolution and retrieval process. */
-	def update(ivyConfig: IvyConfiguration, updateConfig: UpdateConfiguration) =
-	{
-		def processModule(ivy: Ivy, module: ModuleDescriptor, default: String) =
-		{
-			import updateConfig._
-			Control.trapUnit("Could not process dependencies: ", ivyConfig.log)
-			{
-				resolve(ivy, updateConfig, module) orElse
-				{
-					val retrieveOptions = new RetrieveOptions
-					retrieveOptions.setSync(synchronize)
-					val patternBase = ivyConfig.paths.managedLibDirectory.absolutePath
-					val pattern =
-						if(patternBase.endsWith(File.separator))
-							patternBase + outputPattern
-						else
-							patternBase + File.separatorChar + outputPattern
-					ivy.retrieve(module.getModuleRevisionId, pattern, retrieveOptions)
-					None
-				}
-			}
-		}
-
-		withIvy(ivyConfig)(processModule)
-	}
-	private def resolve(ivy: Ivy, updateConfig: UpdateConfiguration, module: ModuleDescriptor) =
-	{
-		import updateConfig._
-		val resolveOptions = new ResolveOptions
-		if(quiet)
-			resolveOptions.setLog(LogOptions.LOG_DOWNLOAD_ONLY)
-		val resolveReport = ivy.resolve(module, resolveOptions)
-		if(resolveReport.hasError)
-			Some(Set(resolveReport.getAllProblemMessages.toArray: _*).mkString(System.getProperty("line.separator")))
-		else
-			None
-	}
-	/** This method is used to add inline dependencies to the provided module. */
-	private def addDependencies(moduleID: DefaultModuleDescriptor, dependencies: Iterable[ModuleID], parser: CustomXmlParser.CustomParser)
-	{
-		for(dependency <- dependencies)
-		{
-			val dependencyDescriptor = new DefaultDependencyDescriptor(moduleID, toID(dependency), false, dependency.isChanging, dependency.isTransitive)
-			dependency.configurations match
-			{
-				case None => // The configuration for this dependency was not explicitly specified, so use the default
-					parser.parseDepsConfs(parser.getDefaultConf, dependencyDescriptor)
-				case Some(confs) => // The configuration mapping (looks like: test->default) was specified for this dependency
-					parser.parseDepsConfs(confs, dependencyDescriptor)
-			}
-			for(artifact <- dependency.explicitArtifacts)
-			{
-				import artifact.{name, classifier, `type`, extension, url}
-				val extraMap = extra(artifact)
-				val ivyArtifact = new DefaultDependencyArtifactDescriptor(dependencyDescriptor, name, `type`, extension, url.getOrElse(null), extraMap)
-				for(conf <- dependencyDescriptor.getModuleConfigurations)
-					dependencyDescriptor.addDependencyArtifact(conf, ivyArtifact)
-			}
-			moduleID.addDependency(dependencyDescriptor)
-		}
-	}
-	private def addArtifacts(moduleID: DefaultModuleDescriptor, artifacts: Iterable[Artifact])
-	{
-		val allConfigurations = moduleID.getPublicConfigurationsNames.toSeq
-		for(artifact <- artifacts)
-		{
-			val configurationStrings =
-			{
-				val artifactConfigurations = artifact.configurations
-				if(artifactConfigurations.isEmpty)
-					allConfigurations
-				else
-					artifactConfigurations.map(_.name)
-			}
-			val ivyArtifact = toIvyArtifact(moduleID, artifact, configurationStrings)
-			configurationStrings.foreach(configuration => moduleID.addArtifact(configuration, ivyArtifact))
-		}
-	}
-	private def extra(artifact: Artifact) =
-	{
-		val ea = artifact.classifier match { case Some(c) => artifact.extra("e:classifier" -> c); case None => artifact }
-		javaMap(ea.extraAttributes)
-	}
-	private def javaMap(map: Map[String,String]) = if(map.isEmpty) null else wrap.Wrappers.javaMap(map.toSeq : _*)
-	private def toURL(file: File) = file.toURI.toURL
-	/** Adds the ivy.xml main artifact. */
-	private def addMainArtifact(moduleID: DefaultModuleDescriptor)
-	{
-		val artifact = DefaultArtifact.newIvyArtifact(moduleID.getResolvedModuleRevisionId, moduleID.getPublicationDate)
-		moduleID.setModuleArtifact(artifact)
-		moduleID.check()
-	}
-	private def setModuleConfigurations(settings: IvySettings, moduleConfigurations: Seq[ModuleConfiguration])
-	{
-		val existing = settings.getResolverNames
-		for(moduleConf <- moduleConfigurations)
-		{
-			import moduleConf._
-			import IvyPatternHelper._
-			import PatternMatcher._
-			if(!existing.contains(resolver.name))
-				settings.addResolver(ConvertResolver(resolver))
-			val attributes = javaMap(Map(MODULE_KEY -> name, ORGANISATION_KEY -> organization, REVISION_KEY -> revision))
-			settings.addModuleConfiguration(attributes, settings.getMatcher(EXACT_OR_REGEXP), resolver.name, null, null, null)
-		}
-	}
-	/** Sets the resolvers for 'settings' to 'resolvers'.  This is done by creating a new chain and making it the default. */
-	private def setResolvers(settings: IvySettings, resolvers: Seq[Resolver], log: Logger)
-	{
-		val newDefault = new ChainResolver
-		newDefault.setName("sbt-chain")
-		newDefault.setReturnFirst(true)
-		newDefault.setCheckmodified(true)
-		resolvers.foreach(r => newDefault.add(ConvertResolver(r)))
-		settings.addResolver(newDefault)
-		settings.setDefaultResolver(newDefault.getName)
-		if(log.atLevel(Level.Debug))
-		{
-			log.debug("Using repositories:")
-			resolvers.foreach(r => log.debug("\t" + r.toString))
-		}
-	}
-	private def toIvyConfiguration(configuration: Configuration) =
-	{
-		import org.apache.ivy.core.module.descriptor.{Configuration => IvyConfig}
-		import IvyConfig.Visibility._
-		import configuration._
-		new IvyConfig(name, if(isPublic) PUBLIC else PRIVATE, description, extendsConfigs.map(_.name).toArray, transitive, null)
-	}
-	/** Converts the given sbt module id into an Ivy ModuleRevisionId.*/
-	private def toID(m: ModuleID) =
-	{
-		import m._
-		ModuleRevisionId.newInstance(organization, name, revision, javaMap(extraAttributes))
-	}
-	private def toIvyArtifact(moduleID: ModuleDescriptor, a: Artifact, configurations: Iterable[String]): MDArtifact =
-	{
-		val artifact = new MDArtifact(moduleID, a.name, a.`type`, a.extension, null, extra(a))
-		configurations.foreach(artifact.addConfiguration)
-		artifact
-	}
-	/** An implementation of Ivy's Resource class that provides the Ivy file from a byte array.  This is used to support
-	* inline Ivy file XML.*/
-	private class ByteResource(bytes: Array[Byte]) extends
-		BasicResource("Inline XML dependencies", true, bytes.length, System.currentTimeMillis, true)
-	{
-		override def openStream = new java.io.ByteArrayInputStream(bytes)
-	}
-	/** Subclasses the default Ivy file parser in order to provide access to protected methods.*/
-	private object CustomXmlParser extends XmlModuleDescriptorParser with NotNull
-	{
-		import XmlModuleDescriptorParser.Parser
-		class CustomParser(settings: IvySettings, defaultConfig: Option[String]) extends Parser(CustomXmlParser, settings) with NotNull
-		{
-			if(defaultConfig.isDefined) setDefaultConfMapping("*->default(compile)")
-
-			def setSource(url: URL) =
-			{
-				super.setResource(new URLResource(url))
-				super.setInput(url)
-			}
-			/** Overridden because the super implementation overwrites the module descriptor.*/
-			override def setResource(res: Resource) {}
-			override def setMd(md: DefaultModuleDescriptor) = super.setMd(md)
-			override def parseDepsConfs(confs: String, dd: DefaultDependencyDescriptor): Unit = super.parseDepsConfs(confs, dd)
-			override def getDefaultConf = defaultConfig.getOrElse(super.getDefaultConf)
-		}
-	}
-	/** This code converts the given ModuleDescriptor to a DefaultModuleDescriptor by casting or generating an error.
-	* Ivy always produces a DefaultModuleDescriptor, so this should be reasonable. */
-	private def toDefaultModuleDescriptor(md: ModuleDescriptor) =
-		md match
-		{
-			case dmd: DefaultModuleDescriptor => dmd
-			case _ => error("Unknown ModuleDescriptor type.")
-		}
-}
diff --git a/src/main/scala/sbt/ManagedInterface.scala b/src/main/scala/sbt/ManagedInterface.scala
deleted file mode 100644
index 0274f59da..000000000
--- a/src/main/scala/sbt/ManagedInterface.scala
+++ /dev/null
@@ -1,426 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
- */
-package sbt
-
-import java.io.File
-import java.net.{URI, URL}
-import scala.xml.NodeSeq
-import org.apache.ivy.plugins.resolver.IBiblioResolver
-import org.apache.ivy.util.url.CredentialsStore
-
-sealed abstract class Manager extends NotNull
-/** This explicitly requests auto detection as a dependency manager.  It will first check for a 'pom.xml' file and if that does not exist, an 'ivy.xml' file.
-* Ivy is configured using the detected file or uses defaults.*/
-final class AutoDetectManager(val module: ModuleID, val defaultArtifact: Boolean) extends Manager
-{
-	def this(module: ModuleID) = this(module, true)
-}
-/** This explicitly requests that the Maven pom 'pom' be used to determine dependencies.  An Ivy configuration file to use may be specified in
-* 'configuration', since Ivy currently cannot extract Maven repositories from a pom file. Otherwise, defaults are used.*/
-final class MavenManager(val configuration: Option[Path], val pom: Path) extends Manager
-/** This explicitly requests that the Ivy file 'dependencies' be used to determine dependencies.  An Ivy configuration file to use may be specified in
-* 'configuration'.  Otherwise, defaults are used.*/
-final class IvyManager(val configuration: Option[Path], val dependencies: Path) extends Manager
-/** This manager directly specifies the dependencies, resolvers, and configurations through sbt wrapper classes and through an in-memory
-* Ivy XML file. */
-sealed trait SbtManager extends Manager
-{
-	def autodetect: Boolean
-	def module: ModuleID
-	def resolvers: Seq[Resolver]
-	def moduleConfigurations: Seq[ModuleConfiguration]
-	def dependencies: Iterable[ModuleID]
-	def autodetectUnspecified: Boolean
-	def dependenciesXML: NodeSeq
-	def configurations: Iterable[Configuration]
-	def defaultConfiguration: Option[Configuration]
-}
-final class SimpleManager private[sbt] (val dependenciesXML: NodeSeq, val autodetectUnspecified: Boolean,
-	val module: ModuleID, val resolvers: Seq[Resolver], val moduleConfigurations: Seq[ModuleConfiguration],
-	explicitConfigurations: Iterable[Configuration],	val defaultConfiguration: Option[Configuration],
-	val dependencies: ModuleID*) extends SbtManager
-{
-	def autodetect = dependencies.isEmpty && dependenciesXML.isEmpty && module.explicitArtifacts.isEmpty && explicitConfigurations.isEmpty && autodetectUnspecified
-	def configurations =
-		if(explicitConfigurations.isEmpty && !autodetect)
-		{
-			defaultConfiguration match
-			{
-				case Some(Configurations.DefaultIvyConfiguration) => Configurations.Default :: Nil
-				case Some(Configurations.DefaultMavenConfiguration) => Configurations.defaultMavenConfigurations
-				case _ => Nil
-			}
-		}
-		else
-			explicitConfigurations
-}
-final case class ModuleConfiguration(organization: String, name: String, revision: String, resolver: Resolver) extends NotNull
-object ModuleConfiguration
-{
-	def apply(org: String, resolver: Resolver): ModuleConfiguration = apply(org, "*", "*", resolver)
-	def apply(org: String, name: String, resolver: Resolver): ModuleConfiguration = ModuleConfiguration(org, name, "*", resolver)
-}
-final case class ModuleID(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact], extraAttributes: Map[String,String]) extends NotNull
-{
-	override def toString = organization + ":" + name + ":" + revision
-	// () required for chaining
-	def notTransitive() = intransitive()
-	def intransitive() = ModuleID(organization, name, revision, configurations, isChanging, false, explicitArtifacts, extraAttributes)
-	def changing() = ModuleID(organization, name, revision, configurations, true, isTransitive, explicitArtifacts, extraAttributes)
-	def from(url: String) = artifacts(Artifact(name, new URL(url)))
-	def classifier(c: String) = artifacts(Artifact(name, c))
-	def artifacts(newArtifacts: Artifact*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, newArtifacts ++ explicitArtifacts, extraAttributes)
-	def extra(attributes: (String,String)*) = ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, extraAttributes ++ ModuleID.checkE(attributes))
-	def sources() = artifacts(Artifact(name, "sources", "jar", "sources"))
-	def javadoc() = artifacts(Artifact(name, "javadoc", "jar", "javadoc"))
-	def withSources() = jarIfEmpty.sources()
-	def withJavadoc() = jarIfEmpty.javadoc()
-	private def jarIfEmpty = if(explicitArtifacts.isEmpty) jar() else this
-	def jar() = artifacts(Artifact(name, "jar", "jar"))
-}
-object ModuleID
-{
-	def apply(organization: String, name: String, revision: String): ModuleID = ModuleID(organization, name, revision, None)
-	def apply(organization: String, name: String, revision: String, configurations: Option[String]): ModuleID =
-		ModuleID(organization, name, revision, configurations, false, true)
-	def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean): ModuleID =
-		ModuleID(organization, name, revision, configurations, isChanging, isTransitive, Nil)
-	def apply(organization: String, name: String, revision: String, configurations: Option[String], isChanging: Boolean, isTransitive: Boolean, explicitArtifacts: Seq[Artifact]): ModuleID =
-		ModuleID(organization, name, revision, configurations, isChanging, isTransitive, explicitArtifacts, Map.empty)
-
-	def checkE(attributes: Seq[(String, String)]) =
-		for ( (key, value) <- attributes) yield
-			if(key.startsWith("e:")) (key, value) else ("e:" + key, value)
-}
-sealed trait Resolver extends NotNull
-{
-	def name: String
-}
-sealed case class MavenRepository(name: String, root: String) extends Resolver
-{
-	override def toString = name + ": " + root
-}
-
-final class Patterns(val ivyPatterns: Seq[String], val artifactPatterns: Seq[String], val isMavenCompatible: Boolean) extends NotNull
-{
-	private[sbt] def mavenStyle(): Patterns = Patterns(ivyPatterns, artifactPatterns, true)
-	private[sbt] def withIvys(patterns: Seq[String]): Patterns = Patterns(patterns ++ ivyPatterns, artifactPatterns, isMavenCompatible)
-	private[sbt] def withArtifacts(patterns: Seq[String]): Patterns = Patterns(ivyPatterns, patterns ++ artifactPatterns, isMavenCompatible)
-}
-object Patterns
-{
-	def apply(artifactPatterns: String*): Patterns = Patterns(true, artifactPatterns : _*)
-	def apply(isMavenCompatible: Boolean, artifactPatterns: String*): Patterns = Patterns(Nil, artifactPatterns, isMavenCompatible)
-	def apply(ivyPatterns: Seq[String], artifactPatterns: Seq[String], isMavenCompatible: Boolean): Patterns = new Patterns(ivyPatterns, artifactPatterns, isMavenCompatible)
-}
-object RepositoryHelpers
-{
-	final case class SshConnection(authentication: Option[SshAuthentication], hostname: Option[String], port: Option[Int]) extends NotNull
-	{
-		def copy(authentication: Option[SshAuthentication]) = SshConnection(authentication, hostname, port)
-	}
-	/** Configuration specific to an Ivy filesystem resolver. */
-	final case class FileConfiguration(isLocal: Boolean, isTransactional: Option[Boolean]) extends NotNull
-	{
-		def transactional() = FileConfiguration(isLocal, Some(true))
-		def nontransactional() = FileConfiguration(isLocal, Some(false))
-		def nonlocal() = FileConfiguration(false, isTransactional)
-	}
-	sealed trait SshAuthentication extends NotNull
-	final case class PasswordAuthentication(user: String, password: String) extends SshAuthentication
-	final case class KeyFileAuthentication(keyfile: File, password: String) extends SshAuthentication
-}
-import RepositoryHelpers.{SshConnection, FileConfiguration}
-import RepositoryHelpers.{KeyFileAuthentication, PasswordAuthentication, SshAuthentication}
-
-/** sbt interface to an Ivy repository based on patterns, which is most Ivy repositories.*/
-sealed abstract class PatternsBasedRepository extends Resolver
-{
-	type RepositoryType <: PatternsBasedRepository
-	/** Should be implemented to create a new copy of this repository but with `patterns` as given.*/
-	protected def copy(patterns: Patterns): RepositoryType
-
-	/** The object representing the configured patterns for this repository. */
-	def patterns: Patterns
-
-	/** Enables maven 2 compatibility for this repository. */
-	def mavenStyle() = copy(patterns.mavenStyle())
-	/** Adds the given patterns for resolving/publishing Ivy files.*/
-	def ivys(ivyPatterns: String*): RepositoryType = copy(patterns.withIvys(ivyPatterns))
-	/** Adds the given patterns for resolving/publishing artifacts.*/
-	def artifacts(artifactPatterns: String*): RepositoryType = copy(patterns.withArtifacts(artifactPatterns))
-}
-/** sbt interface for an Ivy filesystem repository.  More convenient construction is done using Resolver.file.  */
-final case class FileRepository(name: String, configuration: FileConfiguration, patterns: Patterns) extends PatternsBasedRepository
-{
-	type RepositoryType = FileRepository
-	protected def copy(patterns: Patterns): FileRepository = FileRepository(name, configuration, patterns)
-	private def copy(configuration: FileConfiguration) = FileRepository(name, configuration, patterns)
-	def transactional() = copy(configuration.transactional())
-	def nonlocal() = copy(configuration.nonlocal())
-}
-final case class URLRepository(name: String, patterns: Patterns) extends PatternsBasedRepository
-{
-	type RepositoryType = URLRepository
-	protected def copy(patterns: Patterns): URLRepository = URLRepository(name, patterns)
-}
-/** sbt interface for an Ivy ssh-based repository (ssh and sftp).  Requires the Jsch library.. */
-sealed abstract class SshBasedRepository extends PatternsBasedRepository
-{
-	type RepositoryType <: SshBasedRepository
-	protected def copy(connection: SshConnection): RepositoryType
-	private def copy(authentication: SshAuthentication): RepositoryType = copy(connection.copy(Some(authentication)))
-
-	/** The object representing the configured ssh connection for this repository. */
-	def connection: SshConnection
-
-	/** Configures this to use the specified user name and password when connecting to the remote repository. */
-	def as(user: String, password: String): RepositoryType = copy(new PasswordAuthentication(user, password))
-	/** Configures this to use the specified keyfile and password for the keyfile when connecting to the remote repository. */
-	def as(keyfile: File, password: String): RepositoryType = copy(new KeyFileAuthentication(keyfile, password))
-}
-/** sbt interface for an Ivy repository over ssh.  More convenient construction is done using Resolver.ssh.  */
-final case class SshRepository(name: String, connection: SshConnection, patterns: Patterns, publishPermissions: Option[String]) extends SshBasedRepository
-{
-	type RepositoryType = SshRepository
-	protected def copy(patterns: Patterns): SshRepository = SshRepository(name, connection, patterns, publishPermissions)
-	protected def copy(connection: SshConnection): SshRepository = SshRepository(name, connection, patterns, publishPermissions)
-	/** Defines the permissions to set when publishing to this repository. */
-	def withPermissions(publishPermissions: String): SshRepository = withPermissions(Some(publishPermissions))
-	def withPermissions(publishPermissions: Option[String]): SshRepository = SshRepository(name, connection, patterns, publishPermissions)
-}
-/** sbt interface for an Ivy repository over sftp.  More convenient construction is done using Resolver.sftp.  */
-final case class SftpRepository(name: String, connection: SshConnection, patterns: Patterns) extends SshBasedRepository
-{
-	type RepositoryType = SftpRepository
-	protected def copy(patterns: Patterns): SftpRepository = SftpRepository(name, connection, patterns)
-	protected def copy(connection: SshConnection): SftpRepository = SftpRepository(name, connection, patterns)
-}
-
-import Resolver._
-object ScalaToolsReleases extends MavenRepository(ScalaToolsReleasesName, ScalaToolsReleasesRoot)
-object ScalaToolsSnapshots extends MavenRepository(ScalaToolsSnapshotsName, ScalaToolsSnapshotsRoot)
-object DefaultMavenRepository extends MavenRepository("public", IBiblioResolver.DEFAULT_M2_ROOT)
-object JavaNet1Repository extends Resolver
-{
-	def name = "java.net Maven1 Repository"
-}
-
-object Resolver
-{
-	val ScalaToolsReleasesName = "Scala-Tools Maven2 Repository"
-	val ScalaToolsSnapshotsName = "Scala-Tools Maven2 Snapshots Repository"
-	val ScalaToolsReleasesRoot = "http://scala-tools.org/repo-releases"
-	val ScalaToolsSnapshotsRoot = "http://scala-tools.org/repo-snapshots"
-
-	/** A base class for defining factories for interfaces to Ivy repositories that require a hostname , port, and patterns.  */
-	sealed abstract class Define[RepositoryType <: SshBasedRepository] extends NotNull
-	{
-		/** Subclasses should implement this method to */
-		protected def construct(name: String, connection: SshConnection, patterns: Patterns): RepositoryType
-		/** Constructs this repository type with the given `name`.  `basePatterns` are the initial patterns to use.  A ManagedProject
-		* has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
-		def apply(name: String)(implicit basePatterns: Patterns): RepositoryType =
-			apply(name, None, None, None)
-		/** Constructs this repository type with the given `name` and `hostname`.  `basePatterns` are the initial patterns to use.
-		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
-		def apply(name: String, hostname: String)(implicit basePatterns: Patterns): RepositoryType =
-			apply(name, Some(hostname), None, None)
-		/** Constructs this repository type with the given `name`, `hostname`, and the `basePath` against which the initial
-		* patterns will be resolved.  `basePatterns` are the initial patterns to use.
-		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
-		def apply(name: String, hostname: String, basePath: String)(implicit basePatterns: Patterns): RepositoryType =
-			apply(name, Some(hostname), None, Some(basePath))
-		/** Constructs this repository type with the given `name`, `hostname`, and `port`.  `basePatterns` are the initial patterns to use.
-		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
-		def apply(name: String, hostname: String, port: Int)(implicit basePatterns: Patterns): RepositoryType =
-			apply(name, Some(hostname), Some(port), None)
-		/** Constructs this repository type with the given `name`, `hostname`, `port`, and the `basePath` against which the initial
-		* patterns will be resolved.  `basePatterns` are the initial patterns to use.
-		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
-		def apply(name: String, hostname: String, port: Int, basePath: String)(implicit basePatterns: Patterns): RepositoryType =
-			apply(name, Some(hostname), Some(port), Some(basePath))
-		/** Constructs this repository type with the given `name`, `hostname`, `port`, and the `basePath` against which the initial
-		* patterns will be resolved.  `basePatterns` are the initial patterns to use.  All but the `name` are optional (use None).
-		* A ManagedProject has an implicit defining these initial patterns based on a setting for either Maven or Ivy style patterns.*/
-		def apply(name: String, hostname: Option[String], port: Option[Int], basePath: Option[String])(implicit basePatterns: Patterns): RepositoryType =
-			construct(name, SshConnection(None, hostname, port), resolvePatterns(basePath, basePatterns))
-	}
-	/** A factory to construct an interface to an Ivy SSH resolver.*/
-	object ssh extends Define[SshRepository]
-	{
-		protected def construct(name: String, connection: SshConnection, patterns: Patterns) = SshRepository(name, connection, patterns, None)
-	}
-	/** A factory to construct an interface to an Ivy SFTP resolver.*/
-	object sftp extends Define[SftpRepository]
-	{
-		protected def construct(name: String, connection: SshConnection, patterns: Patterns) = SftpRepository(name, connection, patterns)
-	}
-	/** A factory to construct an interface to an Ivy filesytem resolver. */
-	object file
-	{
-		/** Constructs a file resolver with the given name.  The patterns to use must be explicitly specified
-		* using the `ivys` or `artifacts` methods on the constructed resolver object.*/
-		def apply(name: String): FileRepository = FileRepository(name, defaultFileConfiguration, Patterns(false))
-		/** Constructs a file resolver with the given name and base directory. */
-		def apply(name: String, baseDirectory: File)(implicit basePatterns: Patterns): FileRepository =
-		{
-			if(baseDirectory.exists && !baseDirectory.isDirectory) error("Not a directory: " + baseDirectory.getAbsolutePath)
-			baseRepository(new File(baseDirectory.toURI.normalize) getAbsolutePath)(FileRepository(name, defaultFileConfiguration, _))
-		}
-	}
-	object url
-	{
-		/** Constructs a URL resolver with the given name.  The patterns to use must be explicitly specified
-		* using the `ivys` or `artifacts` methods on the constructed resolver object.*/
-		def apply(name: String): URLRepository = URLRepository(name, Patterns(false))
-		/** Constructs a file resolver with the given name and base directory. */
-		def apply(name: String, baseURL: URL)(implicit basePatterns: Patterns): URLRepository =
-			baseRepository(baseURL.toURI.normalize.toString)(URLRepository(name, _))
-	}
-	private def baseRepository[T](base: String)(construct: Patterns => T)(implicit basePatterns: Patterns): T =
-		construct(resolvePatterns(base, basePatterns))
-
-	/** If `base` is None, `patterns` is returned unchanged.
-	* Otherwise, the ivy file and artifact patterns in `patterns` are resolved against the given base. */
-	private def resolvePatterns(base: Option[String], patterns: Patterns): Patterns =
-		base match
-		{
-			case Some(path) => resolvePatterns(path, patterns)
-			case None => patterns
-		}
-	/** Resolves the ivy file and artifact patterns in `patterns` against the given base. */
-	private def resolvePatterns(base: String, basePatterns: Patterns): Patterns =
-	{
-		val normBase = base.replace('\\', '/')
-		def resolve(pattern: String) = if(normBase.endsWith("/") || pattern.startsWith("/")) normBase +pattern else normBase + "/" + pattern
-		def resolveAll(patterns: Seq[String]) = patterns.map(resolve)
-		Patterns(resolveAll(basePatterns.ivyPatterns), resolveAll(basePatterns.artifactPatterns), basePatterns.isMavenCompatible)
-	}
-
-	def defaultFileConfiguration = FileConfiguration(true, None)
-	def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true)
-	def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, mavenStyleBasePattern :: Nil, false)
-
-	def defaultPatterns = mavenStylePatterns
-	def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
-	def localBasePattern = "[organisation]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]"
-
-	def userRoot = System.getProperty("user.home")
-	def userMavenRoot = userRoot + "/.m2/repository/"
-	def userIvyRoot = userRoot + "/.ivy2/"
-
-	def defaultLocal = defaultUserFileRepository("local")
-	def defaultShared = defaultUserFileRepository("shared")
-	def defaultUserFileRepository(id: String) = file(id, new File(userIvyRoot, id))(defaultIvyPatterns)
-	def defaultIvyPatterns =
-	{
-		val pList = List(localBasePattern)
-		Patterns(pList, pList, false)
-	}
-}
-
-object Configurations
-{
-	def config(name: String) = new Configuration(name)
-	def defaultMavenConfigurations = Compile :: Runtime :: Test :: Provided :: System :: Optional :: Sources :: Javadoc :: Nil
-
-	lazy val Default = config("default")
-	lazy val Compile = config("compile")
-	lazy val IntegrationTest = config("it") hide
-	lazy val Provided = config("provided")
-	lazy val Javadoc = config("javadoc")
-	lazy val Runtime = config("runtime")
-	lazy val Test = config("test") hide
-	lazy val Sources = config("sources")
-	lazy val System = config("system")
-	lazy val Optional = config("optional")
-
-	lazy val CompilerPlugin = config("plugin") hide
-
-	def allPredefined = Default :: IntegrationTest :: CompilerPlugin :: defaultMavenConfigurations
-
-	private[sbt] val DefaultMavenConfiguration = defaultConfiguration(true)
-	private[sbt] val DefaultIvyConfiguration = defaultConfiguration(false)
-	private[sbt] def DefaultConfiguration(mavenStyle: Boolean) = if(mavenStyle) DefaultMavenConfiguration else DefaultIvyConfiguration
-	private[sbt] def defaultConfiguration(mavenStyle: Boolean) = if(mavenStyle) Configurations.Compile else Configurations.Default
-	private[sbt] def removeDuplicates(configs: Iterable[Configuration]) = Set(scala.collection.mutable.Map(configs.map(config => (config.name, config)).toSeq: _*).values.toList: _*)
-}
-/** Represents an Ivy configuration. */
-final case class Configuration(name: String, description: String, isPublic: Boolean, extendsConfigs: List[Configuration], transitive: Boolean) extends NotNull
-{
-	require(name != null && !name.isEmpty)
-	require(description != null)
-	def this(name: String) = this(name, "", true, Nil, true)
-	def describedAs(newDescription: String) = Configuration(name, newDescription, isPublic, extendsConfigs, transitive)
-	def extend(configs: Configuration*) = Configuration(name, description, isPublic, configs.toList ::: extendsConfigs, transitive)
-	def notTransitive = intransitive
-	def intransitive = Configuration(name, description, isPublic, extendsConfigs, false)
-	def hide = Configuration(name, description, false, extendsConfigs, transitive)
-	override def toString = name
-}
-
-final case class Artifact(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL], extraAttributes: Map[String,String]) extends NotNull
-{
-	def extra(attributes: (String,String)*) = Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes ++ attributes)
-}
-object Artifact
-{
-	def apply(name: String): Artifact = Artifact(name, defaultType, defaultExtension, None, Nil, None)
-	def apply(name: String, extra: Map[String,String]): Artifact = Artifact(name, defaultType, defaultExtension, None, Nil, None, extra)
-	def apply(name: String, classifier: String): Artifact = Artifact(name, defaultType, defaultExtension, Some(classifier), Nil, None)
-	def apply(name: String, `type`: String, extension: String): Artifact = Artifact(name, `type`, extension, None, Nil, None)
-	def apply(name: String, `type`: String, extension: String, classifier: String): Artifact = Artifact(name, `type`, extension, Some(classifier), Nil, None)
-	def apply(name: String, url: URL): Artifact =Artifact(name, extract(url, defaultType), extract(url, defaultExtension), None, Nil, Some(url))
-	def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL]): Artifact =
-		Artifact(name, `type`, extension, classifier, configurations, url, Map.empty)
-	val defaultExtension = "jar"
-	val defaultType = "jar"
-	private[this] def extract(url: URL, default: String) =
-	{
-		val s = url.toString
-		val i = s.lastIndexOf('.')
-		if(i >= 0)
-			s.substring(i+1)
-		else
-			default
-	}
-}
-
-object Credentials
-{
-	/** Add the provided credentials to Ivy's credentials cache.*/
-	def add(realm: String, host: String, userName: String, passwd: String): Unit =
-		CredentialsStore.INSTANCE.addCredentials(realm, host, userName, passwd)
-	/** Load credentials from the given file into Ivy's credentials cache.*/
-	def apply(file: String, log: Logger): Unit = apply(Path.fromFile(file), log)
-	/** Load credentials from the given file into Ivy's credentials cache.*/
-	def apply(file: File, log: Logger): Unit = apply(Path.fromFile(file), log)
-	/** Load credentials from the given file into Ivy's credentials cache.*/
-	def apply(path: Path, log: Logger)
-	{
-		val msg =
-			if(path.exists)
-			{
-				val properties = new scala.collection.mutable.HashMap[String, String]
-				def get(keys: List[String]) = keys.flatMap(properties.get).firstOption.toRight(keys.head + " not specified in credentials file: " + path)
-
-					impl.MapUtilities.read(properties, path, log) orElse
-					{
-						List.separate( List(RealmKeys, HostKeys, UserKeys, PasswordKeys).map(get) ) match
-						{
-							case (Nil, List(realm, host, user, pass)) => add(realm, host, user, pass); None
-							case (errors, _) => Some(errors.mkString("\n"))
-						}
-					}
-			}
-			else
-				Some("Credentials file " + path + " does not exist")
-		msg.foreach(x => log.warn(x))
-	}
-	private[this] val RealmKeys = List("realm")
-	private[this] val HostKeys = List("host", "hostname")
-	private[this] val UserKeys = List("user", "user.name", "username")
-	private[this] val PasswordKeys = List("password", "pwd", "pass", "passwd")
-}
\ No newline at end of file
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index ca3dda3de..9e7422699 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -4,7 +4,7 @@
 package sbt
 
 import xsbti.{AppProvider, ScalaProvider}
-import xsbt.{AnalyzingCompiler, ComponentManager, ScalaInstance}
+import xsbt.{AnalyzingCompiler, ScalaInstance}
 import java.io.File
 import java.net.URLClassLoader
 import scala.collection._
@@ -228,7 +228,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	def buildScalaVersion = info.buildScalaVersion.getOrElse(crossScalaVersions.first)
 
 
-	def componentManager = new xsbt.ComponentManager(info.launcher.globalLock, info.app.components, log)
+	def componentManager = new ComponentManager(info.launcher.globalLock, info.app.components, log)
 	def buildScalaInstance = buildScalaInstance0
 	final def buildScalaInstance0: ScalaInstance =
 	{
diff --git a/src/main/scala/sbt/impl/ConvertResolver.scala b/src/main/scala/sbt/impl/ConvertResolver.scala
deleted file mode 100644
index 1d9ec9414..000000000
--- a/src/main/scala/sbt/impl/ConvertResolver.scala
+++ /dev/null
@@ -1,100 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
- */
-package sbt
-
-import org.apache.ivy.{core,plugins}
-import core.module.id.ModuleRevisionId
-import plugins.resolver.{ChainResolver, DependencyResolver, IBiblioResolver}
-import plugins.resolver.{AbstractPatternsBasedResolver, AbstractSshBasedResolver, FileSystemResolver, SFTPResolver, SshResolver, URLResolver}
-
-private object ConvertResolver
-{
-	/** Converts the given sbt resolver into an Ivy resolver..*/
-	def apply(r: Resolver) =
-	{
-		r match
-		{
-			case repo: MavenRepository =>
-			{
-				val resolver = new IBiblioResolver
-				initializeMavenStyle(resolver, repo.name, repo.root)
-				resolver
-			}
-			case JavaNet1Repository =>
-			{
-				// Thanks to Matthias Pfau for posting how to use the Maven 1 repository on java.net with Ivy:
-				// http://www.nabble.com/Using-gradle-Ivy-with-special-maven-repositories-td23775489.html
-				val resolver = new IBiblioResolver { override def convertM2IdForResourceSearch(mrid: ModuleRevisionId) = mrid }
-				initializeMavenStyle(resolver, JavaNet1Repository.name, "http://download.java.net/maven/1/")
-				resolver.setPattern("[organisation]/[ext]s/[module]-[revision](-[classifier]).[ext]")
-				resolver
-			}
-			case repo: SshRepository =>
-			{
-				val resolver = new SshResolver
-				initializeSSHResolver(resolver, repo)
-				repo.publishPermissions.foreach(perm => resolver.setPublishPermissions(perm))
-				resolver
-			}
-			case repo: SftpRepository =>
-			{
-				val resolver = new SFTPResolver
-				initializeSSHResolver(resolver, repo)
-				resolver
-			}
-			case repo: FileRepository =>
-			{
-				val resolver = new FileSystemResolver
-				resolver.setName(repo.name)
-				initializePatterns(resolver, repo.patterns)
-				import repo.configuration.{isLocal, isTransactional}
-				resolver.setLocal(isLocal)
-				isTransactional.foreach(value => resolver.setTransactional(value.toString))
-				resolver
-			}
-			case repo: URLRepository =>
-			{
-				val resolver = new URLResolver
-				resolver.setName(repo.name)
-				initializePatterns(resolver, repo.patterns)
-				resolver
-			}
-		}
-	}
-	private def initializeMavenStyle(resolver: IBiblioResolver, name: String, root: String)
-	{
-		resolver.setName(name)
-		resolver.setM2compatible(true)
-		resolver.setRoot(root)
-	}
-	private def initializeSSHResolver(resolver: AbstractSshBasedResolver, repo: SshBasedRepository)
-	{
-		resolver.setName(repo.name)
-		resolver.setPassfile(null)
-		initializePatterns(resolver, repo.patterns)
-		initializeConnection(resolver, repo.connection)
-	}
-	private def initializeConnection(resolver: AbstractSshBasedResolver, connection: RepositoryHelpers.SshConnection)
-	{
-		import resolver._
-		import connection._
-		hostname.foreach(setHost)
-		port.foreach(setPort)
-		authentication foreach
-			{
-				case RepositoryHelpers.PasswordAuthentication(user, password) =>
-					setUser(user)
-					setUserPassword(password)
-				case RepositoryHelpers.KeyFileAuthentication(file, password) =>
-					setKeyFile(file)
-					setKeyFilePassword(password)
-			}
-	}
-	private def initializePatterns(resolver: AbstractPatternsBasedResolver, patterns: Patterns)
-	{
-		resolver.setM2compatible(patterns.isMavenCompatible)
-		patterns.ivyPatterns.foreach(resolver.addIvyPattern)
-		patterns.artifactPatterns.foreach(resolver.addArtifactPattern)
-	}
-}
diff --git a/src/main/scala/sbt/impl/ManagedImpl.scala b/src/main/scala/sbt/impl/ManagedImpl.scala
deleted file mode 100644
index e1f13b892..000000000
--- a/src/main/scala/sbt/impl/ManagedImpl.scala
+++ /dev/null
@@ -1,71 +0,0 @@
-/* sbt -- Simple Build Tool
- * Copyright 2008, 2009 Mark Harrah
- */
-package sbt
-
-import org.apache.ivy.{plugins, util}
-import plugins.parser.m2.PomModuleDescriptorWriter
-import util.{Message, MessageLogger}
-
-private object DefaultConfigurationMapping extends PomModuleDescriptorWriter.ConfigurationScopeMapping(new java.util.HashMap)
-{
-	override def getScope(confs: Array[String]) =
-	{
-		Configurations.defaultMavenConfigurations.find(conf => confs.contains(conf.name)) match
-		{
-			case Some(conf) => conf.name
-			case None =>
-				if(confs.isEmpty || confs(0) == Configurations.Default.name)
-					null
-				else
-					confs(0)
-		}
-	}
-	override def isOptional(confs: Array[String]) = confs.isEmpty || (confs.length == 1 && confs(0) == Configurations.Optional.name)
-}
-
-/** Interface between Ivy logging and sbt logging. */
-private final class IvyLogger(log: Logger) extends MessageLogger
-{
-	private var progressEnabled = false
-	
-	def log(msg: String, level: Int)
-	{
-		import Message.{MSG_DEBUG, MSG_VERBOSE, MSG_INFO, MSG_WARN, MSG_ERR}
-		level match
-		{
-			case MSG_DEBUG | MSG_VERBOSE => debug(msg)
-			case MSG_INFO => info(msg)
-			case MSG_WARN => warn(msg)
-			case MSG_ERR => error(msg)
-		}
-	}
-	def rawlog(msg: String, level: Int)
-	{
-		log(msg, level)
-	}
-	import Level.{Debug, Info, Warn, Error}
-	def debug(msg: String) = logImpl(msg, Debug)
-	def verbose(msg: String) = debug(msg)
-	def deprecated(msg: String) = warn(msg)
-	def info(msg: String) = logImpl(msg, Info)
-	def rawinfo(msg: String) = info(msg)
-	def warn(msg: String) = logImpl(msg, Warn)
-	def error(msg: String) = logImpl(msg, Error)
-	
-	private def logImpl(msg: String, level: Level.Value) = log.log(level, msg)
-	
-	private def emptyList = java.util.Collections.emptyList[T forSome { type T}]
-	def getProblems = emptyList
-	def getWarns = emptyList
-	def getErrors = emptyList
-
-	def clearProblems = ()
-	def sumupProblems = ()
-	def progress = ()
-	def endProgress = ()
-
-	def endProgress(msg: String) = info(msg)
-	def isShowProgress = false
-	def setShowProgress(progress: Boolean) {}
-}
diff --git a/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala b/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
index f2dcc858d..3c61d9f35 100644
--- a/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
+++ b/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
@@ -3,8 +3,7 @@ import sbt._
 class ArtifactTest(info: ProjectInfo) extends DefaultProject(info)
 {
 	// use cache specific to this test
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	// define a test repository to publish to
 	override def managedStyle = ManagedStyle.Maven
diff --git a/src/sbt-test/dependency-management/classifier/project/build/Test.scala b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
index b658907e1..9cf18923a 100644
--- a/src/sbt-test/dependency-management/classifier/project/build/Test.scala
+++ b/src/sbt-test/dependency-management/classifier/project/build/Test.scala
@@ -2,7 +2,6 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	val testng = "org.testng" % "testng" % "5.7" classifier "jdk15"
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/extra/changes/UseColor.scala b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
index 4371704fd..2b0093e76 100644
--- a/src/sbt-test/dependency-management/extra/changes/UseColor.scala
+++ b/src/sbt-test/dependency-management/extra/changes/UseColor.scala
@@ -2,8 +2,7 @@ import sbt._
 
 class UseColor(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	override def managedStyle = ManagedStyle.Ivy
 	val repo = Resolver.file("test-repo", ("repo" / "test").asFile)
diff --git a/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
index 658c6c063..5d337e24f 100644
--- a/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
+++ b/src/sbt-test/dependency-management/extra/project/build/DefineColor.scala
@@ -2,8 +2,7 @@ import sbt._
 
 class DefineColor(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	override def managedStyle = ManagedStyle.Ivy
 	val publishTo = Resolver.file("test-repo", ("repo" / "test").asFile)
diff --git a/src/sbt-test/dependency-management/info/project/build/InfoTest.scala b/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
index dc71382d8..037d065ce 100644
--- a/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
+++ b/src/sbt-test/dependency-management/info/project/build/InfoTest.scala
@@ -2,8 +2,7 @@ import sbt._
 
 class InfoTest(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	
 	override def ivyXML =
 		if(customInfo)
diff --git a/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
index 6a247bcd2..1969db32a 100644
--- a/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
+++ b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject.scala
@@ -4,13 +4,11 @@ class TestProject(info: ProjectInfo) extends ParentProject(info)
 {
 	val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
 	val sub = project("sub", "Sub Project", new SubProject(_))
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)
 	{
-		def ivyCacheDirectory = outputPath / "ivy-cache"
-		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 		override def ivyXML =
 			<dependencies>
 				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
diff --git a/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
index a51ad119d..853ae1f6b 100644
--- a/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
+++ b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject2.scala
@@ -4,15 +4,13 @@ class TestProject(info: ProjectInfo) extends ParentProject(info)
 {
 	val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
 	val sub = project("sub", "Sub Project", new SubProject(_))
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)
 	{
 		val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
 		
-		def ivyCacheDirectory = outputPath / "ivy-cache"
-		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 		override def ivyXML =
 			<dependencies>
 				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
diff --git a/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
index a51ad119d..a26de6c2b 100644
--- a/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
+++ b/src/sbt-test/dependency-management/inherit-repo/changes/CorrectProject3.scala
@@ -4,15 +4,13 @@ class TestProject(info: ProjectInfo) extends ParentProject(info)
 {
 	val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
 	val sub = project("sub", "Sub Project", new SubProject(_))
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)
 	{
 		val addRepo = "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/"
 		
-		def ivyCacheDirectory = outputPath / "ivy-cache"
-		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+		override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 		override def ivyXML =
 			<dependencies>
 				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
diff --git a/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
index a576d9609..510c38fe4 100644
--- a/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
+++ b/src/sbt-test/dependency-management/inherit-repo/project/build/src/TestProject.scala
@@ -3,13 +3,11 @@ import sbt._
 class TestProject(info: ProjectInfo) extends ParentProject(info)
 {
 	val sub = project("sub", "Sub Project", new SubProject(_))
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)
 	{
-		def ivyCacheDirectory = outputPath / "ivy-cache"
-		override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 		override def ivyXML =
 			<dependencies>
 				<dependency org="com.camptocamp.tl.caltar" name="core" rev="0.5" transitive="false"/>
diff --git a/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala b/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
index 09885508b..8f7323f9e 100644
--- a/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
+++ b/src/sbt-test/dependency-management/inline-dependencies-a/project/build/src/UpdateTestProject.scala
@@ -3,7 +3,6 @@ import sbt._
 class UpdateTestProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	val sc = "org.scalacheck" % "scalacheck" % "1.5"
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala b/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
index f8cb6a639..eb083fd84 100644
--- a/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
+++ b/src/sbt-test/dependency-management/ivy-settings-a/project/build/TestProject.scala
@@ -2,5 +2,6 @@ import sbt._
 
 class TestProject(info: ProjectInfo) extends DefaultProject(info)
 {
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala b/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
index 005f0cb62..8f7323f9e 100644
--- a/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
+++ b/src/sbt-test/dependency-management/ivy-settings-b/project/build/src/UpdateTestProject.scala
@@ -3,5 +3,6 @@ import sbt._
 class UpdateTestProject(info: ProjectInfo) extends DefaultProject(info)
 {
 	val sc = "org.scalacheck" % "scalacheck" % "1.5"
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	override def disableCrossPaths = true
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala b/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
index c98c0e6b0..fd31e81f4 100644
--- a/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
+++ b/src/sbt-test/dependency-management/java.net/project/build/src/TestProject.scala
@@ -2,6 +2,7 @@ import sbt._
 
 class TestProject(info: ProjectInfo) extends DefaultProject(info)
 {
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	val javaNet = JavaNet1Repository
 	val ejb = "javax.ejb" % "ejb-api" % "3.0"
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
index 52240e06a..47f80c36c 100644
--- a/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
+++ b/src/sbt-test/dependency-management/module-confs/changes/WrongOrg.scala
@@ -2,13 +2,12 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	
 	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]"
 	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
 	val scOnly = ModuleConfiguration("org.not-scala-lang", "*", "2.8.0-.*", scalaSnapshots)
 
-	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219"
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20100115.022156-304"
 	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
index 4fc451b24..f999c459b 100644
--- a/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
+++ b/src/sbt-test/dependency-management/module-confs/changes/WrongPattern.scala
@@ -2,13 +2,12 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	
 	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.a-SNAPSHOT/[artifact]-[revision].[ext]"
 	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
 	val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
 
-	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-219"
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20100115.022156-304"
 	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala b/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
index 4ac6d5a3e..687e9121d 100644
--- a/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
+++ b/src/sbt-test/dependency-management/module-confs/changes/WrongVersion.scala
@@ -2,13 +2,12 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	
 	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]"
 	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
 	val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
 
-	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20090910.003346-218"
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20100115.022156-305"
 	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
 }
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
index 83b398a03..b274c8724 100644
--- a/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
+++ b/src/sbt-test/dependency-management/module-confs/project/build/Test.scala
@@ -2,14 +2,13 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	
 	def snapshotPattern = "http://scala-tools.org/repo-snapshots/[organization]/[module]/2.8.0-SNAPSHOT/[artifact]-[revision].[ext]"
 	def scalaSnapshots = Resolver.url("Scala Tools Snapshots") artifacts(snapshotPattern) ivys(snapshotPattern) mavenStyle()
 	val scOnly = ModuleConfiguration("org.scala-lang", "*", "2.8.0-.*", scalaSnapshots)
 
-	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20091017.011744-240"
+	val uniqueScala = "org.scala-lang" % "scala-compiler" % "2.8.0-20100115.022156-304"
 	val otherDep = "org.scala-tools.sxr" % "sxr_2.7.5" % "0.2.3"
 	
 	override def checkExplicitScalaDependencies = false
diff --git a/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala b/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
index f7a1dd0f2..00c3f923c 100644
--- a/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
+++ b/src/sbt-test/dependency-management/package-to-publish/project/build/Test.scala
@@ -2,8 +2,7 @@ import sbt._
 
 class Test(info: ProjectInfo) extends DefaultProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	
   override def managedStyle = ManagedStyle.Maven
 	def testRepoPath = path("test-repo")
diff --git a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
index fadb0a30f..c16f029fb 100644
--- a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
+++ b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
@@ -7,8 +7,7 @@ class MultiPublishTest(info: ProjectInfo) extends ParentProject(info)
 			ManagedStyle.Maven
 		else
 			ManagedStyle.Auto
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 	
 	lazy val sub = project("sub", "Sub Project", new SubProject(_))
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)

From ad40d7f34f70e5fa7ed177f127cc6862b764339d Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 15 Jan 2010 19:40:18 -0500
Subject: [PATCH 203/268] Try to properly use Jetty's WebAppClassLoader

---
 src/main/scala/sbt/WebApp.scala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index 54292a652..f6b2725cf 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -159,7 +159,13 @@ private object LazyJettyRun extends JettyRun
 					def classpathURLs = classpath.get.map(_.asURL).toSeq
 					val webapp = new WebAppContext(war.absolutePath, contextPath)
 					
-					def createLoader = new WebAppClassLoader(jettyLoader, webapp) { override def getURLs = classpathURLs.toArray }
+					def createLoader =
+					{
+						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
+						val loader = new SbtWebAppLoader
+						classpathURLs.foreach(loader.addURL)
+						loader
+					}
 					def setLoader() = webapp.setClassLoader(createLoader)
 					
 					setLoader()

From e110d4028b7ad0ded626c7141ec4fbc5330823be Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 15 Jan 2010 20:00:25 -0500
Subject: [PATCH 204/268] test case for running webapps directly out of
 src/main/webapp

---
 .../servlet-direct/changes/MyServlet.scala    | 20 ++++++++++++++++++
 .../servlet-direct/project/build.properties   |  3 +++
 .../project/build/src/WebappBuild.scala       | 21 +++++++++++++++++++
 .../src/main/scala/test/MyServlet.scala       | 20 ++++++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml           | 18 ++++++++++++++++
 src/sbt-test/web/servlet-direct/test          | 14 +++++++++++++
 6 files changed, 96 insertions(+)
 create mode 100644 src/sbt-test/web/servlet-direct/changes/MyServlet.scala
 create mode 100644 src/sbt-test/web/servlet-direct/project/build.properties
 create mode 100644 src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
 create mode 100644 src/sbt-test/web/servlet-direct/src/main/scala/test/MyServlet.scala
 create mode 100644 src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
 create mode 100644 src/sbt-test/web/servlet-direct/test

diff --git a/src/sbt-test/web/servlet-direct/changes/MyServlet.scala b/src/sbt-test/web/servlet-direct/changes/MyServlet.scala
new file mode 100644
index 000000000..15dc6f7eb
--- /dev/null
+++ b/src/sbt-test/web/servlet-direct/changes/MyServlet.scala
@@ -0,0 +1,20 @@
+package test
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+class MyServlet extends HttpServlet {
+
+	val html = <HTML>
+		<HEAD><TITLE>Hello, Scala 2!</TITLE></HEAD>
+		<BODY>Hello, Scala 2! This is a servlet.</BODY>
+	</HTML>
+
+	override def doGet(req:HttpServletRequest, resp:HttpServletResponse) {
+		resp.setContentType("text/html")
+		resp.getWriter().print(html.toString)
+	}
+	def check28(f: Int = 3) = f
+}
+
diff --git a/src/sbt-test/web/servlet-direct/project/build.properties b/src/sbt-test/web/servlet-direct/project/build.properties
new file mode 100644
index 000000000..34162cdcd
--- /dev/null
+++ b/src/sbt-test/web/servlet-direct/project/build.properties
@@ -0,0 +1,3 @@
+project.organization=tester
+project.name=sbtweb
+project.version=1.0
diff --git a/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala b/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
new file mode 100644
index 000000000..bca37e84d
--- /dev/null
+++ b/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
@@ -0,0 +1,21 @@
+import sbt._
+
+class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) {
+
+	val servlet_api = "org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default"
+	val jetty_servlet = "org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default"
+
+	def indexURL = new java.net.URL("http://localhost:8080")
+	def indexFile = new java.io.File("index.html")
+	import Process._
+	lazy val getPage = execTask { indexURL #> indexFile }
+	lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage }
+	
+	override def jettyWebappPath = webappPath
+	
+	private def checkHelloWorld(checkString: String) =
+	{
+		val value = xsbt.FileUtilities.read(indexFile)
+		if(value.contains(checkString)) None else Some("index.html did not contain '" + checkString + "' :\n" +value)
+	}
+}
diff --git a/src/sbt-test/web/servlet-direct/src/main/scala/test/MyServlet.scala b/src/sbt-test/web/servlet-direct/src/main/scala/test/MyServlet.scala
new file mode 100644
index 000000000..9d0365c5a
--- /dev/null
+++ b/src/sbt-test/web/servlet-direct/src/main/scala/test/MyServlet.scala
@@ -0,0 +1,20 @@
+package test
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+class MyServlet extends HttpServlet {
+
+	val html = <HTML>
+		<HEAD><TITLE>Hello, Scala!</TITLE></HEAD>
+		<BODY>Hello, Scala! This is a servlet.</BODY>
+	</HTML>
+
+	override def doGet(req:HttpServletRequest, resp:HttpServletResponse) {
+		resp.setContentType("text/html")
+		resp.getWriter().print(html.toString)
+	}
+	def check28(f: Int = 3) = f
+}
+
diff --git a/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml b/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..bff12b49b
--- /dev/null
+++ b/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,18 @@
+<!DOCTYPE web-app PUBLIC
+	"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+	"http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+	<display-name>Archetype Created Web Application</display-name>
+
+	<servlet>
+		<servlet-name>Home</servlet-name>
+		<servlet-class>test.MyServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Home</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+
+</web-app>
+
diff --git a/src/sbt-test/web/servlet-direct/test b/src/sbt-test/web/servlet-direct/test
new file mode 100644
index 000000000..a04dfa4d7
--- /dev/null
+++ b/src/sbt-test/web/servlet-direct/test
@@ -0,0 +1,14 @@
+> ++2.8.0.Beta1-RC6
+> update
+> jetty-run
+$ pause
+> check-page "Hello, Scala!"
+
+$ copy-file changes/MyServlet.scala src/main/scala/test/MyServlet.scala
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello, Scala 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
\ No newline at end of file

From 327fd718f2ecc2761c777a4c8da962544c71a3bc Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 16 Jan 2010 14:29:00 -0500
Subject: [PATCH 205/268] Include 'nosbt' in 'trace' error message

---
 src/main/scala/sbt/Main.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index b16851136..ef1133661 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -413,7 +413,7 @@ class xMain extends xsbti.AppMain
 		printCmd(HelpAction, "Displays this help message.")
 		printCmd(ShowCurrent, "Shows the current project, Scala version, and logging level.")
 		printCmd(Level.levels.mkString(", "), "Set logging for the current project to the specified level.")
-		printCmd(TraceCommand, "Toggles whether logging stack traces is enabled.")
+		printCmd(TraceCommand + " " + validTraceArguments, "Configures stack trace logging.")
 		printCmd(ProjectAction + " <project name>", "Sets the currently active project.")
 		printCmd(ShowProjectsAction, "Shows all available projects.")
 		printCmd(TerminateActions.elements.mkString(", "), "Terminates the build.")
@@ -696,8 +696,9 @@ class xMain extends xsbti.AppMain
 		actionValid
 	}
 
+	def validTraceArguments = "'on', 'nosbt', 'off', or <integer>.\n    'nosbt' prints stack traces up to the first sbt frame.\n    An integer argument defines the number of stack elements to show per exception."
 	private def isTerminateAction(s: String) = TerminateActions.elements.contains(s.toLowerCase)
-	private def setTraceError(log: Logger) = logError(log)("Invalid arguments for 'trace': expected 'on', 'off', or integer number of stack elements to show per exception.")
+	private def setTraceError(log: Logger) = logError(log)("Invalid arguments for 'trace': expected " + validTraceArguments + ".")
 	private def setArgumentError(log: Logger) = logError(log)("Invalid arguments for 'set': expected property name and new value.")
 	private def getArgumentError(log: Logger) = logError(log)("Invalid arguments for 'get': expected property name.")
 	private def setProjectError(log: Logger) = logError(log)("Invalid arguments for 'project': expected project name.")

From fb1d33c77ec03b459046c1c9a47c5c96a174f96f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 16 Jan 2010 14:38:20 -0500
Subject: [PATCH 206/268] version for 0.6.11

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index e5c1ce7f9..8e3a67995 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.11-SNAPSHOT
+project.version=0.6.11
 scala.version=2.7.7

From 328d862f70cda9b82684c066d167dbf2a57f9bec Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 16 Jan 2010 14:47:11 -0500
Subject: [PATCH 207/268] development version

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 8e3a67995..462c75965 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.11
+project.version=0.6.12-SNAPSHOT
 scala.version=2.7.7

From d06df9a2fe0db102648e9e16d81dab7f0a55c07f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 20 Jan 2010 23:06:10 -0500
Subject: [PATCH 208/268]  * Integrate Josh's test arguments patch  * Use
 ScalaTest arguments example to test test-interface

---
 scripted/src/main/scala/SbtHandler.scala      |  6 +-
 src/main/scala/sbt/DefaultProject.scala       | 20 ++---
 src/main/scala/sbt/IntegrationTesting.scala   |  6 +-
 src/main/scala/sbt/ScalaProject.scala         | 89 ++++++++++++-------
 src/main/scala/sbt/TestFramework.scala        | 45 ++++++----
 .../tests/arguments/project/build.properties  |  2 +
 .../project/build/ArgumentTest.scala          |  7 ++
 .../src/test/scala/ArgumentTest.scala         | 14 +++
 src/sbt-test/tests/arguments/test             | 27 ++++++
 9 files changed, 149 insertions(+), 67 deletions(-)
 create mode 100644 src/sbt-test/tests/arguments/project/build.properties
 create mode 100644 src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
 create mode 100644 src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala
 create mode 100644 src/sbt-test/tests/arguments/test

diff --git a/scripted/src/main/scala/SbtHandler.scala b/scripted/src/main/scala/SbtHandler.scala
index 22d879fee..e7a5942aa 100644
--- a/scripted/src/main/scala/SbtHandler.scala
+++ b/scripted/src/main/scala/SbtHandler.scala
@@ -11,7 +11,7 @@ final class SbtHandler(directory: File, log: Logger, server: IPC.Server) extends
 	def initialState = newRemote
 	def apply(command: String, arguments: List[String], p: Process): Process =
 	{
-		send((command :: arguments).mkString(" "))
+		send((command :: arguments.map(escape)).mkString(" "))
 		receive(command + " failed")
 		p
 	}
@@ -38,5 +38,9 @@ final class SbtHandler(directory: File, log: Logger, server: IPC.Server) extends
 		catch { case e: java.net.SocketException => error("Remote sbt initialization failed") }
 		p
 	}
+	// if the argument contains spaces, enclose it in quotes, quoting backslashes and quotes
+	def escape(argument: String) =
+		if(argument.contains(" ")) "\"" + argument.replaceAll(q("""\"""), """\\""").replaceAll(q("\""), "\\\"") + "\"" else argument
+	def q(s: String) = java.util.regex.Pattern.quote(s)
 //		Process("java" :: "-classpath" :: classpath.map(_.getAbsolutePath).mkString(File.pathSeparator) :: "xsbt.boot.Boot" :: ( "<" + server.port) :: Nil) run log
 }
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index f5d62213d..c7a1c91c0 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -267,16 +267,16 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	protected def docAction = scaladocTask(mainLabel, mainSources, mainDocPath, docClasspath, documentOptions).dependsOn(compile) describedAs DocDescription
 	protected def docTestAction = scaladocTask(testLabel, testSources, testDocPath, docClasspath, documentOptions).dependsOn(testCompile) describedAs TestDocDescription
 
-       protected def testAction = defaultTestTask(Nil, testOptions)
-       protected def testOnlyAction = testQuickMethod(testCompileConditional.analysis, testOptions)((testArgs, options) => {
-		   defaultTestTask(testArgs, options)
-       }) describedAs(TestOnlyDescription)
-       protected def testQuickAction = defaultTestQuickMethod(false) describedAs(TestQuickDescription)
-       protected def testFailedAction = defaultTestQuickMethod(true) describedAs(TestFailedDescription)
-       protected def defaultTestQuickMethod(failedOnly: Boolean) =
-         testQuickMethod(testCompileConditional.analysis, testOptions)((args, options) => defaultTestTask(args, quickOptions(failedOnly) ::: options.toList))
-       protected def defaultTestTask(testArgs: Seq[String], testOptions: => Seq[TestOption]) =
-         testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testArgs, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription
+	protected def testAction = defaultTestTask(testOptions)
+	protected def testOnlyAction = testQuickMethod(testCompileConditional.analysis, testOptions)((options) => {
+		defaultTestTask(options)
+	}) describedAs (TestOnlyDescription)
+	protected def testQuickAction = defaultTestQuickMethod(false) describedAs (TestQuickDescription)
+	protected def testFailedAction = defaultTestQuickMethod(true) describedAs (TestFailedDescription)
+	protected def defaultTestQuickMethod(failedOnly: Boolean) =
+		testQuickMethod(testCompileConditional.analysis, testOptions)(options => defaultTestTask(quickOptions(failedOnly) ::: options.toList))
+	protected def defaultTestTask(testOptions: => Seq[TestOption]) =
+		testTask(testFrameworks, testClasspath, testCompileConditional.analysis, testOptions).dependsOn(testCompile, copyResources, copyTestResources) describedAs TestDescription
 
 	override def packageToPublishActions: Seq[ManagedTask] = `package` :: Nil
 
diff --git a/src/main/scala/sbt/IntegrationTesting.scala b/src/main/scala/sbt/IntegrationTesting.scala
index 5edcb9dce..1957f0b4a 100644
--- a/src/main/scala/sbt/IntegrationTesting.scala
+++ b/src/main/scala/sbt/IntegrationTesting.scala
@@ -15,8 +15,8 @@ trait IntegrationTesting extends NotNull
 trait ScalaIntegrationTesting extends IntegrationTesting
 { self: ScalaProject =>
 
-	protected def integrationTestTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, testArgs: Seq[String], options: => Seq[TestOption]) =
-		testTask(frameworks, classpath, analysis, testArgs, options)
+	protected def integrationTestTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) =
+		testTask(frameworks, classpath, analysis, options)
 }
 
 trait BasicScalaIntegrationTesting extends BasicIntegrationTesting with MavenStyleIntegrationTestPaths
@@ -34,7 +34,7 @@ trait BasicIntegrationTesting extends ScalaIntegrationTesting with IntegrationTe
 
 	val integrationTestCompileConditional = new CompileConditional(integrationTestCompileConfiguration, buildCompiler)
 
-	protected def integrationTestAction = integrationTestTask(integrationTestFrameworks, integrationTestClasspath, integrationTestCompileConditional.analysis, Nil, integrationTestOptions) dependsOn integrationTestCompile describedAs IntegrationTestCompileDescription
+	protected def integrationTestAction = integrationTestTask(integrationTestFrameworks, integrationTestClasspath, integrationTestCompileConditional.analysis, integrationTestOptions) dependsOn integrationTestCompile describedAs IntegrationTestCompileDescription
 	protected def integrationTestCompileAction = integrationTestCompileTask() dependsOn compile describedAs IntegrationTestDescription
 
 	protected def integrationTestCompileTask() = task{ integrationTestCompileConditional.run }
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index b7e6405d5..4657013e5 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -67,7 +67,14 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	case class ExcludeTests(tests: Iterable[String]) extends TestOption
 	case class TestListeners(listeners: Iterable[TestReportListener]) extends TestOption
 	case class TestFilter(filterTest: String => Boolean) extends TestOption
-  case class TestFrameworkArgument(arg: String) extends TestOption
+
+	// args for all frameworks
+	def TestArgument(args: String*): TestArgument = TestArgument(None, args.toList)
+	// args for a particular test framework
+	def TestArgument(tf: TestFramework, args: String*): TestArgument = TestArgument(Some(tf), args.toList)
+
+	// None means apply to all, Some(tf) means apply to a particular framework only.
+	case class TestArgument(framework: Option[TestFramework], args: List[String]) extends TestOption
 
 	case class JarManifest(m: Manifest) extends PackageOption
 	{
@@ -150,14 +157,13 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	def copyTask(sources: PathFinder, destinationDirectory: Path): Task =
 		task { FileUtilities.copy(sources.get, destinationDirectory, log).left.toOption }
 
-	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, testArgs: Seq[String], options: TestOption*): Task =
-		testTask(frameworks, classpath, analysis, testArgs, options)
-	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis,
-               testArgs: Seq[String], options: => Seq[TestOption]): Task =
+	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: TestOption*): Task =
+		testTask(frameworks, classpath, analysis, options)
+	def testTask(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]): Task =
 	{
 		def work =
 		{
-			val (begin, work, end) = testTasks(frameworks, classpath, analysis, testArgs, options)
+			val (begin, work, end) = testTasks(frameworks, classpath, analysis, options)
 			val beginTasks = begin.map(toTask).toSeq // test setup tasks
 			val workTasks = work.map(w => toTask(w) dependsOn(beginTasks : _*)) // the actual tests
 			val endTasks = end.map(toTask).toSeq // tasks that perform test cleanup and are run regardless of success of tests
@@ -251,43 +257,58 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		}
 	}
 	protected def incrementImpl(v: BasicVersion): Version = v.incrementMicro
-	protected def testTasks(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, testArgs: Seq[String],
-                          options: => Seq[TestOption]) = {
+	protected def testTasks(frameworks: Seq[TestFramework], classpath: PathFinder, analysis: CompileAnalysis, options: => Seq[TestOption]) =
+	{
 		import scala.collection.mutable.HashSet
+		import scala.collection.mutable.Map
 
-			val testFilters = new ListBuffer[String => Boolean]
-			val excludeTestsSet = new HashSet[String]
-			val setup, cleanup = new ListBuffer[() => Option[String]]
-			val testListeners = new ListBuffer[TestReportListener]
+		val testFilters = new ListBuffer[String => Boolean]
+		val excludeTestsSet = new HashSet[String]
+		val setup, cleanup = new ListBuffer[() => Option[String]]
+		val testListeners = new ListBuffer[TestReportListener]
+		val testArgsByFramework = Map[TestFramework, ListBuffer[String]]()
+		def frameworkArgs(framework: TestFramework): ListBuffer[String] =
+			testArgsByFramework.getOrElseUpdate(framework, new ListBuffer[String])
 
-			for(option <- options)
+		for(option <- options)
+		{
+			option match
 			{
-				option match
-				{
-					case TestFilter(include) => testFilters += include
-					case ExcludeTests(exclude) => excludeTestsSet ++= exclude
-					case TestListeners(listeners) => testListeners ++= listeners
-					case TestSetup(setupFunction) => setup += setupFunction
-					case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
-				}
+				case TestFilter(include) => testFilters += include
+				case ExcludeTests(exclude) => excludeTestsSet ++= exclude
+				case TestListeners(listeners) => testListeners ++= listeners
+				case TestSetup(setupFunction) => setup += setupFunction
+				case TestCleanup(cleanupFunction) => cleanup += cleanupFunction
+				/**
+					* There are two cases here.
+					* The first handles TestArguments in the project file, which
+					* might have a TestFramework specified.
+					* The second handles arguments to be applied to all test frameworks.
+					*   -- arguments from the project file that didnt have a framework specified
+					*   -- command line arguments (ex: test-only someClass -- someArg)
+					*      (currently, command line args must be passed to all frameworks)
+					*/
+				case TestArgument(Some(framework), args) => frameworkArgs(framework) ++= args
+				case TestArgument(None, args) => frameworks.foreach { framework => frameworkArgs(framework) ++= args.toList }
 			}
+		}
 
-			if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))
-			{
-				log.debug("Excluding tests: ")
-				excludeTestsSet.foreach(test => log.debug("\t" + test))
-			}
-			def includeTest(test: TestDefinition) = !excludeTestsSet.contains(test.testClassName) && testFilters.forall(filter => filter(test.testClassName))
-			val tests = HashSet.empty[TestDefinition] ++ analysis.allTests.filter(includeTest)
-			TestFramework.testTasks(frameworks, classpath.get, buildScalaInstance.loader, tests.toSeq, log, testListeners.readOnly, false, setup.readOnly, cleanup.readOnly, testArgs)
+		if(excludeTestsSet.size > 0 && log.atLevel(Level.Debug))
+		{
+			log.debug("Excluding tests: ")
+			excludeTestsSet.foreach(test => log.debug("\t" + test))
+		}
+		def includeTest(test: TestDefinition) = !excludeTestsSet.contains(test.testClassName) && testFilters.forall(filter => filter(test.testClassName))
+		val tests = HashSet.empty[TestDefinition] ++ analysis.allTests.filter(includeTest)
+		TestFramework.testTasks(frameworks, classpath.get, buildScalaInstance.loader, tests.toSeq, log,
+			testListeners.readOnly, false, setup.readOnly, cleanup.readOnly, testArgsByFramework)
 	}
 	private def flatten[T](i: Iterable[Iterable[T]]) = i.flatMap(x => x)
 
-	protected def testQuickMethod(testAnalysis: CompileAnalysis, options: => Seq[TestOption])(toRun: (Seq[String],Seq[TestOption]) => Task) = {
+	protected def testQuickMethod(testAnalysis: CompileAnalysis, options: => Seq[TestOption])(toRun: (Seq[TestOption]) => Task) = {
     val analysis = testAnalysis.allTests.map(_.testClassName).toList
-		multiTask(analysis) { (args,includeFunction) => {
-			  toRun(args, TestFilter(includeFunction) :: options.toList)
-      }
+		multiTask(analysis) { (args, includeFunction) =>
+			  toRun(TestArgument(args:_*) :: TestFilter(includeFunction) :: options.toList)
 		}
   }
 
@@ -351,7 +372,7 @@ object ScalaProject
 }
 trait MultiTaskProject extends Project
 {
-	def multiTask(allTests: => List[String])(run: (List[String], (String => Boolean)) => Task): MethodTask = {
+	def multiTask(allTests: => List[String])(run: (Seq[String], String => Boolean) => Task): MethodTask = {
 
 		task { tests =>
 
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index c872dce96..ea7303b8e 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -34,6 +34,7 @@ final class TestRunner(framework: Framework, loader: ClassLoader, listeners: Seq
 	private[this] val delegate = framework.testRunner(loader, listeners.flatMap(_.contentLogger).toArray)
 	final def run(testDefinition: TestDefinition, args: Seq[String]): Result.Value =
 	{
+		log.debug("Running " + testDefinition + " with arguments " + args.mkString(", "))
 		val testClass = testDefinition.testClassName
 		def runTest() =
 		{
@@ -87,28 +88,34 @@ object TestFramework
 	private[sbt] def safeForeach[T](it: Iterable[T], log: Logger)(f: T => Unit): Unit =
 		it.foreach(i => Control.trapAndLog(log){ f(i) } )
 
-		import scala.collection.{Map, Set}
-	
+		import scala.collection.{immutable, Map, Set}
+
 	def testTasks(frameworks: Seq[TestFramework],
-                classpath: Iterable[Path],
-                scalaLoader: ClassLoader,
-                tests: Seq[TestDefinition],
-                log: Logger,
-		            listeners: Seq[TestReportListener],
-                endErrorsEnabled: Boolean,
-                setup: Iterable[() => Option[String]],
-		            cleanup: Iterable[() => Option[String]],
-                testArgs: Seq[String]): (Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
+		classpath: Iterable[Path],
+		scalaLoader: ClassLoader,
+		tests: Seq[TestDefinition],
+		log: Logger,
+		listeners: Seq[TestReportListener],
+		endErrorsEnabled: Boolean,
+		setup: Iterable[() => Option[String]],
+		cleanup: Iterable[() => Option[String]],
+		testArgsByFramework: Map[TestFramework, Seq[String]]):
+			(Iterable[NamedTestTask], Iterable[NamedTestTask], Iterable[NamedTestTask]) =
 	{
 		val loader = createTestLoader(classpath, scalaLoader)
-		val rawFrameworks = frameworks.flatMap(_.create(loader, log))
-		val mappedTests = testMap(rawFrameworks, tests)
+		val arguments = immutable.Map() ++
+			( for(framework <- frameworks; created <- framework.create(loader, log)) yield
+				(created, testArgsByFramework.getOrElse(framework, Nil)) )
+
+		val mappedTests = testMap(arguments.keys.toList, tests, arguments)
 		if(mappedTests.isEmpty)
 			(new NamedTestTask(TestStartName, None) :: Nil, Nil, new NamedTestTask(TestFinishName, { log.info("No tests to run."); None }) :: Nil )
 		else
-			createTestTasks(loader, mappedTests, log, listeners, endErrorsEnabled, setup, cleanup, testArgs)
+			createTestTasks(loader, mappedTests, log, listeners, endErrorsEnabled, setup, cleanup)
 	}
-	private def testMap(frameworks: Seq[Framework], tests: Seq[TestDefinition]): Map[Framework, Set[TestDefinition]] =
+
+	private def testMap(frameworks: Seq[Framework], tests: Seq[TestDefinition], args: Map[Framework, Seq[String]]):
+		immutable.Map[Framework, (Set[TestDefinition], Seq[String])] =
 	{
 		import scala.collection.mutable.{HashMap, HashSet, Set}
 		val map = new HashMap[Framework, Set[TestDefinition]]
@@ -127,14 +134,14 @@ object TestFramework
 		}
 		if(!frameworks.isEmpty)
 			assignTests()
-		wrap.Wrappers.readOnly(map)
+		(immutable.Map() ++ map) transform { (framework, tests) => (tests, args(framework)) }
 	}
 	private def createTasks(work: Iterable[() => Option[String]], baseName: String) =
 		work.toList.zipWithIndex.map{ case (work, index) => new NamedTestTask(baseName + " " + (index+1), work()) }
 		
-	private def createTestTasks(loader: ClassLoader, tests: Map[Framework, Set[TestDefinition]], log: Logger,
+	private def createTestTasks(loader: ClassLoader, tests: Map[Framework, (Set[TestDefinition], Seq[String])], log: Logger,
 		listeners: Seq[TestReportListener], endErrorsEnabled: Boolean, setup: Iterable[() => Option[String]],
-		cleanup: Iterable[() => Option[String]], testArgs: Seq[String]) =
+		cleanup: Iterable[() => Option[String]]) =
 	{
 		val testsListeners = listeners.filter(_.isInstanceOf[TestsListener]).map(_.asInstanceOf[TestsListener])
 		def foreachListenerSafe(f: TestsListener => Unit): Unit = safeForeach(testsListeners, log)(f)
@@ -148,7 +155,7 @@ object TestFramework
 		}
 		val startTask = new NamedTestTask(TestStartName, {foreachListenerSafe(_.doInit); None}) :: createTasks(setup, "Test setup")
 		val testTasks =
-			tests flatMap { case (framework, testDefinitions) =>
+			tests flatMap { case (framework, (testDefinitions, testArgs)) =>
 			
 					val runner = new TestRunner(framework, loader, listeners, log)
 					for(testDefinition <- testDefinitions) yield
diff --git a/src/sbt-test/tests/arguments/project/build.properties b/src/sbt-test/tests/arguments/project/build.properties
new file mode 100644
index 000000000..d164f7135
--- /dev/null
+++ b/src/sbt-test/tests/arguments/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Test Arguments Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala b/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
new file mode 100644
index 000000000..3ba7d55d1
--- /dev/null
+++ b/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class ArgumentTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	val snap = ScalaToolsSnapshots
+	val st = "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-RC7-with-test-interfaces-0.3-SNAPSHOT"
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala b/src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala
new file mode 100644
index 000000000..695a14d04
--- /dev/null
+++ b/src/sbt-test/tests/arguments/src/test/scala/ArgumentTest.scala
@@ -0,0 +1,14 @@
+
+import org.scalatest.fixture.FixtureFunSuite
+import org.scalatest.Tag
+
+class ArgumentTest extends FixtureFunSuite{
+  type FixtureParam = Map[String,Any]
+  override def withFixture(test: OneArgTest) {
+    test(test.configMap)
+  }
+  test("1", Tag("test1")){ conf => error("error #1") }
+  test("2", Tag("test2")){ conf => () }
+  test("3", Tag("test3")){ conf => () }
+  test("4", Tag("test4")){ conf => error("error #4") }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/arguments/test b/src/sbt-test/tests/arguments/test
new file mode 100644
index 000000000..15262a804
--- /dev/null
+++ b/src/sbt-test/tests/arguments/test
@@ -0,0 +1,27 @@
+> ++2.8.0.Beta1-RC7
+> update
+
+# should fail because it should run all tests, some of which are expected to fail (1 and 4)
+-> test-only ArgumentTest
+
+# should fail because it should run the test tagged 'test1', which should fail
+-> test-only ArgumentTest -- -n test1
+
+# should succeed because it should only run the test tagged 'test2', which should succeed
+> test-only ArgumentTest -- -n test2
+
+# should succeed because it should only run the test tagged 'test3', which should succeed
+> test-only ArgumentTest -- -n test3
+
+# should fail because it should run the test tagged 'test4', which should fail
+-> test-only ArgumentTest -- -n test4
+
+# should succeed because it should only run the tests tagged 'test2' or 'test3', both of which should succeed
+> test-only ArgumentTest -- -n "test2 test3"
+
+# these should fail because they run at least one failed test
+-> test-only ArgumentTest -- -n "test2 test4"
+-> test-only ArgumentTest -- -n "test1 test2 test3"
+-> test-only ArgumentTest -- -n "test2 test3 test4"
+-> test-only ArgumentTest -- -n "test1 test2 test3 test4"
+-> test-only ArgumentTest -- -n "test1 test3"

From c8057f414b4197d80ec1e816e02d2bb7b60d5198 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 20 Jan 2010 23:19:51 -0500
Subject: [PATCH 209/268] Add normal 'test' action to test arguments test case

---
 .../project/build/ArgumentTest.scala          | 10 ++++++
 src/sbt-test/tests/arguments/test             | 36 ++++++++++---------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala b/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
index 3ba7d55d1..3e2d610db 100644
--- a/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
+++ b/src/sbt-test/tests/arguments/project/build/ArgumentTest.scala
@@ -4,4 +4,14 @@ class ArgumentTest(info: ProjectInfo) extends DefaultProject(info)
 {
 	val snap = ScalaToolsSnapshots
 	val st = "org.scalatest" % "scalatest" % "1.0.1-for-scala-2.8.0.Beta1-RC7-with-test-interfaces-0.3-SNAPSHOT"
+
+	override def testOptions =
+		super.testOptions ++
+		args("success1", "-n", "test2 test3") ++
+		args("success2", "-n", "test2") ++
+		args("success3", "-n", "test3") ++
+		args("failure1", "-n", "test1") ++
+		args("failure2", "-n", "test1 test4") ++
+		args("failure3", "-n", "test1 test3")
+	def args(path: Path, args: String*): Seq[TestOption] = if(path.exists) TestArgument(args : _*) :: Nil else Nil
 }
\ No newline at end of file
diff --git a/src/sbt-test/tests/arguments/test b/src/sbt-test/tests/arguments/test
index 15262a804..5939e290e 100644
--- a/src/sbt-test/tests/arguments/test
+++ b/src/sbt-test/tests/arguments/test
@@ -2,26 +2,28 @@
 > update
 
 # should fail because it should run all tests, some of which are expected to fail (1 and 4)
--> test-only ArgumentTest
+-> test
 
-# should fail because it should run the test tagged 'test1', which should fail
--> test-only ArgumentTest -- -n test1
+$ touch success1
+> test
+$ delete success1
 
-# should succeed because it should only run the test tagged 'test2', which should succeed
-> test-only ArgumentTest -- -n test2
+$ touch failure1
+-> test
+$ delete failure1
 
-# should succeed because it should only run the test tagged 'test3', which should succeed
-> test-only ArgumentTest -- -n test3
+$ touch success2
+> test
+$ delete success2
 
-# should fail because it should run the test tagged 'test4', which should fail
--> test-only ArgumentTest -- -n test4
+$ touch failure2
+-> test
+$ delete failure2
 
-# should succeed because it should only run the tests tagged 'test2' or 'test3', both of which should succeed
-> test-only ArgumentTest -- -n "test2 test3"
+$ touch success3
+> test
+$ delete success3
 
-# these should fail because they run at least one failed test
--> test-only ArgumentTest -- -n "test2 test4"
--> test-only ArgumentTest -- -n "test1 test2 test3"
--> test-only ArgumentTest -- -n "test2 test3 test4"
--> test-only ArgumentTest -- -n "test1 test2 test3 test4"
--> test-only ArgumentTest -- -n "test1 test3"
+$ touch failure3
+-> test
+$ delete failure3
\ No newline at end of file

From 64fae312486dc2fec4ec27fd94673b5cee4b9146 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 25 Jan 2010 22:52:50 -0500
Subject: [PATCH 210/268] Compatibility test framework support and tests

---
 src/main/scala/sbt/BasicProjectTypes.scala    | 19 ++++++++++++-
 src/main/scala/sbt/DefaultProject.scala       |  4 +--
 src/main/scala/sbt/TestFramework.scala        |  4 +++
 src/main/scala/sbt/TestReportListener.scala   |  3 +-
 .../project/build.properties                  |  2 ++
 .../project/build/CompatScalaCheck.scala      |  6 ++++
 .../src/test/scala/Failure.scala              | 20 +++++++++++++
 .../src/test/scala/Success.scala              | 15 ++++++++++
 src/sbt-test/tests/scalacheck-compat/test     | 28 +++++++++++++++++++
 .../scalatest-compat/project/build.properties |  2 ++
 .../project/build/CompatScalaTest.scala       |  6 ++++
 .../src/test/scala/Failure.scala              | 21 ++++++++++++++
 .../src/test/scala/Success.scala              | 21 ++++++++++++++
 src/sbt-test/tests/scalatest-compat/test      |  9 ++++++
 .../specs-compat/project/build.properties     |  2 ++
 .../project/build/CompatSpecsTest.scala       |  6 ++++
 .../specs-compat/src/test/scala/Fail.scala    | 10 +++++++
 .../specs-compat/src/test/scala/Success.scala | 10 +++++++
 src/sbt-test/tests/specs-compat/test          |  9 ++++++
 19 files changed, 192 insertions(+), 5 deletions(-)
 create mode 100644 src/sbt-test/tests/scalacheck-compat/project/build.properties
 create mode 100644 src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala
 create mode 100644 src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala
 create mode 100644 src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala
 create mode 100644 src/sbt-test/tests/scalacheck-compat/test
 create mode 100644 src/sbt-test/tests/scalatest-compat/project/build.properties
 create mode 100644 src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala
 create mode 100644 src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala
 create mode 100644 src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala
 create mode 100644 src/sbt-test/tests/scalatest-compat/test
 create mode 100644 src/sbt-test/tests/specs-compat/project/build.properties
 create mode 100644 src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala
 create mode 100644 src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala
 create mode 100644 src/sbt-test/tests/specs-compat/src/test/scala/Success.scala
 create mode 100644 src/sbt-test/tests/specs-compat/test

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 581317951..f6d835aeb 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -211,7 +211,24 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	/** The settings that represent inline declarations.  The default settings combines the information
 	* from 'ivyXML', 'projectID', 'repositories', ivyConfigurations, defaultConfiguration,
 	* ivyScala, and 'libraryDependencies' and does not typically need to be be overridden. */
-	def inlineSettings = new InlineConfiguration(projectID, libraryDependencies, ivyXML, ivyConfigurations, defaultConfiguration, ivyScala, ivyValidate)
+	def inlineSettings = new InlineConfiguration(projectID, withCompat, ivyXML, ivyConfigurations, defaultConfiguration, ivyScala, ivyValidate)
+	/** Library dependencies with extra dependencies for compatibility*/
+	private def withCompat =
+	{
+		val deps = libraryDependencies
+		deps ++ compatExtra(deps)
+	}
+	/** Determines extra libraries needed for compatibility.  Currently, this is the compatibility test framework. */
+	private def compatExtra(deps: Set[ModuleID]) = if(deps.exists(requiresCompat)) compatTestFramework else Nil
+	/** True if the given dependency requires the compatibility test framework. */
+	private def requiresCompat(m: ModuleID) =
+		(m.name == "scalacheck" && Set("1.5", "1.6").contains(m.revision)) ||
+		(m.name == "specs" && Set("1.6.0", "1.6.1").contains(m.revision)) ||
+		(m.name == "scalatest" && m.revision == "1.0")
+	/** Extra dependencies to add if a dependency on an older test framework (one released before the uniform test interface) is declared.
+	* This is the compatibility test framework by default.*/
+	def compatTestFramework = Set("org.scala-tools.sbt" %% "test-compat" % "0.4.0" % "test")
+	
 	def defaultModuleSettings: ModuleSettings =
 	{
 		val in = inlineSettings
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index c7a1c91c0..ab854c1dc 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -177,8 +177,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	* run*/
 	def testFrameworks: Seq[TestFramework] = 
 	{
-		import TestFrameworks.{JUnit, ScalaCheck, ScalaTest, Specs}
-		ScalaCheck :: Specs :: ScalaTest :: JUnit :: Nil
+		import TestFrameworks.{JUnit, ScalaCheck, ScalaTest, Specs, ScalaCheckCompat, ScalaTestCompat, SpecsCompat}
+		ScalaCheck :: Specs :: ScalaTest :: JUnit :: ScalaCheckCompat :: ScalaTestCompat :: SpecsCompat :: Nil
 	}
 	/** The list of listeners for testing. */
 	def testListeners: Seq[TestReportListener] = TestLogger(log) :: Nil
diff --git a/src/main/scala/sbt/TestFramework.scala b/src/main/scala/sbt/TestFramework.scala
index ea7303b8e..14e432979 100644
--- a/src/main/scala/sbt/TestFramework.scala
+++ b/src/main/scala/sbt/TestFramework.scala
@@ -18,6 +18,10 @@ object TestFrameworks
 	val ScalaTest = new TestFramework("org.scalatest.tools.ScalaTestFramework")
 	val Specs = new TestFramework("org.specs.runner.SpecsFramework")
 	val JUnit = new TestFramework("com.novocode.junit.JUnitFramework")
+	// These are compatibility frameworks included in the 'test-compat' library
+	val ScalaCheckCompat = new TestFramework("sbt.impl.ScalaCheckFramework")
+	val ScalaTestCompat = new TestFramework("sbt.impl.ScalaTestFramework")
+	val SpecsCompat = new TestFramework("sbt.impl.SpecsFramework")
 }
 
 class TestFramework(val implClassName: String) extends NotNull
diff --git a/src/main/scala/sbt/TestReportListener.scala b/src/main/scala/sbt/TestReportListener.scala
index 938b008f9..bab4a0cda 100644
--- a/src/main/scala/sbt/TestReportListener.scala
+++ b/src/main/scala/sbt/TestReportListener.scala
@@ -73,8 +73,7 @@ class TestLogger(val log: TLogger) extends TestsListener
 	def testEvent(event: TestEvent): Unit = event.detail.foreach(count)
 	def endGroup(name: String, t: Throwable)
 	{
-		// log.trace(t) : need to add a trace method to org.scalatools.testing.Logger
-		try { log.getClass.getMethod("trace", classOf[Throwable]).invoke(log, t) } catch { case e: Exception => () }
+		log.trace(t)
 		log.error("Could not run test " + name + ": " + t.toString)
 	}
 	def endGroup(name: String, result: Result.Value) {}
diff --git a/src/sbt-test/tests/scalacheck-compat/project/build.properties b/src/sbt-test/tests/scalacheck-compat/project/build.properties
new file mode 100644
index 000000000..6165fa252
--- /dev/null
+++ b/src/sbt-test/tests/scalacheck-compat/project/build.properties
@@ -0,0 +1,2 @@
+project.name=ScalaTest Compatibility Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala b/src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala
new file mode 100644
index 000000000..650e9bff2
--- /dev/null
+++ b/src/sbt-test/tests/scalacheck-compat/project/build/CompatScalaCheck.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class CompatScalaTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	val specs = "org.scala-tools.testing" % "scalacheck" % "1.6" % "test"
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala b/src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala
new file mode 100644
index 000000000..4b33d47e3
--- /dev/null
+++ b/src/sbt-test/tests/scalacheck-compat/src/test/scala/Failure.scala
@@ -0,0 +1,20 @@
+import org.scalacheck._
+
+object Failure extends Properties("String") {
+  property("startsWith") = Prop.forAll((a: String, b: String) => (a+b).startsWith(a))
+
+  property("endsWith") = Prop.forAll((a: String, b: String) => (a+b).endsWith(b))
+
+  // Is this really always true?
+  property("concat") = Prop.forAll((a: String, b: String) =>
+    (a+b).length > a.length && (a+b).length > b.length
+  )
+
+  property("substring") = Prop.forAll((a: String, b: String) =>
+    (a+b).substring(a.length) == b
+  )
+
+  property("substring") = Prop.forAll((a: String, b: String, c: String) =>
+    (a+b+c).substring(a.length, a.length+b.length) == b
+  )
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala b/src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala
new file mode 100644
index 000000000..270132dea
--- /dev/null
+++ b/src/sbt-test/tests/scalacheck-compat/src/test/scala/Success.scala
@@ -0,0 +1,15 @@
+import org.scalacheck._
+
+object Success extends Properties("String") {
+  property("startsWith") = Prop.forAll((a: String, b: String) => (a+b).startsWith(a))
+
+  property("endsWith") = Prop.forAll((a: String, b: String) => (a+b).endsWith(b))
+
+  property("substring") = Prop.forAll((a: String, b: String) =>
+    (a+b).substring(a.length) == b
+  )
+
+  property("substring") = Prop.forAll((a: String, b: String, c: String) =>
+    (a+b+c).substring(a.length, a.length+b.length) == b
+  )
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalacheck-compat/test b/src/sbt-test/tests/scalacheck-compat/test
new file mode 100644
index 000000000..8476eb245
--- /dev/null
+++ b/src/sbt-test/tests/scalacheck-compat/test
@@ -0,0 +1,28 @@
+> ++2.7.2
+> update
+> test-only Success
+-> test-only Failure
+> ++2.7.3
+> update
+> test-only Success
+-> test-only Failure
+
+> ++2.7.4
+> update
+> test-only Success
+-> test-only Failure
+
+> ++2.7.5
+> update
+> test-only Success
+-> test-only Failure
+
+> ++2.7.6
+> update
+> test-only Success
+-> test-only Failure
+
+> ++2.7.7
+> update
+> test-only Success
+-> test-only Failure
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalatest-compat/project/build.properties b/src/sbt-test/tests/scalatest-compat/project/build.properties
new file mode 100644
index 000000000..6165fa252
--- /dev/null
+++ b/src/sbt-test/tests/scalatest-compat/project/build.properties
@@ -0,0 +1,2 @@
+project.name=ScalaTest Compatibility Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala b/src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala
new file mode 100644
index 000000000..f064eab3e
--- /dev/null
+++ b/src/sbt-test/tests/scalatest-compat/project/build/CompatScalaTest.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class CompatScalaTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	val specs = "org.scalatest" % "scalatest" % "1.0" % "test"
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala b/src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala
new file mode 100644
index 000000000..ce1de3b0f
--- /dev/null
+++ b/src/sbt-test/tests/scalatest-compat/src/test/scala/Failure.scala
@@ -0,0 +1,21 @@
+/** The ScalaTest example on the home page, but failing.. */
+
+import org.scalatest.FlatSpec
+import org.scalatest.matchers.ShouldMatchers
+import scala.collection.mutable.Stack
+
+class Failure extends FlatSpec with ShouldMatchers {
+
+  "A Stack" should "pop values in last-in-first-out order" in {
+    val stack = new Stack[Int]
+    stack.push(1)
+    stack.push(2)
+    stack.pop() should equal (2)
+    stack.pop() should equal (19) // should fail
+  }
+
+  it should "throw NoSuchElementException if an empty stack is popped" in {
+    val emptyStack = new Stack[String]
+    evaluating { emptyStack.pop() } should produce [NoSuchElementException]
+  }
+}
diff --git a/src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala b/src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala
new file mode 100644
index 000000000..3f39a585b
--- /dev/null
+++ b/src/sbt-test/tests/scalatest-compat/src/test/scala/Success.scala
@@ -0,0 +1,21 @@
+/** The ScalaTest example on the home page. */
+
+import org.scalatest.FlatSpec
+import org.scalatest.matchers.ShouldMatchers
+import scala.collection.mutable.Stack
+
+class StackSpecSuccess extends FlatSpec with ShouldMatchers {
+
+  "A Stack" should "pop values in last-in-first-out order" in {
+    val stack = new Stack[Int]
+    stack.push(1)
+    stack.push(2)
+    stack.pop() should equal (2)
+    stack.pop() should equal (1)
+  }
+
+  it should "throw NoSuchElementException if an empty stack is popped" in {
+    val emptyStack = new Stack[String]
+    evaluating { emptyStack.pop() } should produce [NoSuchElementException]
+  }
+}
diff --git a/src/sbt-test/tests/scalatest-compat/test b/src/sbt-test/tests/scalatest-compat/test
new file mode 100644
index 000000000..943bb2d7d
--- /dev/null
+++ b/src/sbt-test/tests/scalatest-compat/test
@@ -0,0 +1,9 @@
+> ++2.7.5
+> update
+> test-only Success
+-> test-only Failure
+
+> ++2.7.7
+> update
+> test-only Success
+-> test-only Failure
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-compat/project/build.properties b/src/sbt-test/tests/specs-compat/project/build.properties
new file mode 100644
index 000000000..658e0505b
--- /dev/null
+++ b/src/sbt-test/tests/specs-compat/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Specs Compatibility Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala b/src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala
new file mode 100644
index 000000000..eee281dd8
--- /dev/null
+++ b/src/sbt-test/tests/specs-compat/project/build/CompatSpecsTest.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class CompatSpecsTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	val specs = "org.scala-tools.testing" % "specs" % "1.6.0" % "test"
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala b/src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala
new file mode 100644
index 000000000..b71e69285
--- /dev/null
+++ b/src/sbt-test/tests/specs-compat/src/test/scala/Fail.scala
@@ -0,0 +1,10 @@
+import org.specs._
+
+object Failure extends Specification {
+  "'hello world' has 11 characters" in {
+     "hello world".size must be equalTo(12)
+  }
+  "'hello world' matches 'h.* w.*'" in {
+     "hello world" must be matching("h.* w.*")
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-compat/src/test/scala/Success.scala b/src/sbt-test/tests/specs-compat/src/test/scala/Success.scala
new file mode 100644
index 000000000..6c3406584
--- /dev/null
+++ b/src/sbt-test/tests/specs-compat/src/test/scala/Success.scala
@@ -0,0 +1,10 @@
+import org.specs._
+
+object Success extends Specification {
+  "'hello world' has 11 characters" in {
+     "hello world".size must be equalTo(11)
+  }
+  "'hello world' matches 'h.* w.*'" in {
+     "hello world" must be matching("h.* w.*")
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-compat/test b/src/sbt-test/tests/specs-compat/test
new file mode 100644
index 000000000..943bb2d7d
--- /dev/null
+++ b/src/sbt-test/tests/specs-compat/test
@@ -0,0 +1,9 @@
+> ++2.7.5
+> update
+> test-only Success
+-> test-only Failure
+
+> ++2.7.7
+> update
+> test-only Success
+-> test-only Failure
\ No newline at end of file

From 31609f57e628a2d622e75cbc46104f1ead45f31b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 26 Jan 2010 09:38:28 -0500
Subject: [PATCH 211/268] test to check proper tracking of generated classes

---
 .../compactify/project/build.properties       |  2 +
 .../project/build/CompactifyTest.scala        |  7 +++
 .../compactify/src/main/scala/For.scala       | 44 +++++++++++++++++++
 .../compactify/src/main/scala/Nested.scala    | 41 +++++++++++++++++
 .../source-dependencies/compactify/test       |  6 +++
 5 files changed, 100 insertions(+)
 create mode 100644 src/sbt-test/source-dependencies/compactify/project/build.properties
 create mode 100644 src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
 create mode 100644 src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
 create mode 100644 src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
 create mode 100644 src/sbt-test/source-dependencies/compactify/test

diff --git a/src/sbt-test/source-dependencies/compactify/project/build.properties b/src/sbt-test/source-dependencies/compactify/project/build.properties
new file mode 100644
index 000000000..be8323d58
--- /dev/null
+++ b/src/sbt-test/source-dependencies/compactify/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Compactify Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala b/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
new file mode 100644
index 000000000..7403dfd1d
--- /dev/null
+++ b/src/sbt-test/source-dependencies/compactify/project/build/CompactifyTest.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class CompactifyTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	def classes = (outputPath ** "*.class").get
+	lazy val outputEmpty = task { if(classes.isEmpty) None else Some("Classes existed:\n\t" + classes.mkString("\n\t")) }
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala b/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
new file mode 100644
index 000000000..5d1b8c4db
--- /dev/null
+++ b/src/sbt-test/source-dependencies/compactify/src/main/scala/For.scala
@@ -0,0 +1,44 @@
+package somereallylongpackagenamethatwilltestsbtsanalyzer_somereallylongpackagenamethatwilltestsbtsanalyzer.somereallylongpackagenamethatwilltestsbtsanalyzer
+
+object T
+{
+	val y = List(3)
+	for(a <- y;
+		b <- y;
+		c <- y;
+		d <- y;
+		e <- y;
+		f <- y;
+		g <- y;
+		h <- y;
+		i <- y;
+		j <- y;
+		k <- y;
+		l <- y;
+		m <- y;
+		n <- y;
+		o <- y;
+		p <- y;
+		q <- y;
+		r <- y;
+		s <- y;
+		t <- y;
+		u <- y;
+		v <- y;
+		w <- y;
+		x <- y;
+		yx <- y;
+		z <- y;
+		aa <- y;
+		bb <- y;
+		cc <- y;
+		dd <- y;
+		ee <- y;
+		ff <- y;
+		gg <- y;
+		hh<- y;
+		ii <- y;
+		jj <- y;
+		kk <- y
+	) yield a + b + c + d + e
+}
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala b/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
new file mode 100644
index 000000000..798868d72
--- /dev/null
+++ b/src/sbt-test/source-dependencies/compactify/src/main/scala/Nested.scala
@@ -0,0 +1,41 @@
+package test
+
+object TopLevelModule1
+{
+	object InnerModule1
+	{
+		object InnerModule2
+		{
+			trait Z { def q = 3 }
+			def x = 3
+		}
+	}
+	class InnerClass1
+	{
+		class InnerClass2
+		{
+			val z = new TopLevelModule1.InnerClass2
+		}
+		object InnerModule3
+		{
+			val y = new TopLevel1 with InnerModule1.InnerModule2.Z { val x = 4 }
+		}
+	}
+	class InnerClass2
+}
+class TopLevel1
+{
+	object Inner1_1
+}
+object TopLevel1
+{
+	class Inner1_2
+	object Inner1_2
+}
+
+object TopLevel2
+class TopLevel2
+
+object TopLevel3
+
+class TopLevel4
\ No newline at end of file
diff --git a/src/sbt-test/source-dependencies/compactify/test b/src/sbt-test/source-dependencies/compactify/test
new file mode 100644
index 000000000..3ca1fb2cd
--- /dev/null
+++ b/src/sbt-test/source-dependencies/compactify/test
@@ -0,0 +1,6 @@
+> output-empty
+> compile
+-> output-empty
+$ delete src/main/scala/For.scala src/main/scala/Nested.scala
+> compile
+> output-empty
\ No newline at end of file

From 1c6201d3cc241e28560591a450c9d76df84d8607 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 26 Jan 2010 18:39:23 -0500
Subject: [PATCH 212/268] Reload sbt when version changes without requiring
 full reload

---
 src/main/scala/sbt/Main.scala        | 21 ++++---------------
 src/main/scala/sbt/MainControl.scala | 31 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 src/main/scala/sbt/MainControl.scala

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index ef1133661..8c2375b0f 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -6,17 +6,6 @@ package sbt
 import java.io.File
 import scala.collection.immutable.TreeSet
 
-private case class Exit(code: Int) extends xsbti.Exit
-{
-	require(code >= 0)
-}
-private case class Reboot(val scalaVersion: String, argsList: List[String], configuration: xsbti.AppConfiguration) extends xsbti.Reboot
-{
-	def app = configuration.provider.id
-	def arguments = argsList.toArray
-	def baseDirectory = configuration.baseDirectory
-}
-
 /** This class is the entry point for sbt.  If it is given any arguments, it interprets them
 * as actions, executes the corresponding actions, and exits.  If there were no arguments provided,
 * sbt enters interactive mode.*/
@@ -152,7 +141,9 @@ class xMain extends xsbti.AppMain
 			{
 				case "" :: tail => continue(project, tail, failAction)
 				case (ExitCommand | QuitCommand) :: _ => result( Exit(NormalExitCode) )
-				case RebootCommand :: tail => throw new xsbti.FullReload(rememberCurrent(tail).toArray)
+				case RebootCommand :: tail =>
+					val newID = new ApplicationID(configuration.provider.id, baseProject.sbtVersion.value)
+					result( new Reboot(project.defScalaVersion.value, rememberCurrent(tail), newID, configuration.baseDirectory) )
 				case InteractiveCommand :: _ => continue(project, prompt(baseProject, project) :: arguments, interactiveContinue)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)
@@ -704,8 +695,4 @@ class xMain extends xsbti.AppMain
 	private def setProjectError(log: Logger) = logError(log)("Invalid arguments for 'project': expected project name.")
 	private def logError(log: Logger)(s: String) = { log.error(s); false }
 
-	private final class ReloadException(val remainingArguments: List[String], val buildScalaVersion: Option[String]) extends RuntimeException
-	{
-		override def fillInStackTrace = this
-	}
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/sbt/MainControl.scala b/src/main/scala/sbt/MainControl.scala
new file mode 100644
index 000000000..bd74859eb
--- /dev/null
+++ b/src/main/scala/sbt/MainControl.scala
@@ -0,0 +1,31 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010  Mark Harrah
+ */
+package sbt
+
+import java.io.File
+
+private case class Exit(code: Int) extends xsbti.Exit
+{
+	require(code >= 0)
+}
+private class Reboot(val scalaVersion: String, argsList: List[String], val app: xsbti.ApplicationID, val baseDirectory: File) extends xsbti.Reboot
+{
+	def arguments = argsList.toArray
+}
+private class ApplicationID(delegate: xsbti.ApplicationID, newVersion: String) extends xsbti.ApplicationID
+{
+	def groupID = delegate.groupID
+	def name = delegate.name
+	def version = newVersion
+	
+	def mainClass = delegate.mainClass
+	def mainComponents = delegate.mainComponents
+	def crossVersioned = delegate.crossVersioned
+	
+	def classpathExtra = delegate.classpathExtra
+}
+private final class ReloadException(val remainingArguments: List[String], val buildScalaVersion: Option[String]) extends RuntimeException
+{
+	override def fillInStackTrace = this
+}
\ No newline at end of file

From 5ef14bd5e8a7eeeb86812b0477ef1b8108511663 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 26 Jan 2010 22:53:29 -0500
Subject: [PATCH 213/268] more on permgen issues

---
 src/main/scala/sbt/Main.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 8c2375b0f..c3d9b9e6d 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -29,8 +29,13 @@ class xMain extends xsbti.AppMain
 	{
 		def run0(remainingArguments: List[String], buildScalaVersion: Option[String]): xsbti.MainResult =
 		{
-			try { run(configuration, remainingArguments, buildScalaVersion) }
-			catch { case re: ReloadException => run0(re.remainingArguments, re.buildScalaVersion) }
+			// done this way because in Scala 2.7.7, tail recursion in catch blocks is not optimized
+			val result = try { Right(run(configuration, remainingArguments, buildScalaVersion)) } catch { case re: ReloadException => Left(re) }
+			result match
+			{
+				case Left(re) => run0(re.remainingArguments, re.buildScalaVersion)
+				case Right(r) => r
+			}
 		}
 		run0(configuration.arguments.map(_.trim).toList, None)
 	}

From fbaf5cbf2efac04a8ea0170c1976a67a87ef2362 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 28 Jan 2010 19:32:17 -0500
Subject: [PATCH 214/268]  * Use a machine-global lock on Ivy because caches
 are not safe for concurrent access.  * Fix some tests

---
 scripted/project/build.properties                         | 4 +++-
 scripted/src/main/scala/ScriptedTests.scala               | 8 ++++----
 src/main/scala/sbt/BasicProjectTypes.scala                | 6 +++---
 src/sbt-test/project/src-plugins/changes/Plugins.scala    | 3 +--
 .../project/src-plugins/project/build/DefinePlugin.scala  | 3 +--
 src/sbt-test/properties/multi-project-a/test              | 2 +-
 src/sbt-test/properties/multi-project-b/test              | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 93b1658d7..fce1a3e59 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,6 +1,8 @@
+#Project properties
+#Thu Jan 28 10:55:25 EST 2010
 project.organization=org.scala-tools.sbt
 project.name=scripted
 sbt.version=0.5.6
-project.version=0.6.10-SNAPSHOT
+project.version=0.6.12-SNAPSHOT
 scala.version=2.7.7
 project.initialize=false
diff --git a/scripted/src/main/scala/ScriptedTests.scala b/scripted/src/main/scala/ScriptedTests.scala
index 1d8ab4493..6c8265bff 100644
--- a/scripted/src/main/scala/ScriptedTests.scala
+++ b/scripted/src/main/scala/ScriptedTests.scala
@@ -88,11 +88,11 @@ object FillProperties
 		import CompatibilityLevel._
 		level match
 		{
-			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1-RC6 2.8.0-SNAPSHOT"
-			case Basic =>  "2.7.7 2.7.2 2.8.0.Beta1-RC6"
-			case Minimal => "2.7.7 2.8.0.Beta1-RC6" 
+			case Full =>  "2.7.2 2.7.3 2.7.5 2.7.7 2.8.0.Beta1 2.8.0-SNAPSHOT"
+			case Basic =>  "2.7.7 2.7.2 2.8.0.Beta1"
+			case Minimal => "2.7.7 2.8.0.Beta1" 
 			case Minimal27 => "2.7.7"
-			case Minimal28 => "2.8.0.Beta1-RC6"
+			case Minimal28 => "2.8.0.Beta1"
 		}
 	}
 	def extraProperties(sbtVersion: String, defScalaVersion: String, buildScalaVersions: String) = 
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index f6d835aeb..69324a230 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -183,7 +183,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	def ivyCacheDirectory: Option[Path] = None
 	
 	def ivyPaths: IvyPaths = new IvyPaths(info.projectPath.asFile, ivyCacheDirectory.map(_.asFile))
-	def inlineIvyConfiguration = new InlineIvyConfiguration(ivyPaths, ivyRepositories.toSeq, moduleConfigurations.toSeq, log)
+	def inlineIvyConfiguration = new InlineIvyConfiguration(ivyPaths, ivyRepositories.toSeq, moduleConfigurations.toSeq, Some(info.launcher.globalLock), log)
 	def ivyConfiguration: IvyConfiguration =
 	{
 		val in = inlineIvyConfiguration
@@ -192,14 +192,14 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		{
 			 if(in.moduleConfigurations.isEmpty)
 			 {
-				IvyConfiguration(in.paths, in.log) match
+				IvyConfiguration(in.paths, in.lock, in.log) match
 				{
 					case e: ExternalIvyConfiguration => e
 					case i => info.parent map(parentIvyConfiguration(i)) getOrElse(i)
 				}
 			}
 			else
-				new InlineIvyConfiguration(in.paths, Resolver.withDefaultResolvers(Nil), in.moduleConfigurations, in.log)
+				new InlineIvyConfiguration(in.paths, Resolver.withDefaultResolvers(Nil), in.moduleConfigurations, in.lock, in.log)
 		}
 		else
 			in
diff --git a/src/sbt-test/project/src-plugins/changes/Plugins.scala b/src/sbt-test/project/src-plugins/changes/Plugins.scala
index 20f91dc6e..31492926e 100644
--- a/src/sbt-test/project/src-plugins/changes/Plugins.scala
+++ b/src/sbt-test/project/src-plugins/changes/Plugins.scala
@@ -2,8 +2,7 @@ import sbt._
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	override def managedStyle = ManagedStyle.Ivy
 	def projectRoot = Path.fromFile(info.projectPath.asFile.getParentFile.getParentFile)
diff --git a/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala b/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
index 7f063b03f..c382f3cc3 100644
--- a/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
+++ b/src/sbt-test/project/src-plugins/project/build/DefinePlugin.scala
@@ -2,8 +2,7 @@ import sbt._
 
 class DefinePlugin(info: ProjectInfo) extends PluginProject(info)
 {
-	def ivyCacheDirectory = outputPath / "ivy-cache"
-	override def updateOptions =  CacheDirectory(ivyCacheDirectory) :: super.updateOptions.toList
+	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
 
 	override def managedStyle = ManagedStyle.Ivy
 	val publishTo = Resolver.file("test-repo", ("repo" / "test").asFile)
diff --git a/src/sbt-test/properties/multi-project-a/test b/src/sbt-test/properties/multi-project-a/test
index 4806c9649..0f271e5f8 100644
--- a/src/sbt-test/properties/multi-project-a/test
+++ b/src/sbt-test/properties/multi-project-a/test
@@ -1,4 +1,4 @@
-> project "Sub project A"
+> project Sub project A
 > get sbt.version
 $ absent a/project
 $ absent b/project
\ No newline at end of file
diff --git a/src/sbt-test/properties/multi-project-b/test b/src/sbt-test/properties/multi-project-b/test
index 4806c9649..0f271e5f8 100644
--- a/src/sbt-test/properties/multi-project-b/test
+++ b/src/sbt-test/properties/multi-project-b/test
@@ -1,4 +1,4 @@
-> project "Sub project A"
+> project Sub project A
 > get sbt.version
 $ absent a/project
 $ absent b/project
\ No newline at end of file

From 8bc87fecefb5b774e8edc53acbc431652059fdf1 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 28 Jan 2010 22:09:48 -0500
Subject: [PATCH 215/268] 0.6.12

---
 project/build.properties          | 2 +-
 project/plugins/Plugins.scala     | 2 +-
 scripted/project/build.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 462c75965..4b8b506f7 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.12-SNAPSHOT
+project.version=0.6.12
 scala.version=2.7.7
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index c3f30360e..dd0152155 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,6 +4,6 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.9"
+	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.12"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index fce1a3e59..b30394680 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -3,6 +3,6 @@
 project.organization=org.scala-tools.sbt
 project.name=scripted
 sbt.version=0.5.6
-project.version=0.6.12-SNAPSHOT
+project.version=0.6.12
 scala.version=2.7.7
 project.initialize=false

From 3877cd4d844d954725a34e9115c8540d1b7840fd Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 29 Jan 2010 20:32:43 -0500
Subject: [PATCH 216/268]  * Fix base directory when Ivy configuration
 inherited from parent project  * Add 'pomExtra' method that can provide extra
 elements directly embedded in a generated pom.

---
 src/main/scala/sbt/BasicProjectTypes.scala        | 15 +++++++++------
 .../project/build/MultiPublishTest.scala          |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 69324a230..9477643dd 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -3,6 +3,7 @@
  */
 package sbt
 
+import scala.xml.NodeSeq
 import StringUtilities.{appendable,nonEmpty}
 
 /** A project that provides a classpath. */
@@ -84,8 +85,8 @@ trait IvyTasks extends Project
 			import deliverConfig._
 			IvyActions.deliver(module, status, deliveredPattern, extraDependencies, configurations, quiet)
 		}
-	def makePomTask(module: => IvySbt#Module, output: => Path, extraDependencies: => Iterable[ModuleID], configurations: => Option[Iterable[Configuration]]) =
-		ivyTask { IvyActions.makePom(module, extraDependencies, configurations, output asFile) }
+	def makePomTask(module: => IvySbt#Module, output: => Path, extraDependencies: => Iterable[ModuleID], pomExtra: => NodeSeq, configurations: => Option[Iterable[Configuration]]) =
+		ivyTask { IvyActions.makePom(module, extraDependencies, configurations, pomExtra, output asFile) }
 
 	def installTask(module: IvySbt#Module, from: Resolver, to: Resolver) =
 		ivyTask { IvyActions.install(module, from.name, to.name) }
@@ -187,7 +188,8 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	def ivyConfiguration: IvyConfiguration =
 	{
 		val in = inlineIvyConfiguration
-		def parentIvyConfiguration(default: IvyConfiguration)(p: Project) = p match { case b: BasicManagedProject => b.ivyConfiguration; case _ => default }
+		def adapt(c: IvyConfiguration): IvyConfiguration = c.withBase(in.baseDirectory)
+		def parentIvyConfiguration(default: IvyConfiguration)(p: Project) = p match { case b: BasicManagedProject => adapt(b.ivyConfiguration); case _ => default }
 		if(in.resolvers.isEmpty)
 		{
 			 if(in.moduleConfigurations.isEmpty)
@@ -260,7 +262,8 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	def outputPattern = "[conf]/[artifact](-[revision])(-[classifier]).[ext]"
 	/** Override this to specify the publications, configurations, and/or dependencies sections of an Ivy file.
 	* See http://code.google.com/p/simple-build-tool/wiki/LibraryManagement for details.*/
-	def ivyXML: scala.xml.NodeSeq = scala.xml.NodeSeq.Empty
+	def ivyXML: NodeSeq = NodeSeq.Empty
+	def pomExtra: NodeSeq = NodeSeq.Empty
 	def expandedIvyConfigurations =
 	{
 		val confs = ivyConfigurations
@@ -370,7 +373,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		interDependencies.readOnly
 	}
 	protected def deliverScalaDependencies: Iterable[ModuleID] = Nil
-	protected def makePomAction = makePomTask(deliverIvyModule, pomPath, deliverProjectDependencies, None)
+	protected def makePomAction = makePomTask(deliverIvyModule, pomPath, deliverProjectDependencies, pomExtra, None)
 	protected def deliverLocalAction = deliverTask(deliverIvyModule, publishLocalConfiguration, true /*quiet*/)
 	protected def publishLocalAction =
 	{
@@ -595,7 +598,7 @@ trait ReflectiveArtifacts extends ManagedProject
 		val reflective = reflectiveArtifacts
 		managedStyle match
 		{
-			case Maven =>reflective ++ List(Artifact(artifactID, "pom", "pom"))
+			case Maven => reflective ++ List(Artifact(artifactID, "pom", "pom"))
 			case Ivy => reflective
 			case Auto => Set.empty
 		}
diff --git a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
index c16f029fb..da0e50424 100644
--- a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
+++ b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
@@ -7,7 +7,7 @@ class MultiPublishTest(info: ProjectInfo) extends ParentProject(info)
 			ManagedStyle.Maven
 		else
 			ManagedStyle.Auto
-	override def ivyCacheDirectory = Some(outputPath / "ivy-cache")
+	override def ivyCacheDirectory = Some(outputPath / "ivy" / "cache")
 	
 	lazy val sub = project("sub", "Sub Project", new SubProject(_))
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)

From 3cf2ff4e4f9d347aa7cbb9d8ac666bb83b4a1c9b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 29 Jan 2010 20:35:03 -0500
Subject: [PATCH 217/268] version bumps

---
 project/build.properties          | 2 +-
 scripted/project/build.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 4b8b506f7..ea816b43f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.12
+project.version=0.6.13-SNAPSHOT
 scala.version=2.7.7
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index b30394680..0944e8938 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -3,6 +3,6 @@
 project.organization=org.scala-tools.sbt
 project.name=scripted
 sbt.version=0.5.6
-project.version=0.6.12
+project.version=0.6.13-SNAPSHOT
 scala.version=2.7.7
 project.initialize=false

From f0b7fa0e1a663d381abcf5f43eeb5f178a21fefe Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 29 Jan 2010 20:48:59 -0500
Subject: [PATCH 218/268] Test for specs/sbt detecting specifications as
 classes/objects

---
 .../changes/ClassFailModuleFail.scala         | 15 ++++++++++++
 .../changes/ClassFailModuleSuccess.scala      | 15 ++++++++++++
 .../changes/ClassSuccessModuleFail.scala      | 15 ++++++++++++
 .../changes/ClassSuccessModuleSuccess.scala   | 15 ++++++++++++
 .../tests/specs-run/project/build.properties  |  2 ++
 .../specs-run/project/build/TestProject.scala |  6 +++++
 src/sbt-test/tests/specs-run/test             | 23 +++++++++++++++++++
 7 files changed, 91 insertions(+)
 create mode 100644 src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala
 create mode 100644 src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala
 create mode 100644 src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala
 create mode 100644 src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala
 create mode 100644 src/sbt-test/tests/specs-run/project/build.properties
 create mode 100644 src/sbt-test/tests/specs-run/project/build/TestProject.scala
 create mode 100644 src/sbt-test/tests/specs-run/test

diff --git a/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala b/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala
new file mode 100644
index 000000000..002c8ddbf
--- /dev/null
+++ b/src/sbt-test/tests/specs-run/changes/ClassFailModuleFail.scala
@@ -0,0 +1,15 @@
+import org.specs._
+
+class A extends Specification
+{
+	"this" should {
+    "not work" in { 1 must_== 2 }
+  }
+}
+
+object A extends Specification
+{
+	"this" should {
+    "not work" in { 1 must_== 2 }
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala b/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala
new file mode 100644
index 000000000..8c3b7eb0f
--- /dev/null
+++ b/src/sbt-test/tests/specs-run/changes/ClassFailModuleSuccess.scala
@@ -0,0 +1,15 @@
+import org.specs._
+
+class A extends Specification
+{
+	"this" should {
+    "not work" in { 1 must_== 2 }
+  }
+}
+
+object A extends Specification
+{
+	"this" should {
+    "work" in { 1 must_== 1 }
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala
new file mode 100644
index 000000000..37801473b
--- /dev/null
+++ b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleFail.scala
@@ -0,0 +1,15 @@
+import org.specs._
+
+class A extends Specification
+{
+	"this" should {
+    "work" in { 1 must_== 1 }
+  }
+}
+
+object A extends Specification
+{
+	"this" should {
+    "not work" in { 1 must_== 2 }
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala
new file mode 100644
index 000000000..2827d30ea
--- /dev/null
+++ b/src/sbt-test/tests/specs-run/changes/ClassSuccessModuleSuccess.scala
@@ -0,0 +1,15 @@
+import org.specs._
+
+class A extends Specification
+{
+	"this" should {
+    "work" in { 1 must_== 1 }
+  }
+}
+
+object A extends Specification
+{
+	"this" should {
+    "work" in { 1 must_== 1 }
+  }
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-run/project/build.properties b/src/sbt-test/tests/specs-run/project/build.properties
new file mode 100644
index 000000000..fe72372e7
--- /dev/null
+++ b/src/sbt-test/tests/specs-run/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Specs Test Type Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-run/project/build/TestProject.scala b/src/sbt-test/tests/specs-run/project/build/TestProject.scala
new file mode 100644
index 000000000..cba60bdda
--- /dev/null
+++ b/src/sbt-test/tests/specs-run/project/build/TestProject.scala
@@ -0,0 +1,6 @@
+import sbt._
+
+class TestProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	val specs = "org.scala-tools.testing" %% "specs" % "1.6.1"
+}
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-run/test b/src/sbt-test/tests/specs-run/test
new file mode 100644
index 000000000..b3266bfb4
--- /dev/null
+++ b/src/sbt-test/tests/specs-run/test
@@ -0,0 +1,23 @@
+> ++2.8.0.Beta1-RC7
+> update
+
+> clean
+$ delete src/
+$ copy-file changes/ClassFailModuleSuccess.scala src/test/scala/Test.scala
+-> test
+
+> clean
+$ delete src/
+$ copy-file changes/ClassFailModuleFail.scala src/test/scala/Test.scala
+-> test
+
+> clean
+$ delete src/
+$ copy-file changes/ClassSuccessModuleFail.scala src/test/scala/Test.scala
+-> test
+
+
+> clean
+$ delete src/
+$ copy-file changes/ClassSuccessModuleSuccess.scala src/test/scala/Test.scala
+> test
\ No newline at end of file

From 510a708a08a1185e7353ffb5204c49129c0ba2ce Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 1 Feb 2010 07:38:10 -0500
Subject: [PATCH 219/268] Fix for compatibility test framework

---
 src/main/scala/sbt/BasicProjectTypes.scala | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 9477643dd..578190eab 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -221,15 +221,21 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		deps ++ compatExtra(deps)
 	}
 	/** Determines extra libraries needed for compatibility.  Currently, this is the compatibility test framework. */
-	private def compatExtra(deps: Set[ModuleID]) = if(deps.exists(requiresCompat)) compatTestFramework else Nil
+	private def compatExtra(deps: Set[ModuleID]) =
+		if(isScala27 && deps.exists(requiresCompat)) { log.debug("Using compatibility implementation of test interface."); compatTestFramework } else Nil
+	private def isScala27 = buildScalaVersion.startsWith("2.7.")
 	/** True if the given dependency requires the compatibility test framework. */
 	private def requiresCompat(m: ModuleID) =
-		(m.name == "scalacheck" && Set("1.5", "1.6").contains(m.revision)) ||
-		(m.name == "specs" && Set("1.6.0", "1.6.1").contains(m.revision)) ||
-		(m.name == "scalatest" && m.revision == "1.0")
+	{
+		def nameMatches(name: String, id: String) = name == id || name.startsWith(id + "_2.7.")
+		
+		(nameMatches(m.name, "scalacheck") && Set("1.5", "1.6").contains(m.revision)) ||
+		(nameMatches(m.name, "specs") && Set("1.6.0", "1.6.1").contains(m.revision)) ||
+		(nameMatches(m.name,  "scalatest") && m.revision == "1.0")
+	}
 	/** Extra dependencies to add if a dependency on an older test framework (one released before the uniform test interface) is declared.
 	* This is the compatibility test framework by default.*/
-	def compatTestFramework = Set("org.scala-tools.sbt" %% "test-compat" % "0.4.0" % "test")
+	def compatTestFramework = Set("org.scala-tools.sbt" %% "test-compat" % "0.4.1" % "test")
 	
 	def defaultModuleSettings: ModuleSettings =
 	{

From aaea9c3407a0215db1084739d44216a9980f7580 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 1 Feb 2010 18:21:51 -0500
Subject: [PATCH 220/268] Jetty 7 support (untested)

---
 project/build/SbtProject.scala                |  39 ++--
 src/main/scala/sbt/WebApp.scala               | 197 ++++--------------
 .../scala/sbt/jetty/LazyJettyRun.scala.templ  | 131 ++++++++++++
 src/main/scala/sbt/jetty/LazyJettyRun6.scala  | 137 ++++++++++++
 src/main/scala/sbt/jetty/LazyJettyRun7.scala  | 137 ++++++++++++
 src/main/scala/sbt/jetty/jetty6.imports       |   7 +
 src/main/scala/sbt/jetty/jetty7.imports       |   7 +
 7 files changed, 477 insertions(+), 178 deletions(-)
 create mode 100644 src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
 create mode 100644 src/main/scala/sbt/jetty/LazyJettyRun6.scala
 create mode 100644 src/main/scala/sbt/jetty/LazyJettyRun7.scala
 create mode 100644 src/main/scala/sbt/jetty/jetty6.imports
 create mode 100644 src/main/scala/sbt/jetty/jetty7.imports

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 23d538774..184ffb795 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -28,28 +28,13 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	// Configure which versions of Scala to test against for those tests that do cross building
 	override def scriptedCompatibility = sbt.test.CompatibilityLevel.Full
 
-	def scalaVersionString = ScalaVersion.current.getOrElse(scalaVersion.value)
-	override def mainSources =
-	{
-		if(scalaVersionString == Version2_8_0)
-				Path.lazyPathFinder( super.mainSources.get.filter( !_.asFile.getName.endsWith("TestFrameworkImpl.scala") ))
-		else
-				super.mainSources
-	}
-
 	override def useDefaultConfigurations = false
 	val default = Configurations.Default
 	val optional = Configurations.Optional
 	val provided = Configurations.Provided
 	val testConf = Configurations.Test
 
-	/* Versions of Scala to cross-build against. */
-	private val Version2_7_7 = "2.7.7"
-	private val Version2_8_0 = "2.8.0-SNAPSHOT"
-	// the list of all supported versions
-	private def allVersions = Version2_7_7 :: Version2_8_0 :: Nil
-
-	override def crossScalaVersions = Set(Version2_7_7)
+	override def crossScalaVersions = Set("2.7.7")
 
 	//testing
 	val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6" % "test"
@@ -57,6 +42,9 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val ivy = "org.apache.ivy" % "ivy" % "2.1.0" intransitive()
 	val jsch = "com.jcraft" % "jsch" % "0.1.31" intransitive()
 	val jetty = "org.mortbay.jetty" % "jetty" % "6.1.14" % "optional"
+	
+	val jetty7server = "org.eclipse.jetty" % "jetty-server" % "7.0.1.v20091125" % "optional"
+	val jetty7webapp = "org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "optional"
 
 	val testInterface = "org.scala-tools.testing" % "test-interface" % "0.4"
 
@@ -64,8 +52,19 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val xsbti = "org.scala-tools.sbt" % "launcher-interface" % projectVersion.value.toString % "provided"
 	val compiler = "org.scala-tools.sbt" %% "compile" % projectVersion.value.toString
 
-	override def libraryDependencies = super.libraryDependencies ++ getDependencies(scalaVersionString)
-
-	def getDependencies(scalaVersion: String) =
-		if(scalaVersion == Version2_8_0) Seq("jline" % "jline" % "0.9.94" intransitive()) else Nil
+	/* For generating JettyRun for Jetty 6 and 7.  The only difference is the imports, but the file has to be compiled against each set of imports. */
+	override def compileAction = super.compileAction dependsOn (generateJettyRun6, generateJettyRun7)
+	def jettySrcDir = mainScalaSourcePath / "sbt" / "jetty"
+	def jettyTemplate = jettySrcDir / "LazyJettyRun.scala.templ"
+	
+	lazy val generateJettyRun6 = generateJettyRun(jettyTemplate, jettySrcDir / "LazyJettyRun6.scala", "6", jettySrcDir / "jetty6.imports")
+	lazy val generateJettyRun7 = generateJettyRun(jettyTemplate, jettySrcDir / "LazyJettyRun7.scala", "7", jettySrcDir / "jetty7.imports")
+	def generateJettyRun(in: Path, out: Path, version: String, importsPath: Path) =
+		task
+		{
+			(for(template <- FileUtilities.readString(in asFile, log).right; imports <- FileUtilities.readString(importsPath asFile, log).right) yield
+				FileUtilities.write(out asFile, processJettyTemplate(template, version, imports), log).toLeft(()) ).left.toOption
+		}
+	def processJettyTemplate(template: String, version: String, imports: String): String =
+		template.replaceAll("""\Q${jetty.version}\E""", version).replaceAll("""\Q${jetty.imports}\E""", imports)
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index f6b2725cf..5d53917ee 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -41,8 +41,12 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 			
 			val dual = new xsbt.DualLoader(baseLoader, notJettyFilter, x => true, jettyLoader, jettyFilter, x => false)
 			
-			val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.classLocation[Stoppable].toURI.toURL), dual, baseLoader)
-			val runner = ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
+			def createRunner(implClassName: String) =
+			{
+				val lazyLoader = new LazyFrameworkLoader(implClassName, Array(FileUtilities.classLocation[Stoppable].toURI.toURL), dual, baseLoader)
+				ModuleUtilities.getObject(implClassName, lazyLoader).asInstanceOf[JettyRun]
+			}
+			val runner = try { createRunner(implClassName6) } catch { case e: NoClassDefFoundError => createRunner(implClassName7) }
 			runner(configuration, jettyLoader)
 		}
 
@@ -62,7 +66,8 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 			}
 		}
 	}
-	private val implClassName = "sbt.LazyJettyRun"
+	private val implClassName6 = "sbt.jetty.LazyJettyRun6"
+	private val implClassName7 = "sbt.jetty.LazyJettyRun7"
 
 	private def runError(e: Throwable, messageBase: String, log: Logger) =
 	{
@@ -105,165 +110,41 @@ abstract class CustomJettyConfiguration extends JettyConfiguration
 	def jettyConfigurationXML: NodeSeq = NodeSeq.Empty
 }
 
-/* This class starts Jetty.
-* NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
-*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
-*  the Jetty libraries provided on the project classpath instead of requiring them to be
-*  available on sbt's classpath at startup.
-*/
-private object LazyJettyRun extends JettyRun
+private class JettyLoggerBase(delegate: Logger)
 {
-	import org.mortbay.jetty.{Handler, Server}
-	import org.mortbay.jetty.nio.SelectChannelConnector
-	import org.mortbay.jetty.webapp.{WebAppClassLoader, WebAppContext}
-	import org.mortbay.log.Log
-	import org.mortbay.util.Scanner
-	import org.mortbay.xml.XmlConfiguration
+	def getName = "JettyLogger"
+	def isDebugEnabled = delegate.atLevel(Level.Debug)
+	def setDebugEnabled(enabled: Boolean) = delegate.setLevel(if(enabled) Level.Debug else Level.Info)
 
-	import java.lang.ref.{Reference, WeakReference}
-
-	val DefaultMaxIdleTime = 30000
-
-	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =
+	def info(msg: String) { delegate.info(msg) }
+	def debug(msg: String) { delegate.warn(msg) }
+	def warn(msg: String) { delegate.warn(msg) }
+	def info(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.info(format(msg, arg0, arg1)) }
+	def debug(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.debug(format(msg, arg0, arg1)) }
+	def warn(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.warn(format(msg, arg0, arg1)) }
+	def warn(msg: String, th: Throwable)
 	{
-		val oldLog = Log.getLog
-		Log.setLog(new JettyLogger(configuration.log))
-		val server = new Server
-
-		def configureScanner(listener: Scanner.BulkListener, scanDirectories: Seq[File], scanInterval: Int) =
+		delegate.warn(msg)
+		delegate.trace(th)
+	}
+	def debug(msg: String, th: Throwable)
+	{
+		delegate.debug(msg)
+		delegate.trace(th)
+	}
+	private def format(msg: String, arg0: AnyRef, arg1: AnyRef) =
+	{
+		def toString(arg: AnyRef) = if(arg == null) "" else arg.toString
+		val pieces = msg.split("""\{\}""", 3)
+		if(pieces.length == 1)
+			pieces(0)
+		else
 		{
-			if(scanDirectories.isEmpty)
-				None
+			val base = pieces(0) + toString(arg0) + pieces(1)
+			if(pieces.length == 2)
+				base
 			else
-			{
-				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
-				val scanner = new Scanner
-				val list = new java.util.ArrayList[File]
-				scanDirectories.foreach(x => list.add(x))
-				scanner.setScanDirs(list)
-				scanner.setRecursive(true)
-				scanner.setScanInterval(scanInterval)
-				scanner.setReportExistingFilesOnStartup(false)
-				scanner.addListener(listener)
-				scanner.start()
-				Some(new WeakReference(scanner))
-			}
-		}
-
-		val (listener, scanner) =
-			configuration match
-			{
-				case c: DefaultJettyConfiguration =>
-					import c._
-					configureDefaultConnector(server, port)
-					def classpathURLs = classpath.get.map(_.asURL).toSeq
-					val webapp = new WebAppContext(war.absolutePath, contextPath)
-					
-					def createLoader =
-					{
-						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
-						val loader = new SbtWebAppLoader
-						classpathURLs.foreach(loader.addURL)
-						loader
-					}
-					def setLoader() = webapp.setClassLoader(createLoader)
-					
-					setLoader()
-					server.setHandler(webapp)
-
-					val listener = new Scanner.BulkListener with Reload {
-						def reloadApp() = reload(server, setLoader(), log)
-						def filesChanged(files: java.util.List[_]) { reloadApp() }
-					}
-					(Some(listener), configureScanner(listener, c.scanDirectories, c.scanInterval))
-				case c: CustomJettyConfiguration =>
-					for(x <- c.jettyConfigurationXML)
-						(new XmlConfiguration(x.toString)).configure(server)
-					for(file <- c.jettyConfigurationFiles)
-						(new XmlConfiguration(file.toURI.toURL)).configure(server)
-					(None, None)
-			}
-
-		try
-		{
-			server.start()
-			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), scanner, oldLog)
-		}
-		catch { case e => server.stop(); throw e }
-	}
-	private def configureDefaultConnector(server: Server, port: Int)
-	{
-		val defaultConnector = new SelectChannelConnector
-		defaultConnector.setPort(port)
-		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
-		server.addConnector(defaultConnector)
-	}
-	trait Reload { def reloadApp(): Unit }
-	private class StopServer(serverReference: Reference[Server], reloadReference: Option[Reference[Reload]], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: org.mortbay.log.Logger) extends Stoppable
-	{
-		def reload(): Unit = on(reloadReference)(_.reloadApp())
-		private def on[T](refOpt: Option[Reference[T]])(f: T => Unit): Unit = refOpt.foreach(ref => onReferenced(ref.get)(f))
-		private def onReferenced[T](t: T)(f: T => Unit): Unit = if(t == null) () else f(t)
-		def stop()
-		{
-			onReferenced(serverReference.get)(_.stop())
-			on(scannerReferenceOpt)(_.stop())
-			Log.setLog(oldLog)
+				base + toString(arg1) + pieces(2)
 		}
 	}
-	private def reload(server: Server, reconfigure: => Unit, log: Logger)
-	{
-		log.info("Reloading web application...")
-		val handlers = wrapNull(server.getHandlers, server.getHandler)
-		log.debug("Stopping handlers: " + handlers.mkString(", "))
-		handlers.foreach(_.stop)
-		log.debug("Reconfiguring...")
-		reconfigure
-		log.debug("Restarting handlers: " + handlers.mkString(", "))
-		handlers.foreach(_.start)
-		log.info("Reload complete.")
-	}
-	private def wrapNull(a: Array[Handler], b: Handler) =
-		(a, b) match
-		{
-			case (null, null) => Nil
-			case (null, notB) => notB :: Nil
-			case (notA, null) => notA.toList
-			case (notA, notB) => notB :: notA.toList
-		}
-	private class JettyLogger(delegate: Logger) extends org.mortbay.log.Logger
-	{
-		def isDebugEnabled = delegate.atLevel(Level.Debug)
-		def setDebugEnabled(enabled: Boolean) = delegate.setLevel(if(enabled) Level.Debug else Level.Info)
-
-		def getLogger(name: String) = this
-		def info(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.info(format(msg, arg0, arg1)) }
-		def debug(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.debug(format(msg, arg0, arg1)) }
-		def warn(msg: String, arg0: AnyRef, arg1: AnyRef) { delegate.warn(format(msg, arg0, arg1)) }
-		def warn(msg: String, th: Throwable)
-		{
-			delegate.warn(msg)
-			delegate.trace(th)
-		}
-		def debug(msg: String, th: Throwable)
-		{
-			delegate.debug(msg)
-			delegate.trace(th)
-		}
-		private def format(msg: String, arg0: AnyRef, arg1: AnyRef) =
-		{
-			def toString(arg: AnyRef) = if(arg == null) "" else arg.toString
-			val pieces = msg.split("""\{\}""", 3)
-			if(pieces.length == 1)
-				pieces(0)
-			else
-			{
-				val base = pieces(0) + toString(arg0) + pieces(1)
-				if(pieces.length == 2)
-					base
-				else
-					base + toString(arg1) + pieces(2)
-			}
-		}
-	}
-}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
new file mode 100644
index 000000000..29f86a4a8
--- /dev/null
+++ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
@@ -0,0 +1,131 @@
+package sbt.jetty
+
+import java.io.File
+import java.net.URL
+
+/* This class starts Jetty.
+* NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
+*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
+*  the Jetty libraries provided on the project classpath instead of requiring them to be
+*  available on sbt's classpath at startup.
+*/
+private object LazyJettyRun${jetty.version} extends JettyRun
+{
+	${jetty.imports}
+
+	import java.lang.ref.{Reference, WeakReference}
+
+	val DefaultMaxIdleTime = 30000
+
+	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =
+	{
+		val oldLog = Log.getLog
+		Log.setLog(new JettyLogger(configuration.log))
+		val server = new Server
+
+		def configureScanner(listener: Scanner.BulkListener, scanDirectories: Seq[File], scanInterval: Int) =
+		{
+			if(scanDirectories.isEmpty)
+				None
+			else
+			{
+				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
+				val scanner = new Scanner
+				val list = new java.util.ArrayList[File]
+				scanDirectories.foreach(x => list.add(x))
+				scanner.setScanDirs(list)
+				scanner.setRecursive(true)
+				scanner.setScanInterval(scanInterval)
+				scanner.setReportExistingFilesOnStartup(false)
+				scanner.addListener(listener)
+				scanner.start()
+				Some(new WeakReference(scanner))
+			}
+		}
+
+		val (listener, scanner) =
+			configuration match
+			{
+				case c: DefaultJettyConfiguration =>
+					import c._
+					configureDefaultConnector(server, port)
+					def classpathURLs = classpath.get.map(_.asURL).toSeq
+					val webapp = new WebAppContext(war.absolutePath, contextPath)
+					
+					def createLoader =
+					{
+						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
+						val loader = new SbtWebAppLoader
+						classpathURLs.foreach(loader.addURL)
+						loader
+					}
+					def setLoader() = webapp.setClassLoader(createLoader)
+					
+					setLoader()
+					server.setHandler(webapp)
+
+					val listener = new Scanner.BulkListener with Reload {
+						def reloadApp() = reload(server, setLoader(), log)
+						def filesChanged(files: java.util.List[_]) { reloadApp() }
+					}
+					(Some(listener), configureScanner(listener, c.scanDirectories, c.scanInterval))
+				case c: CustomJettyConfiguration =>
+					for(x <- c.jettyConfigurationXML)
+						(new XmlConfiguration(x.toString)).configure(server)
+					for(file <- c.jettyConfigurationFiles)
+						(new XmlConfiguration(file.toURI.toURL)).configure(server)
+					(None, None)
+			}
+
+		try
+		{
+			server.start()
+			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), scanner, oldLog)
+		}
+		catch { case e => server.stop(); throw e }
+	}
+	private def configureDefaultConnector(server: Server, port: Int)
+	{
+		val defaultConnector = new SelectChannelConnector
+		defaultConnector.setPort(port)
+		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
+		server.addConnector(defaultConnector)
+	}
+	trait Reload { def reloadApp(): Unit }
+	private class StopServer(serverReference: Reference[Server], reloadReference: Option[Reference[Reload]], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: JLogger) extends Stoppable
+	{
+		def reload(): Unit = on(reloadReference)(_.reloadApp())
+		private def on[T](refOpt: Option[Reference[T]])(f: T => Unit): Unit = refOpt.foreach(ref => onReferenced(ref.get)(f))
+		private def onReferenced[T](t: T)(f: T => Unit): Unit = if(t == null) () else f(t)
+		def stop()
+		{
+			onReferenced(serverReference.get)(_.stop())
+			on(scannerReferenceOpt)(_.stop())
+			Log.setLog(oldLog)
+		}
+	}
+	private def reload(server: Server, reconfigure: => Unit, log: Logger)
+	{
+		log.info("Reloading web application...")
+		val handlers = wrapNull(server.getHandlers, server.getHandler)
+		log.debug("Stopping handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.stop)
+		log.debug("Reconfiguring...")
+		reconfigure
+		log.debug("Restarting handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.start)
+		log.info("Reload complete.")
+	}
+	private def wrapNull(a: Array[Handler], b: Handler) =
+		(a, b) match
+		{
+			case (null, null) => Nil
+			case (null, notB) => notB :: Nil
+			case (notA, null) => notA.toList
+			case (notA, notB) => notB :: notA.toList
+		}
+	private class JettyLogger(delegate: Logger) extends JettyLoggerBase(delegate) with JLogger
+	{
+		def getLogger(name: String) = this
+	}
+}
diff --git a/src/main/scala/sbt/jetty/LazyJettyRun6.scala b/src/main/scala/sbt/jetty/LazyJettyRun6.scala
new file mode 100644
index 000000000..30ea2c787
--- /dev/null
+++ b/src/main/scala/sbt/jetty/LazyJettyRun6.scala
@@ -0,0 +1,137 @@
+package sbt.jetty
+
+import java.io.File
+import java.net.URL
+
+/* This class starts Jetty.
+* NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
+*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
+*  the Jetty libraries provided on the project classpath instead of requiring them to be
+*  available on sbt's classpath at startup.
+*/
+private object LazyJettyRun6 extends JettyRun
+{
+	
+	import org.mortbay.jetty.{Handler, Server}
+	import org.mortbay.jetty.nio.SelectChannelConnector
+	import org.mortbay.jetty.webapp.{WebAppClassLoader, WebAppContext}
+	import org.mortbay.log.{Log, Logger => JLogger}
+	import org.mortbay.util.Scanner
+	import org.mortbay.xml.XmlConfiguration
+
+	import java.lang.ref.{Reference, WeakReference}
+
+	val DefaultMaxIdleTime = 30000
+
+	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =
+	{
+		val oldLog = Log.getLog
+		Log.setLog(new JettyLogger(configuration.log))
+		val server = new Server
+
+		def configureScanner(listener: Scanner.BulkListener, scanDirectories: Seq[File], scanInterval: Int) =
+		{
+			if(scanDirectories.isEmpty)
+				None
+			else
+			{
+				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
+				val scanner = new Scanner
+				val list = new java.util.ArrayList[File]
+				scanDirectories.foreach(x => list.add(x))
+				scanner.setScanDirs(list)
+				scanner.setRecursive(true)
+				scanner.setScanInterval(scanInterval)
+				scanner.setReportExistingFilesOnStartup(false)
+				scanner.addListener(listener)
+				scanner.start()
+				Some(new WeakReference(scanner))
+			}
+		}
+
+		val (listener, scanner) =
+			configuration match
+			{
+				case c: DefaultJettyConfiguration =>
+					import c._
+					configureDefaultConnector(server, port)
+					def classpathURLs = classpath.get.map(_.asURL).toSeq
+					val webapp = new WebAppContext(war.absolutePath, contextPath)
+					
+					def createLoader =
+					{
+						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
+						val loader = new SbtWebAppLoader
+						classpathURLs.foreach(loader.addURL)
+						loader
+					}
+					def setLoader() = webapp.setClassLoader(createLoader)
+					
+					setLoader()
+					server.setHandler(webapp)
+
+					val listener = new Scanner.BulkListener with Reload {
+						def reloadApp() = reload(server, setLoader(), log)
+						def filesChanged(files: java.util.List[_]) { reloadApp() }
+					}
+					(Some(listener), configureScanner(listener, c.scanDirectories, c.scanInterval))
+				case c: CustomJettyConfiguration =>
+					for(x <- c.jettyConfigurationXML)
+						(new XmlConfiguration(x.toString)).configure(server)
+					for(file <- c.jettyConfigurationFiles)
+						(new XmlConfiguration(file.toURI.toURL)).configure(server)
+					(None, None)
+			}
+
+		try
+		{
+			server.start()
+			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), scanner, oldLog)
+		}
+		catch { case e => server.stop(); throw e }
+	}
+	private def configureDefaultConnector(server: Server, port: Int)
+	{
+		val defaultConnector = new SelectChannelConnector
+		defaultConnector.setPort(port)
+		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
+		server.addConnector(defaultConnector)
+	}
+	trait Reload { def reloadApp(): Unit }
+	private class StopServer(serverReference: Reference[Server], reloadReference: Option[Reference[Reload]], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: JLogger) extends Stoppable
+	{
+		def reload(): Unit = on(reloadReference)(_.reloadApp())
+		private def on[T](refOpt: Option[Reference[T]])(f: T => Unit): Unit = refOpt.foreach(ref => onReferenced(ref.get)(f))
+		private def onReferenced[T](t: T)(f: T => Unit): Unit = if(t == null) () else f(t)
+		def stop()
+		{
+			onReferenced(serverReference.get)(_.stop())
+			on(scannerReferenceOpt)(_.stop())
+			Log.setLog(oldLog)
+		}
+	}
+	private def reload(server: Server, reconfigure: => Unit, log: Logger)
+	{
+		log.info("Reloading web application...")
+		val handlers = wrapNull(server.getHandlers, server.getHandler)
+		log.debug("Stopping handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.stop)
+		log.debug("Reconfiguring...")
+		reconfigure
+		log.debug("Restarting handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.start)
+		log.info("Reload complete.")
+	}
+	private def wrapNull(a: Array[Handler], b: Handler) =
+		(a, b) match
+		{
+			case (null, null) => Nil
+			case (null, notB) => notB :: Nil
+			case (notA, null) => notA.toList
+			case (notA, notB) => notB :: notA.toList
+		}
+	private class JettyLogger(delegate: Logger) extends JettyLoggerBase(delegate) with JLogger
+	{
+		def getLogger(name: String) = this
+	}
+}
diff --git a/src/main/scala/sbt/jetty/LazyJettyRun7.scala b/src/main/scala/sbt/jetty/LazyJettyRun7.scala
new file mode 100644
index 000000000..84ca8c7d5
--- /dev/null
+++ b/src/main/scala/sbt/jetty/LazyJettyRun7.scala
@@ -0,0 +1,137 @@
+package sbt.jetty
+
+import java.io.File
+import java.net.URL
+
+/* This class starts Jetty.
+* NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
+*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
+*  the Jetty libraries provided on the project classpath instead of requiring them to be
+*  available on sbt's classpath at startup.
+*/
+private object LazyJettyRun7 extends JettyRun
+{
+	
+	import org.eclipse.jetty.server.{Server, Handler}
+	import org.eclipse.jetty.server.nio.SelectChannelConnector
+	import org.eclipse.jetty.webapp.{WebAppClassLoader, WebAppContext}
+	import org.eclipse.jetty.util.log.{Log, Logger => JLogger}
+	import org.eclipse.jetty.util.Scanner
+	import org.eclipse.jetty.xml.XmlConfiguration
+
+	import java.lang.ref.{Reference, WeakReference}
+
+	val DefaultMaxIdleTime = 30000
+
+	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =
+	{
+		val oldLog = Log.getLog
+		Log.setLog(new JettyLogger(configuration.log))
+		val server = new Server
+
+		def configureScanner(listener: Scanner.BulkListener, scanDirectories: Seq[File], scanInterval: Int) =
+		{
+			if(scanDirectories.isEmpty)
+				None
+			else
+			{
+				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
+				val scanner = new Scanner
+				val list = new java.util.ArrayList[File]
+				scanDirectories.foreach(x => list.add(x))
+				scanner.setScanDirs(list)
+				scanner.setRecursive(true)
+				scanner.setScanInterval(scanInterval)
+				scanner.setReportExistingFilesOnStartup(false)
+				scanner.addListener(listener)
+				scanner.start()
+				Some(new WeakReference(scanner))
+			}
+		}
+
+		val (listener, scanner) =
+			configuration match
+			{
+				case c: DefaultJettyConfiguration =>
+					import c._
+					configureDefaultConnector(server, port)
+					def classpathURLs = classpath.get.map(_.asURL).toSeq
+					val webapp = new WebAppContext(war.absolutePath, contextPath)
+					
+					def createLoader =
+					{
+						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
+						val loader = new SbtWebAppLoader
+						classpathURLs.foreach(loader.addURL)
+						loader
+					}
+					def setLoader() = webapp.setClassLoader(createLoader)
+					
+					setLoader()
+					server.setHandler(webapp)
+
+					val listener = new Scanner.BulkListener with Reload {
+						def reloadApp() = reload(server, setLoader(), log)
+						def filesChanged(files: java.util.List[_]) { reloadApp() }
+					}
+					(Some(listener), configureScanner(listener, c.scanDirectories, c.scanInterval))
+				case c: CustomJettyConfiguration =>
+					for(x <- c.jettyConfigurationXML)
+						(new XmlConfiguration(x.toString)).configure(server)
+					for(file <- c.jettyConfigurationFiles)
+						(new XmlConfiguration(file.toURI.toURL)).configure(server)
+					(None, None)
+			}
+
+		try
+		{
+			server.start()
+			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), scanner, oldLog)
+		}
+		catch { case e => server.stop(); throw e }
+	}
+	private def configureDefaultConnector(server: Server, port: Int)
+	{
+		val defaultConnector = new SelectChannelConnector
+		defaultConnector.setPort(port)
+		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
+		server.addConnector(defaultConnector)
+	}
+	trait Reload { def reloadApp(): Unit }
+	private class StopServer(serverReference: Reference[Server], reloadReference: Option[Reference[Reload]], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: JLogger) extends Stoppable
+	{
+		def reload(): Unit = on(reloadReference)(_.reloadApp())
+		private def on[T](refOpt: Option[Reference[T]])(f: T => Unit): Unit = refOpt.foreach(ref => onReferenced(ref.get)(f))
+		private def onReferenced[T](t: T)(f: T => Unit): Unit = if(t == null) () else f(t)
+		def stop()
+		{
+			onReferenced(serverReference.get)(_.stop())
+			on(scannerReferenceOpt)(_.stop())
+			Log.setLog(oldLog)
+		}
+	}
+	private def reload(server: Server, reconfigure: => Unit, log: Logger)
+	{
+		log.info("Reloading web application...")
+		val handlers = wrapNull(server.getHandlers, server.getHandler)
+		log.debug("Stopping handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.stop)
+		log.debug("Reconfiguring...")
+		reconfigure
+		log.debug("Restarting handlers: " + handlers.mkString(", "))
+		handlers.foreach(_.start)
+		log.info("Reload complete.")
+	}
+	private def wrapNull(a: Array[Handler], b: Handler) =
+		(a, b) match
+		{
+			case (null, null) => Nil
+			case (null, notB) => notB :: Nil
+			case (notA, null) => notA.toList
+			case (notA, notB) => notB :: notA.toList
+		}
+	private class JettyLogger(delegate: Logger) extends JettyLoggerBase(delegate) with JLogger
+	{
+		def getLogger(name: String) = this
+	}
+}
diff --git a/src/main/scala/sbt/jetty/jetty6.imports b/src/main/scala/sbt/jetty/jetty6.imports
new file mode 100644
index 000000000..3b20abbf1
--- /dev/null
+++ b/src/main/scala/sbt/jetty/jetty6.imports
@@ -0,0 +1,7 @@
+
+	import org.mortbay.jetty.{Handler, Server}
+	import org.mortbay.jetty.nio.SelectChannelConnector
+	import org.mortbay.jetty.webapp.{WebAppClassLoader, WebAppContext}
+	import org.mortbay.log.{Log, Logger => JLogger}
+	import org.mortbay.util.Scanner
+	import org.mortbay.xml.XmlConfiguration
\ No newline at end of file
diff --git a/src/main/scala/sbt/jetty/jetty7.imports b/src/main/scala/sbt/jetty/jetty7.imports
new file mode 100644
index 000000000..35f18d862
--- /dev/null
+++ b/src/main/scala/sbt/jetty/jetty7.imports
@@ -0,0 +1,7 @@
+
+	import org.eclipse.jetty.server.{Server, Handler}
+	import org.eclipse.jetty.server.nio.SelectChannelConnector
+	import org.eclipse.jetty.webapp.{WebAppClassLoader, WebAppContext}
+	import org.eclipse.jetty.util.log.{Log, Logger => JLogger}
+	import org.eclipse.jetty.util.Scanner
+	import org.eclipse.jetty.xml.XmlConfiguration
\ No newline at end of file

From 31822b2e17301e5241ca414e55e823d581b5914f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 1 Feb 2010 20:48:51 -0500
Subject: [PATCH 221/268] Jetty 7 support working

---
 .gitignore                                    |   2 +
 src/main/scala/sbt/WebApp.scala               |   2 +-
 .../scala/sbt/jetty/LazyJettyRun.scala.templ  |   2 +-
 src/main/scala/sbt/jetty/LazyJettyRun6.scala  | 137 ------------------
 src/main/scala/sbt/jetty/LazyJettyRun7.scala  | 137 ------------------
 .../specs-run/project/build/TestProject.scala |   2 +-
 src/sbt-test/tests/specs-run/test             |   3 +-
 .../MyServlet1.scala}                         |   0
 .../{MyServlet.scala => MyServlet2.scala}     |   0
 .../project/build/src/WebappBuild.scala       |  10 +-
 src/sbt-test/web/servlet-direct/test          |  22 ++-
 .../MyServlet1.scala}                         |   0
 .../{MyServlet.scala => MyServlet2.scala}     |   0
 .../project/build/src/WebappBuild.scala       |  10 +-
 .../servlet/src/main/webapp/WEB-INF/web.xml   |   2 +-
 src/sbt-test/web/servlet/test                 |  23 ++-
 16 files changed, 64 insertions(+), 288 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 src/main/scala/sbt/jetty/LazyJettyRun6.scala
 delete mode 100644 src/main/scala/sbt/jetty/LazyJettyRun7.scala
 rename src/sbt-test/web/servlet-direct/{src/main/scala/test/MyServlet.scala => changes/MyServlet1.scala} (100%)
 rename src/sbt-test/web/servlet-direct/changes/{MyServlet.scala => MyServlet2.scala} (100%)
 rename src/sbt-test/web/servlet/{src/main/scala/test/MyServlet.scala => changes/MyServlet1.scala} (100%)
 rename src/sbt-test/web/servlet/changes/{MyServlet.scala => MyServlet2.scala} (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..130e42047
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+LazyJettyRun6.scala
+LazyJettyRun7.scala
diff --git a/src/main/scala/sbt/WebApp.scala b/src/main/scala/sbt/WebApp.scala
index 5d53917ee..206092d1f 100644
--- a/src/main/scala/sbt/WebApp.scala
+++ b/src/main/scala/sbt/WebApp.scala
@@ -36,7 +36,7 @@ class JettyRunner(configuration: JettyConfiguration) extends ExitHook
 			val jettyParentLoader = configuration match { case d: DefaultJettyConfiguration => d.parentLoader; case _ => ClassLoader.getSystemClassLoader }
 			val jettyLoader: ClassLoader = new java.net.URLClassLoader(classpathURLs.toArray, jettyParentLoader)
 			
-			val jettyFilter = (name: String) => name.startsWith("org.mortbay.")
+			val jettyFilter = (name: String) => name.startsWith("org.mortbay.") || name.startsWith("org.eclipse.jetty.")
 			val notJettyFilter = (name: String) => !jettyFilter(name)
 			
 			val dual = new xsbt.DualLoader(baseLoader, notJettyFilter, x => true, jettyLoader, jettyFilter, x => false)
diff --git a/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
index 29f86a4a8..09aec20ab 100644
--- a/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
+++ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
@@ -5,7 +5,7 @@ import java.net.URL
 
 /* This class starts Jetty.
 * NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
-*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
+*  to do so.  Only use its name in JettyRun for reflective loading.  This allows using
 *  the Jetty libraries provided on the project classpath instead of requiring them to be
 *  available on sbt's classpath at startup.
 */
diff --git a/src/main/scala/sbt/jetty/LazyJettyRun6.scala b/src/main/scala/sbt/jetty/LazyJettyRun6.scala
deleted file mode 100644
index 30ea2c787..000000000
--- a/src/main/scala/sbt/jetty/LazyJettyRun6.scala
+++ /dev/null
@@ -1,137 +0,0 @@
-package sbt.jetty
-
-import java.io.File
-import java.net.URL
-
-/* This class starts Jetty.
-* NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
-*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
-*  the Jetty libraries provided on the project classpath instead of requiring them to be
-*  available on sbt's classpath at startup.
-*/
-private object LazyJettyRun6 extends JettyRun
-{
-	
-	import org.mortbay.jetty.{Handler, Server}
-	import org.mortbay.jetty.nio.SelectChannelConnector
-	import org.mortbay.jetty.webapp.{WebAppClassLoader, WebAppContext}
-	import org.mortbay.log.{Log, Logger => JLogger}
-	import org.mortbay.util.Scanner
-	import org.mortbay.xml.XmlConfiguration
-
-	import java.lang.ref.{Reference, WeakReference}
-
-	val DefaultMaxIdleTime = 30000
-
-	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =
-	{
-		val oldLog = Log.getLog
-		Log.setLog(new JettyLogger(configuration.log))
-		val server = new Server
-
-		def configureScanner(listener: Scanner.BulkListener, scanDirectories: Seq[File], scanInterval: Int) =
-		{
-			if(scanDirectories.isEmpty)
-				None
-			else
-			{
-				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
-				val scanner = new Scanner
-				val list = new java.util.ArrayList[File]
-				scanDirectories.foreach(x => list.add(x))
-				scanner.setScanDirs(list)
-				scanner.setRecursive(true)
-				scanner.setScanInterval(scanInterval)
-				scanner.setReportExistingFilesOnStartup(false)
-				scanner.addListener(listener)
-				scanner.start()
-				Some(new WeakReference(scanner))
-			}
-		}
-
-		val (listener, scanner) =
-			configuration match
-			{
-				case c: DefaultJettyConfiguration =>
-					import c._
-					configureDefaultConnector(server, port)
-					def classpathURLs = classpath.get.map(_.asURL).toSeq
-					val webapp = new WebAppContext(war.absolutePath, contextPath)
-					
-					def createLoader =
-					{
-						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
-						val loader = new SbtWebAppLoader
-						classpathURLs.foreach(loader.addURL)
-						loader
-					}
-					def setLoader() = webapp.setClassLoader(createLoader)
-					
-					setLoader()
-					server.setHandler(webapp)
-
-					val listener = new Scanner.BulkListener with Reload {
-						def reloadApp() = reload(server, setLoader(), log)
-						def filesChanged(files: java.util.List[_]) { reloadApp() }
-					}
-					(Some(listener), configureScanner(listener, c.scanDirectories, c.scanInterval))
-				case c: CustomJettyConfiguration =>
-					for(x <- c.jettyConfigurationXML)
-						(new XmlConfiguration(x.toString)).configure(server)
-					for(file <- c.jettyConfigurationFiles)
-						(new XmlConfiguration(file.toURI.toURL)).configure(server)
-					(None, None)
-			}
-
-		try
-		{
-			server.start()
-			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), scanner, oldLog)
-		}
-		catch { case e => server.stop(); throw e }
-	}
-	private def configureDefaultConnector(server: Server, port: Int)
-	{
-		val defaultConnector = new SelectChannelConnector
-		defaultConnector.setPort(port)
-		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
-		server.addConnector(defaultConnector)
-	}
-	trait Reload { def reloadApp(): Unit }
-	private class StopServer(serverReference: Reference[Server], reloadReference: Option[Reference[Reload]], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: JLogger) extends Stoppable
-	{
-		def reload(): Unit = on(reloadReference)(_.reloadApp())
-		private def on[T](refOpt: Option[Reference[T]])(f: T => Unit): Unit = refOpt.foreach(ref => onReferenced(ref.get)(f))
-		private def onReferenced[T](t: T)(f: T => Unit): Unit = if(t == null) () else f(t)
-		def stop()
-		{
-			onReferenced(serverReference.get)(_.stop())
-			on(scannerReferenceOpt)(_.stop())
-			Log.setLog(oldLog)
-		}
-	}
-	private def reload(server: Server, reconfigure: => Unit, log: Logger)
-	{
-		log.info("Reloading web application...")
-		val handlers = wrapNull(server.getHandlers, server.getHandler)
-		log.debug("Stopping handlers: " + handlers.mkString(", "))
-		handlers.foreach(_.stop)
-		log.debug("Reconfiguring...")
-		reconfigure
-		log.debug("Restarting handlers: " + handlers.mkString(", "))
-		handlers.foreach(_.start)
-		log.info("Reload complete.")
-	}
-	private def wrapNull(a: Array[Handler], b: Handler) =
-		(a, b) match
-		{
-			case (null, null) => Nil
-			case (null, notB) => notB :: Nil
-			case (notA, null) => notA.toList
-			case (notA, notB) => notB :: notA.toList
-		}
-	private class JettyLogger(delegate: Logger) extends JettyLoggerBase(delegate) with JLogger
-	{
-		def getLogger(name: String) = this
-	}
-}
diff --git a/src/main/scala/sbt/jetty/LazyJettyRun7.scala b/src/main/scala/sbt/jetty/LazyJettyRun7.scala
deleted file mode 100644
index 84ca8c7d5..000000000
--- a/src/main/scala/sbt/jetty/LazyJettyRun7.scala
+++ /dev/null
@@ -1,137 +0,0 @@
-package sbt.jetty
-
-import java.io.File
-import java.net.URL
-
-/* This class starts Jetty.
-* NOTE: DO NOT actively use this class.  You will see NoClassDefFoundErrors if you fail
-*  to do so.Only use its name in JettyRun for reflective loading.  This allows using
-*  the Jetty libraries provided on the project classpath instead of requiring them to be
-*  available on sbt's classpath at startup.
-*/
-private object LazyJettyRun7 extends JettyRun
-{
-	
-	import org.eclipse.jetty.server.{Server, Handler}
-	import org.eclipse.jetty.server.nio.SelectChannelConnector
-	import org.eclipse.jetty.webapp.{WebAppClassLoader, WebAppContext}
-	import org.eclipse.jetty.util.log.{Log, Logger => JLogger}
-	import org.eclipse.jetty.util.Scanner
-	import org.eclipse.jetty.xml.XmlConfiguration
-
-	import java.lang.ref.{Reference, WeakReference}
-
-	val DefaultMaxIdleTime = 30000
-
-	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =
-	{
-		val oldLog = Log.getLog
-		Log.setLog(new JettyLogger(configuration.log))
-		val server = new Server
-
-		def configureScanner(listener: Scanner.BulkListener, scanDirectories: Seq[File], scanInterval: Int) =
-		{
-			if(scanDirectories.isEmpty)
-				None
-			else
-			{
-				configuration.log.debug("Scanning for changes to: " + scanDirectories.mkString(", "))
-				val scanner = new Scanner
-				val list = new java.util.ArrayList[File]
-				scanDirectories.foreach(x => list.add(x))
-				scanner.setScanDirs(list)
-				scanner.setRecursive(true)
-				scanner.setScanInterval(scanInterval)
-				scanner.setReportExistingFilesOnStartup(false)
-				scanner.addListener(listener)
-				scanner.start()
-				Some(new WeakReference(scanner))
-			}
-		}
-
-		val (listener, scanner) =
-			configuration match
-			{
-				case c: DefaultJettyConfiguration =>
-					import c._
-					configureDefaultConnector(server, port)
-					def classpathURLs = classpath.get.map(_.asURL).toSeq
-					val webapp = new WebAppContext(war.absolutePath, contextPath)
-					
-					def createLoader =
-					{
-						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
-						val loader = new SbtWebAppLoader
-						classpathURLs.foreach(loader.addURL)
-						loader
-					}
-					def setLoader() = webapp.setClassLoader(createLoader)
-					
-					setLoader()
-					server.setHandler(webapp)
-
-					val listener = new Scanner.BulkListener with Reload {
-						def reloadApp() = reload(server, setLoader(), log)
-						def filesChanged(files: java.util.List[_]) { reloadApp() }
-					}
-					(Some(listener), configureScanner(listener, c.scanDirectories, c.scanInterval))
-				case c: CustomJettyConfiguration =>
-					for(x <- c.jettyConfigurationXML)
-						(new XmlConfiguration(x.toString)).configure(server)
-					for(file <- c.jettyConfigurationFiles)
-						(new XmlConfiguration(file.toURI.toURL)).configure(server)
-					(None, None)
-			}
-
-		try
-		{
-			server.start()
-			new StopServer(new WeakReference(server), listener.map(new WeakReference(_)), scanner, oldLog)
-		}
-		catch { case e => server.stop(); throw e }
-	}
-	private def configureDefaultConnector(server: Server, port: Int)
-	{
-		val defaultConnector = new SelectChannelConnector
-		defaultConnector.setPort(port)
-		defaultConnector.setMaxIdleTime(DefaultMaxIdleTime)
-		server.addConnector(defaultConnector)
-	}
-	trait Reload { def reloadApp(): Unit }
-	private class StopServer(serverReference: Reference[Server], reloadReference: Option[Reference[Reload]], scannerReferenceOpt: Option[Reference[Scanner]], oldLog: JLogger) extends Stoppable
-	{
-		def reload(): Unit = on(reloadReference)(_.reloadApp())
-		private def on[T](refOpt: Option[Reference[T]])(f: T => Unit): Unit = refOpt.foreach(ref => onReferenced(ref.get)(f))
-		private def onReferenced[T](t: T)(f: T => Unit): Unit = if(t == null) () else f(t)
-		def stop()
-		{
-			onReferenced(serverReference.get)(_.stop())
-			on(scannerReferenceOpt)(_.stop())
-			Log.setLog(oldLog)
-		}
-	}
-	private def reload(server: Server, reconfigure: => Unit, log: Logger)
-	{
-		log.info("Reloading web application...")
-		val handlers = wrapNull(server.getHandlers, server.getHandler)
-		log.debug("Stopping handlers: " + handlers.mkString(", "))
-		handlers.foreach(_.stop)
-		log.debug("Reconfiguring...")
-		reconfigure
-		log.debug("Restarting handlers: " + handlers.mkString(", "))
-		handlers.foreach(_.start)
-		log.info("Reload complete.")
-	}
-	private def wrapNull(a: Array[Handler], b: Handler) =
-		(a, b) match
-		{
-			case (null, null) => Nil
-			case (null, notB) => notB :: Nil
-			case (notA, null) => notA.toList
-			case (notA, notB) => notB :: notA.toList
-		}
-	private class JettyLogger(delegate: Logger) extends JettyLoggerBase(delegate) with JLogger
-	{
-		def getLogger(name: String) = this
-	}
-}
diff --git a/src/sbt-test/tests/specs-run/project/build/TestProject.scala b/src/sbt-test/tests/specs-run/project/build/TestProject.scala
index cba60bdda..40a3de9f7 100644
--- a/src/sbt-test/tests/specs-run/project/build/TestProject.scala
+++ b/src/sbt-test/tests/specs-run/project/build/TestProject.scala
@@ -2,5 +2,5 @@ import sbt._
 
 class TestProject(info: ProjectInfo) extends DefaultProject(info)
 {
-	val specs = "org.scala-tools.testing" %% "specs" % "1.6.1"
+	val specs = "org.scala-tools.testing" %% "specs" % "1.6.1" intransitive()
 }
\ No newline at end of file
diff --git a/src/sbt-test/tests/specs-run/test b/src/sbt-test/tests/specs-run/test
index b3266bfb4..86d367a09 100644
--- a/src/sbt-test/tests/specs-run/test
+++ b/src/sbt-test/tests/specs-run/test
@@ -1,4 +1,5 @@
-> ++2.8.0.Beta1-RC7
+#> ++2.8.0.Beta1-RC7
+> ++2.7.7
 > update
 
 > clean
diff --git a/src/sbt-test/web/servlet-direct/src/main/scala/test/MyServlet.scala b/src/sbt-test/web/servlet-direct/changes/MyServlet1.scala
similarity index 100%
rename from src/sbt-test/web/servlet-direct/src/main/scala/test/MyServlet.scala
rename to src/sbt-test/web/servlet-direct/changes/MyServlet1.scala
diff --git a/src/sbt-test/web/servlet-direct/changes/MyServlet.scala b/src/sbt-test/web/servlet-direct/changes/MyServlet2.scala
similarity index 100%
rename from src/sbt-test/web/servlet-direct/changes/MyServlet.scala
rename to src/sbt-test/web/servlet-direct/changes/MyServlet2.scala
diff --git a/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala b/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
index bca37e84d..c420a8227 100644
--- a/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
+++ b/src/sbt-test/web/servlet-direct/project/build/src/WebappBuild.scala
@@ -2,8 +2,14 @@ import sbt._
 
 class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) {
 
-	val servlet_api = "org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default"
-	val jetty_servlet = "org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default"
+	override def libraryDependencies = if("jetty7".asFile.exists) jetty7Dependencies else jetty6Dependencies
+	def jetty6Dependencies =
+		Set("org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default",
+		"org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default")
+	def jetty7Dependencies =
+		Set("javax.servlet" % "servlet-api" % "2.5" % "provided",
+		"org.eclipse.jetty" % "jetty-server" % "7.0.1.v20091125" % "test",
+		"org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "test")
 
 	def indexURL = new java.net.URL("http://localhost:8080")
 	def indexFile = new java.io.File("index.html")
diff --git a/src/sbt-test/web/servlet-direct/test b/src/sbt-test/web/servlet-direct/test
index a04dfa4d7..78f55a2dc 100644
--- a/src/sbt-test/web/servlet-direct/test
+++ b/src/sbt-test/web/servlet-direct/test
@@ -1,10 +1,26 @@
-> ++2.8.0.Beta1-RC6
+> ++2.8.0.Beta1
+
+$ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
 > update
 > jetty-run
-$ pause
 > check-page "Hello, Scala!"
 
-$ copy-file changes/MyServlet.scala src/main/scala/test/MyServlet.scala
+$ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello, Scala 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
+
+$ touch jetty7
+$ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
+> update
+> jetty-run
+> check-page "Hello, Scala!"
+
+$ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
 
 > prepare-webapp
 > jetty-reload
diff --git a/src/sbt-test/web/servlet/src/main/scala/test/MyServlet.scala b/src/sbt-test/web/servlet/changes/MyServlet1.scala
similarity index 100%
rename from src/sbt-test/web/servlet/src/main/scala/test/MyServlet.scala
rename to src/sbt-test/web/servlet/changes/MyServlet1.scala
diff --git a/src/sbt-test/web/servlet/changes/MyServlet.scala b/src/sbt-test/web/servlet/changes/MyServlet2.scala
similarity index 100%
rename from src/sbt-test/web/servlet/changes/MyServlet.scala
rename to src/sbt-test/web/servlet/changes/MyServlet2.scala
diff --git a/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala b/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
index 20edda2f6..4b0028732 100644
--- a/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
+++ b/src/sbt-test/web/servlet/project/build/src/WebappBuild.scala
@@ -2,8 +2,14 @@ import sbt._
 
 class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) {
 
-	val servlet_api = "org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default"
-	val jetty_servlet = "org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default"
+	override def libraryDependencies = if("jetty7".asFile.exists) jetty7Dependencies else jetty6Dependencies
+	def jetty6Dependencies =
+		Set("org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default",
+		"org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default")
+	def jetty7Dependencies =
+		Set("javax.servlet" % "servlet-api" % "2.5" % "provided",
+		"org.eclipse.jetty" % "jetty-server" % "7.0.1.v20091125" % "test",
+		"org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "test")
 
 	def indexURL = new java.net.URL("http://localhost:8080")
 	def indexFile = new java.io.File("index.html")
diff --git a/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml b/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
index bff12b49b..441ad39bd 100644
--- a/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
+++ b/src/sbt-test/web/servlet/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,7 @@
 	"http://java.sun.com/dtd/web-app_2_3.dtd" >
 
 <web-app>
-	<display-name>Archetype Created Web Application</display-name>
+	<display-name>Test Web Application</display-name>
 
 	<servlet>
 		<servlet-name>Home</servlet-name>
diff --git a/src/sbt-test/web/servlet/test b/src/sbt-test/web/servlet/test
index 5e153ca61..39ebb15bd 100644
--- a/src/sbt-test/web/servlet/test
+++ b/src/sbt-test/web/servlet/test
@@ -1,9 +1,28 @@
-> ++2.8.0.Beta1-RC6
+> ++2.8.0.Beta1
+
+$ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
 > update
 > jetty-run
 > check-page "Hello, Scala!"
 
-$ copy-file changes/MyServlet.scala src/main/scala/test/MyServlet.scala
+$ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello, Scala 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
+
+# test that it works with Jetty 7 support
+$ touch jetty7
+
+$ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
+> update
+> jetty-run
+> check-page "Hello, Scala!"
+
+$ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
 
 > prepare-webapp
 > jetty-reload

From 7119c1adbede3787dd617f58320b3d1a2634a2ed Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 4 Feb 2010 18:57:29 -0500
Subject: [PATCH 222/268] Exclude launcher jar from unmanaged classpath,
 allowing it to be put in the lib/ or project root directories.

---
 src/main/scala/sbt/BasicProjectTypes.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 578190eab..bc1644bfa 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -43,12 +43,14 @@ trait UnmanagedClasspathProject extends ClasspathProject
 	/** The classpath containing all jars in the unmanaged directory. */
 	def unmanagedClasspath: PathFinder =
 	{
-		val base = descendents(dependencyPath, "*.jar")
+		val base = descendents(dependencyPath, jarFilter)
 		if(scratch)
-			base +++ (info.projectPath * "*.jar")
+			base +++ (info.projectPath * jarFilter)
 		else
 			base
 	}
+	/* Explicitly filter (x)sbt-launch(er)-<version>.jar, since it contains minified versions of various classes.*/
+	private def jarFilter: NameFilter = "*.jar" - "*sbt-launch*.jar"
 	/** The classpath containing all unmanaged classpath elements for the given configuration. This typically includes
 	* at least 'unmanagedClasspath'.*/
 	def fullUnmanagedClasspath(config: Configuration): PathFinder

From 04c73ab1f027215be9cefee4e8be6b6d580ffbce Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 4 Feb 2010 22:50:56 -0500
Subject: [PATCH 223/268] Speed up startup by delaying initialization of tab
 completion

---
 src/main/scala/sbt/LineReader.scala | 73 +++++++++++++++++------------
 src/main/scala/sbt/Main.scala       | 12 ++---
 2 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/src/main/scala/sbt/LineReader.scala b/src/main/scala/sbt/LineReader.scala
index 558b08936..b67651b62 100644
--- a/src/main/scala/sbt/LineReader.scala
+++ b/src/main/scala/sbt/LineReader.scala
@@ -10,8 +10,10 @@ trait LineReader extends NotNull
 class Completors(val projectAction: String, val projectNames: Iterable[String],
 	val generalCommands: Iterable[String], val propertyActions: Iterable[String],
 	val specificPrefix: String, val scalaVersions: Iterable[String],
-	val prefixes: Iterable[String]) extends NotNull
-import jline.ConsoleReader
+	val prefixes: Iterable[String], val taskNames: Iterable[String], 
+	val propertyNames: Iterable[String], val extra: Iterable[(String, Iterable[String])]) extends NotNull
+
+import jline.{Completor, ConsoleReader}
 abstract class JLine extends LineReader
 {
 	protected[this] val reader: ConsoleReader
@@ -49,16 +51,8 @@ object SimpleReader extends JLine
 {
 	protected[this] val reader = JLine.createReader()
 }
-class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger) extends JLine
+private[sbt] final class LazyJLineReader(historyPath: Option[Path], completor: => Completor, log: Logger) extends JLine
 {
-	import completors._
-	import jline.{ArgumentCompletor, Completor, MultiCompletor, NullCompletor, SimpleCompletor}
-
-	private val generalCompletor = simpleCompletor(generalCommands)
-	private val projectCompletor = simpleArgumentCompletor(projectAction :: Nil, projectNames)
-
-	private val completor = new MultiCompletor()
-
 	protected[this] val reader =
 	{
 		val cr = new ConsoleReader
@@ -72,10 +66,40 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
 				cr.getHistory.setHistoryFile(historyFile)
 			}
 		}
-		cr.addCompletor(completor)
+		cr.addCompletor(new LazyCompletor(completor))
 		cr
 	}
+}
+object MainCompletor
+{
+		import jline.{ArgumentCompletor, MultiCompletor, NullCompletor, SimpleCompletor}
 
+	def apply(completors: Completors): Completor =
+	{
+			import completors._
+			import scala.collection.immutable.TreeSet
+
+		val generalCompletor = simpleCompletor(generalCommands)
+		val projectCompletor = simpleArgumentCompletor(projectAction :: Nil, projectNames)
+
+		def propertyCompletor(propertyNames: Iterable[String]) =
+			simpleArgumentCompletor(propertyActions, propertyNames)
+		def prefixedCompletor(baseCompletor: Completor) =
+			singleArgumentCompletor(simpleCompletor(prefixes), baseCompletor)
+		def specificCompletor(baseCompletor: Completor) =
+		{
+			val specific = simpleCompletor(specificPrefix :: Nil) // TODO
+			new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
+		}
+		val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
+		val extraCompletors = for( (first, repeat) <- extra) yield repeatedArgumentCompletor(simpleCompletor(first :: Nil), simpleCompletor(repeat))
+		val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
+		val baseCompletor = new MultiCompletor(baseCompletors.toArray)
+
+		val completor = new MultiCompletor()
+		completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor), specificCompletor(baseCompletor)) )
+		completor
+	}
 	/** Used for a single argument so that the argument can have spaces in it.*/
 	object SingleArgumentDelimiter extends ArgumentCompletor.AbstractArgumentDelimiter
 	{
@@ -99,23 +123,10 @@ class JLineReader(historyPath: Option[Path], completors: Completors, log: Logger
 		c.setStrict(true)
 		c
 	}
-
-	private def propertyCompletor(propertyNames: Iterable[String]) =
-		simpleArgumentCompletor(propertyActions, propertyNames)
-	private def prefixedCompletor(baseCompletor: Completor) =
-		singleArgumentCompletor(simpleCompletor(prefixes), baseCompletor)
-	private def specificCompletor(baseCompletor: Completor) =
-	{
-		val specific = simpleCompletor(specificPrefix :: Nil) // TODO
-		new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
-	}
-	def setVariableCompletions(taskNames: Iterable[String], propertyNames: Iterable[String], extra: Iterable[(String, Iterable[String])] )
-	{
-		import scala.collection.immutable.TreeSet
-		val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
-		val extraCompletors = for( (first, repeat) <- extra) yield repeatedArgumentCompletor(simpleCompletor(first :: Nil), simpleCompletor(repeat))
-		val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
-		val baseCompletor = new MultiCompletor(baseCompletors.toArray)
-		completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor), specificCompletor(baseCompletor)) )
-	}
+}
+private class LazyCompletor(delegate0: => Completor) extends Completor
+{
+	private lazy val delegate = delegate0
+	def complete(buffer: String, cursor: Int, candidates: java.util.List[_]): Int =
+		delegate.complete(buffer, cursor, candidates)
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index c3d9b9e6d..67872e74c 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -98,7 +98,6 @@ class xMain extends xsbti.AppMain
 	{
 		project.log.info("Building project " + project.name + " " + project.version.toString + " against Scala " + project.buildScalaVersion)
 		project.log.info("   using " + project.getClass.getName + " with sbt " + project.sbtVersion.value + " and Scala " + project.defScalaVersion.value)
-
 		processArguments(project, initialize(remainingArguments), configuration, startTime) match
 		{
 			case e: xsbti.Exit =>
@@ -308,13 +307,12 @@ class xMain extends xsbti.AppMain
 	// todo:  project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
 	private def prompt(baseProject: Project, project: Project): String =
 	{
-		val projectNames = baseProject.projectClosure.map(_.name)
+		lazy val projectNames = baseProject.projectClosure.map(_.name)
 		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
-		val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value)
-		val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), SpecificBuildPrefix, scalaVersions, prefixes)
-		val reader = new JLineReader(baseProject.historyPath, completors, baseProject.log)
-		val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
-		reader.setVariableCompletions(project.taskNames, project.propertyNames, methodCompletions)
+		lazy val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value)
+		lazy val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
+		lazy val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), SpecificBuildPrefix, scalaVersions, prefixes, project.taskNames, project.propertyNames, methodCompletions)
+		val reader = new LazyJLineReader(baseProject.historyPath, MainCompletor(completors), baseProject.log)
 		reader.readLine("> ").getOrElse(ExitCommand)
 	}
 

From 8f2d9124e96e3ec1249dc06c11618b0f22adff6f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 5 Feb 2010 19:04:39 -0500
Subject: [PATCH 224/268] Make task logging delimiters configurable by system
 properties: sbt.start.delimiter and sbt.end.delimiter

---
 src/main/scala/sbt/impl/RunTask.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/impl/RunTask.scala b/src/main/scala/sbt/impl/RunTask.scala
index 5ce5a6da4..9f1d9a88e 100644
--- a/src/main/scala/sbt/impl/RunTask.scala
+++ b/src/main/scala/sbt/impl/RunTask.scala
@@ -59,6 +59,8 @@ private final class RunTask(root: Task, rootName: String, maximumTasks: Int) ext
 		else
 			runTask(action, expandedTaskName(action))
 	}
+	private val headerStart = System.getProperty("sbt.start.delimiter", "==")
+	private val headerEnd = System.getProperty("sbt.end.delimiter", "==")
 	private def isRoot(t: Task) = t == expandedRoot
 	/** Will be called in its own thread except for the root task. */
 	private def runTask(action: Task, actionName: String): Option[String] =
@@ -71,10 +73,10 @@ private final class RunTask(root: Task, rootName: String, maximumTasks: Int) ext
 			banner(ControlEvent.Start, "\n  ", "...")
 		def doRun() =
 		{
-			banner(ControlEvent.Header, "\n==", "==")
+			banner(ControlEvent.Header, "\n" + headerStart, headerStart)
 			try { action.invoke }
 			catch { case e: Exception => action.manager.log.trace(e); Some(e.toString) }
-			finally { banner(ControlEvent.Finish, "==", "==") }
+			finally { banner(ControlEvent.Finish, headerEnd, headerEnd) }
 		}
 		
 		if(buffered)

From 514c8f499b1a62c0038e0bbde819bd64351201eb Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 5 Feb 2010 19:12:55 -0500
Subject: [PATCH 225/268]  * Select default doc options based on Scala version.
  * Remove unused Resources.withProject  * General cleanup

---
 src/main/scala/sbt/BasicProjectTypes.scala    |  1 -
 src/main/scala/sbt/BuilderProject.scala       | 17 ++--
 src/main/scala/sbt/CompileOptions.scala       |  8 ++
 src/main/scala/sbt/DefaultProject.scala       |  9 +-
 src/main/scala/sbt/Path.scala                 |  2 +
 src/main/scala/sbt/Project.scala              | 17 ++--
 src/main/scala/sbt/ProjectInfo.scala          |  2 +
 src/main/scala/sbt/Resources.scala            | 88 +------------------
 src/main/scala/sbt/ScalaProject.scala         |  8 +-
 .../src/main/webapp/WEB-INF/web.xml           |  2 +-
 10 files changed, 42 insertions(+), 112 deletions(-)
 create mode 100644 src/main/scala/sbt/CompileOptions.scala

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index bc1644bfa..dc5823a1a 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -225,7 +225,6 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	/** Determines extra libraries needed for compatibility.  Currently, this is the compatibility test framework. */
 	private def compatExtra(deps: Set[ModuleID]) =
 		if(isScala27 && deps.exists(requiresCompat)) { log.debug("Using compatibility implementation of test interface."); compatTestFramework } else Nil
-	private def isScala27 = buildScalaVersion.startsWith("2.7.")
 	/** True if the given dependency requires the compatibility test framework. */
 	private def requiresCompat(m: ModuleID) =
 	{
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index dff01c173..9545b04bc 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -13,7 +13,7 @@ sealed abstract class InternalProject extends Project
 	override final protected def disableCrossPaths = false
 	override final def shouldCheckOutputDirectories = false
 }
-private sealed abstract class BasicBuilderProject extends InternalProject with SimpleScalaProject
+private sealed abstract class BasicBuilderProject extends InternalProject
 {
 	def sourceFilter = "*.scala" | "*.java"
 	def jarFilter: NameFilter = "*.jar"
@@ -33,13 +33,13 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 	}
 
 	def projectClasspath = compilePath +++ libraries +++ sbtJars
-	def sbtJars = Path.lazyPathFinder { info.app.mainClasspath.map(Path.fromFile) }
+	def sbtJars = info.sbtClasspath
 
 	abstract class BuilderCompileConfiguration extends AbstractCompileConfiguration
 	{
 		def projectPath = info.projectPath
 		def log = BasicBuilderProject.this.log
-		def options = (Deprecation :: Unchecked :: Nil).map(_.asString)
+		def options = CompileOptions.Deprecation :: CompileOptions.Unchecked :: Nil
 		def javaOptions = Nil
 		def maxErrors = ScalaProject.DefaultMaximumCompileErrors
 		def compileOrder = CompileOrder.Mixed
@@ -111,7 +111,7 @@ private sealed abstract class BasicBuilderProject extends InternalProject with S
 	override final def methods = Map.empty
 }
 /** The project definition used to build project definitions. */
-private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, additional: Iterable[Path], rawLogger: Logger) extends BasicBuilderProject
+private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, additional: PathFinder, rawLogger: Logger) extends BasicBuilderProject
 {
 	private lazy val pluginProject =
 	{
@@ -122,7 +122,7 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 	}
 	override def projectClasspath = super.projectClasspath +++
 		pluginProject.map(_.pluginClasspath).getOrElse(Path.emptyPathFinder) +++
-		Path.lazyPathFinder{ additional }
+		additional
 	def tpe = "project definition"
 
 	override def compileTask = super.compileTask dependsOn(pluginProject.map(_.syncPlugins).toList : _*)
@@ -210,11 +210,16 @@ class PluginDefinition(val info: ProjectInfo) extends InternalProject with Basic
 }
 class PluginProject(info: ProjectInfo) extends DefaultProject(info)
 {
+	/* Since plugins are distributed as source, there is no need to append _<scala.version>  */
 	override def moduleID = normalizedName
+	/* Fix the version used to build to the version currently running sbt. */
 	override def buildScalaVersion = defScalaVersion.value
-	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(info.app.mainClasspath.map(Path.fromFile))
+	/* Add sbt to the classpath */
+	override def unmanagedClasspath = super.unmanagedClasspath +++ info.sbtClasspath
+	/* Package the plugin as source. */
 	override def packageAction = packageSrc dependsOn(test)
 	override def packageSrcJar = jarPath
+	/* Some setup to make publishing quicker to configure. */
 	override def useMavenConfigurations = true
 	override def managedStyle = ManagedStyle.Maven
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/CompileOptions.scala b/src/main/scala/sbt/CompileOptions.scala
new file mode 100644
index 000000000..2c792556f
--- /dev/null
+++ b/src/main/scala/sbt/CompileOptions.scala
@@ -0,0 +1,8 @@
+package sbt
+
+object CompileOptions
+{
+	val Deprecation = "-deprecation"
+	val Unchecked = "-unchecked"
+	val Verbose = "-verbose"
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index ab854c1dc..ebff0a888 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -50,8 +50,8 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	def manifestClassPath: Option[String] = None
 	def dependencies = info.dependencies ++ subProjects.values.toList
 
-	val mainCompileConditional = new CompileConditional(mainCompileConfiguration, buildCompiler)
-	val testCompileConditional = new CompileConditional(testCompileConfiguration, buildCompiler)
+	lazy val mainCompileConditional = new CompileConditional(mainCompileConfiguration, buildCompiler)
+	lazy val testCompileConditional = new CompileConditional(testCompileConfiguration, buildCompiler)
 
 	def compileOrder = CompileOrder.Mixed
 
@@ -76,8 +76,9 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 	/** The options provided to the 'doc' and 'docTest' actions.*/
 	def documentOptions: Seq[ScaladocOption] =
 		documentTitle(name + " " + version + " API") ::
-		windowTitle(name + " " + version + " API") ::
-		Nil
+		(if(isScala27) only27Options else Nil)
+	private def only27Options =
+		windowTitle(name + " " + version + " API") :: Nil
 	/** The options provided to the 'test' action..*/
 	def testOptions: Seq[TestOption] =
 		TestListeners(testListeners) ::
diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
index 7c9aaa696..9693bfa70 100644
--- a/src/main/scala/sbt/Path.scala
+++ b/src/main/scala/sbt/Path.scala
@@ -146,6 +146,7 @@ object Path
 		{
 			private[sbt] def addTo(pathSet: Set[Path]) = pathSet ++= paths
 		}
+	def finder(files: => Iterable[File]): PathFinder =  lazyPathFinder { fromFiles(files) }
 		
 	/** The separator character of the platform.*/
 	val sep = java.io.File.separatorChar
@@ -223,6 +224,7 @@ object Path
 	}
 	def fromFile(file: String): Path = fromFile(new File(file))
 	def fromFile(file: File): Path = new FilePath(file)
+	def fromFiles(files: Iterable[File]): Iterable[Path] =  files.map(fromFile)
 }
 
 /** A path finder constructs a set of paths.  The set is evaluated by a call to the <code>get</code>
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 9e7422699..ae2f2abfe 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -226,6 +226,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	final val buildScalaVersions = propertyOptional[String](defScalaVersion.value, true)
 	/** The definitive source for the version of Scala being used to *build* the project.*/
 	def buildScalaVersion = info.buildScalaVersion.getOrElse(crossScalaVersions.first)
+	private[sbt] def isScala27 = buildScalaVersion.startsWith("2.7.")
 
 
 	def componentManager = new ComponentManager(info.launcher.globalLock, info.app.components, log)
@@ -327,24 +328,22 @@ object Project
 		loadProject(path.asFile, deps, parent, log, app, buildScalaVersion)
 	/** Loads the project in the directory given by 'projectDirectory' and with the given dependencies.*/
 	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], log: Logger, app: AppProvider, buildScalaVersion: Option[String]): LoadResult =
-		loadProject(projectDirectory, deps, parent, getClass.getClassLoader, log, app, buildScalaVersion)
-	private[sbt] def loadProject(projectDirectory: File, deps: Iterable[Project], parent: Option[Project], additional: ClassLoader, log: Logger, app: AppProvider, buildScalaVersion: Option[String]): LoadResult =
 	{
 		val info = ProjectInfo(projectDirectory, deps, parent)(log, app, buildScalaVersion)
 		ProjectInfo.setup(info, log) match
 		{
 			case err: SetupError => new LoadSetupError(err.message)
 			case SetupDeclined => LoadSetupDeclined
-			case AlreadySetup => loadProject(info, None, additional, log)
-			case setup: SetupInfo => loadProject(info, Some(setup), additional, log)
+			case AlreadySetup => loadProject(info, None, log)
+			case setup: SetupInfo => loadProject(info, Some(setup), log)
 		}
 	}
-	private def loadProject(info: ProjectInfo, setupInfo: Option[SetupInfo], additional: ClassLoader, log: Logger): LoadResult =
+	private def loadProject(info: ProjectInfo, setupInfo: Option[SetupInfo], log: Logger): LoadResult =
 	{
 		try
 		{
 			val result =
-				for(builderClass <- getProjectDefinition(info, additional, log).right) yield
+				for(builderClass <- getProjectDefinition(info, log).right) yield
 					initialize(constructProject(info, builderClass), setupInfo, log)
 			result.fold(new LoadError(_), new LoadSuccess(_))
 		}
@@ -406,18 +405,18 @@ object Project
 	}
 	/** Compiles the project definition classes and returns the project definition class name
 	* and the class loader that should be used to load the definition. */
-	private def getProjectDefinition(info: ProjectInfo, additional: ClassLoader, buildLog: Logger): Either[String, Class[P] forSome { type P <: Project }] =
+	private def getProjectDefinition(info: ProjectInfo, buildLog: Logger): Either[String, Class[P] forSome { type P <: Project }] =
 	{
 		val builderProjectPath = info.builderPath / BuilderProjectDirectoryName
 		if(builderProjectPath.asFile.isDirectory)
 		{
 			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
-			val additionalPaths = additional match { case u: URLClassLoader => u.getURLs.map(url => Path.fromFile(FileUtilities.toFile(url))); case _ => Array[Path]() }
+			val additionalPaths = info.sbtClasspath
 			val builderInfo = ProjectInfo(builderProjectPath.asFile, Nil, None)(buildLog, info.app, Some(info.definitionScalaVersion))
 			val builderProject = new BuilderProject(builderInfo, pluginProjectPath, additionalPaths, buildLog)
 			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
 				builderProject.projectDefinition.right.map {
-					case Some(definition) => getProjectClass[Project](definition, builderProject.projectClasspath, additional)
+					case Some(definition) =>  getProjectClass[Project](definition, builderProject.projectClasspath, getClass.getClassLoader)
 					case None => DefaultBuilderClass
 				}
 			}
diff --git a/src/main/scala/sbt/ProjectInfo.scala b/src/main/scala/sbt/ProjectInfo.scala
index 9f518a97d..5a59d8111 100644
--- a/src/main/scala/sbt/ProjectInfo.scala
+++ b/src/main/scala/sbt/ProjectInfo.scala
@@ -28,6 +28,8 @@ final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Proj
 	def pluginsOutputPath = pluginsPath / Project.DefaultOutputDirectoryName
 	def pluginsManagedSourcePath = pluginsPath / BasicDependencyPaths.DefaultManagedSourceDirectoryName
 	def pluginsManagedDependencyPath = pluginsPath / BasicDependencyPaths.DefaultManagedDirectoryName
+	
+	def sbtClasspath = Path.finder(app.mainClasspath)
 }
 
 private[sbt] sealed trait SetupResult extends NotNull
diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
index 28668ddae..5ea2510f8 100644
--- a/src/main/scala/sbt/Resources.scala
+++ b/src/main/scala/sbt/Resources.scala
@@ -27,11 +27,8 @@ object Resources
 	private val LoadErrorPrefix = "Error loading initial project: "
 }
 
-class Resources(val baseDirectory: File, additional: ClassLoader, app: AppProvider, buildScalaVersion: Option[String])
+class Resources(val baseDirectory: File, app: AppProvider, buildScalaVersion: Option[String])
 {
-	def this(baseDirectory: File, provider: AppProvider, buildScalaVersion: Option[String]) =
-		this(baseDirectory, getClass.getClassLoader, provider, buildScalaVersion)
-
 	import Resources._
 	// The returned directory is not actually read-only, but it should be treated that way
 	def readOnlyResourceDirectory(group: String, name: String): Either[String, File] =
@@ -64,87 +61,4 @@ class Resources(val baseDirectory: File, additional: ClassLoader, app: AppProvid
 		}
 		doInTemporaryDirectory(log)(readWrite(readOnly))
 	}
-
-	def withProject[T](projectDirectory: File, log: Logger)(f: Project => WithProjectResult[T]): Either[String, T] =
-		readWriteResourceDirectory(projectDirectory, log)(withProject(log)(f))
-	def withProject[T](group: String, name: String, log: Logger)(f: Project => WithProjectResult[T]): Either[String, T] =
-		readWriteResourceDirectory(group, name, log)(withProject(log)(f))
-	def withProject[T](log: Logger)(f: Project => WithProjectResult[T])(dir: File): Either[String, T] =
-		withProject(log, None, new ReloadSuccessExpected(LoadErrorPrefix), dir )(f)
-	private def withProject[T](log: Logger, previousProject: Option[Project], reload: ReloadProject, dir: File)
-		(f: Project => WithProjectResult[T]): Either[String, T] =
-	{
-		require(previousProject.isDefined || reload != NoReload, "Previous project undefined and reload not requested.")
-		val loadResult =
-			if(reload == NoReload && previousProject.isDefined)
-				Right(previousProject.get)
-			else
-			{
-				val buffered = new BufferedLogger(log)
-				buffered.setLevel(Level.Debug)
-				def error(msg: String) =
-				{
-					buffered.stopAll()
-					Left(msg)
-				}
-				buffered.recordAll()
-				resultToEither(Project.loadProject(dir, Nil, None, additional, buffered, app, buildScalaVersion)) match
-				{
-					case Left(msg) =>
-						reload match
-						{
-							case ReloadErrorExpected =>
-								buffered.clearAll()
-								previousProject.toRight("Initial project load failed.")
-							case s: ReloadSuccessExpected => error(s.prefixIfError + msg)
-							case NoReload /* shouldn't happen */=> error(msg)
-						}
-					case Right(p) =>
-						reload match
-						{
-							case ReloadErrorExpected => error("Expected project load failure, but it succeeded.")
-							case _ =>
-								buffered.clearAll()
-								Right(p)
-						}
-				}
-			}
-		loadResult match
-		{
-			case Right(project) =>
-				f(project) match
-				{
-					case ContinueResult(newF, newReload) => withProject(log, Some(project), newReload, dir)(newF)
-					case ValueResult(value) => Right(value)
-					case err: ErrorResult => error(err.message)
-				}
-			case Left(message) => error(message)
-		}
-	}
-
-	def resultToEither(result: LoadResult): Either[String, Project] =
-		result match
-		{
-			case success: LoadSuccess => Right(success.project)
-			case err: LoadError => Left(err.message)
-			case err: LoadSetupError => Left(err.message)
-			case LoadSetupDeclined => Left("Setup declined")
-		}
-}
-sealed trait ReloadProject extends NotNull
-final object ReloadErrorExpected extends ReloadProject
-final class ReloadSuccessExpected(val prefixIfError: String) extends ReloadProject
-final object NoReload extends ReloadProject
-
-sealed trait WithProjectResult[+T] extends NotNull
-final case class ContinueResult[T](f: Project => WithProjectResult[T], reload: ReloadProject) extends WithProjectResult[T]
-final case class ValueResult[T](value: T) extends WithProjectResult[T]
-final class ErrorResult(val message: String) extends WithProjectResult[Nothing]
-object ContinueResult
-{
-	def apply[T](f: Project => WithProjectResult[T], prefixIfError: Option[String]) =
-	{
-		val reload = prefixIfError match { case None => NoReload; case Some(p) => new ReloadSuccessExpected(p) }
-		new ContinueResult[T](f, reload)
-	}
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 4657013e5..bbb3869b4 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -19,12 +19,12 @@ trait SimpleScalaProject extends ExecProject
 	case class CompileOption(val asString: String) extends ActionOption
 	case class JavaCompileOption(val asString: String) extends ActionOption
 
-	val Deprecation = CompileOption("-deprecation")
+	val Deprecation = CompileOption(CompileOptions.Deprecation)
 	val ExplainTypes = CompileOption("-explaintypes")
 	val Optimize = CompileOption("-optimise")
 	def Optimise = Optimize
-	val Verbose = CompileOption("-verbose")
-	val Unchecked = CompileOption("-unchecked")
+	val Verbose = CompileOption(CompileOptions.Verbose)
+	val Unchecked = CompileOption(CompileOptions.Unchecked)
 	val DisableWarnings = CompileOption("-nowarn")
 	def target(target: Target.Value) = CompileOption("-target:" + target)
 	object Target extends Enumeration
@@ -107,7 +107,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	def access(access: Access.Value) = SimpleDocOption("-access:" + access)
 	def documentBottom(bottomText: String) = CompoundDocOption("-bottom", bottomText)
 	def documentCharset(charset: String) = CompoundDocOption("-charset", charset)
-	def documentTitle(title: String) = CompoundDocOption("-doctitle", title)
+	def documentTitle(title: String) = CompoundDocOption(if(isScala27) "-doctitle" else "-doc-title", title)
 	def documentFooter(footerText: String) = CompoundDocOption("-footer", footerText)
 	def documentHeader(headerText: String) = CompoundDocOption("-header", headerText)
 	def stylesheetFile(path: Path) = CompoundDocOption("-stylesheetfile", path.asFile.getAbsolutePath)
diff --git a/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml b/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
index bff12b49b..441ad39bd 100644
--- a/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
+++ b/src/sbt-test/web/servlet-direct/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,7 @@
 	"http://java.sun.com/dtd/web-app_2_3.dtd" >
 
 <web-app>
-	<display-name>Archetype Created Web Application</display-name>
+	<display-name>Test Web Application</display-name>
 
 	<servlet>
 		<servlet-name>Home</servlet-name>

From 744ed69653b760bd850d9431390bd1b9dd109c7d Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 6 Feb 2010 12:49:37 -0500
Subject: [PATCH 226/268] add method to sbt.Run for compatibility with 0.5.6

---
 src/main/scala/sbt/Run.scala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 10d3682c1..3a04533a4 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -48,6 +48,8 @@ class Run(compiler: xsbt.AnalyzingCompiler) extends ScalaRun
 /** This module is an interface to starting the scala interpreter or runner.*/
 object Run
 {
+	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger)(implicit runner: ScalaRun) =
+		runner.run(mainClass, classpath, options, log)
 	/** Executes the given function, trapping calls to System.exit. */
 	private[sbt] def executeTrapExit(f: => Unit, log: Logger): Option[String] =
 	{

From 261800ed9069e0c594c786637ad1b77e808d080c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 6 Feb 2010 14:21:27 -0500
Subject: [PATCH 227/268] Fix 'publish-local' when Ivy configuration is
 auto-detected

---
 src/main/scala/sbt/BasicProjectTypes.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index dc5823a1a..add1c5c94 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -243,7 +243,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		val in = inlineSettings
 		if(in.configurations.isEmpty)
 		{
-			if(in.dependencies.isEmpty && in.ivyXML.isEmpty && in.module.explicitArtifacts.isEmpty && in.configurations.isEmpty)
+			if(in.dependencies.isEmpty && in.ivyXML.isEmpty && (in.module.explicitArtifacts.size <= 1) && in.configurations.isEmpty)
 				externalSettings
 			else if(useDefaultConfigurations)
 				in withConfigurations ( Configurations.defaultMavenConfigurations )
@@ -607,7 +607,7 @@ trait ReflectiveArtifacts extends ManagedProject
 		{
 			case Maven => reflective ++ List(Artifact(artifactID, "pom", "pom"))
 			case Ivy => reflective
-			case Auto => Set.empty
+			case Auto => reflective
 		}
 	}
 	def reflectiveArtifacts: Set[Artifact] = Set(Reflective.reflectiveMappings[Artifact](this).values.toList: _*)

From 282c80c600f203afa3a796a249971a024989185c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 6 Feb 2010 17:01:55 -0500
Subject: [PATCH 228/268] Fix ParentProjects and dependency management

---
 src/main/scala/sbt/BasicProjectTypes.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index add1c5c94..afbbcadaa 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -63,6 +63,9 @@ trait IvyTasks extends Project
 		{
 			try { action; None }
 			catch {
+				case e: ResolveException =>
+					log.error(e.toString)
+					Some(e.toString)
 				case e: Exception =>
 					log.trace(e)
 					log.error(e.toString)
@@ -562,7 +565,6 @@ trait ReflectiveProject extends ReflectiveModules with ReflectiveTasks with Refl
 /** This Project subclass is used to contain other projects as dependencies.*/
 class ParentProject(val info: ProjectInfo) extends BasicDependencyProject
 {
-	override def moduleSettings = externalSettings
 	def dependencies: Iterable[Project] = info.dependencies ++ subProjects.values.toList
 	/** The directories to which a project writes are listed here and is used
 	* to check a project and its dependencies for collisions.*/

From b7d5472e213ce77c40a365fae310932813fc2a37 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 6 Feb 2010 17:42:40 -0500
Subject: [PATCH 229/268] Improved test for publish-local

---
 .../publish-local/project/build.properties    |  1 +
 .../project/build/MultiPublishTest.scala      |  6 +++-
 .../project/changes/RetrieveTest.scala        | 15 ++++++++
 .../dependency-management/publish-local/test  | 36 ++++++++++++++-----
 4 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala

diff --git a/src/sbt-test/dependency-management/publish-local/project/build.properties b/src/sbt-test/dependency-management/publish-local/project/build.properties
index 5a5bc0dec..f3dadda06 100644
--- a/src/sbt-test/dependency-management/publish-local/project/build.properties
+++ b/src/sbt-test/dependency-management/publish-local/project/build.properties
@@ -1,2 +1,3 @@
 project.name=Publish Test
+project.organization=test
 project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
index da0e50424..4a60bc061 100644
--- a/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
+++ b/src/sbt-test/dependency-management/publish-local/project/build/MultiPublishTest.scala
@@ -7,7 +7,11 @@ class MultiPublishTest(info: ProjectInfo) extends ParentProject(info)
 			ManagedStyle.Maven
 		else
 			ManagedStyle.Auto
-	override def ivyCacheDirectory = Some(outputPath / "ivy" / "cache")
+
+	override def deliverProjectDependencies = if(managedStyle == sub.managedStyle) super.deliverProjectDependencies else Nil
+
+	override def ivyCacheDirectory = Some("ivy" / "cache")
+	override def ivyRepositories = Resolver.file("local", "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil
 	
 	lazy val sub = project("sub", "Sub Project", new SubProject(_))
 	class SubProject(info: ProjectInfo) extends DefaultProject(info)
diff --git a/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala b/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala
new file mode 100644
index 000000000..d0bec6cc8
--- /dev/null
+++ b/src/sbt-test/dependency-management/publish-local/project/changes/RetrieveTest.scala
@@ -0,0 +1,15 @@
+import sbt._
+
+class Retrieve(info: ProjectInfo) extends ParentProject(info)
+{
+	override def ivyCacheDirectory = Some(outputPath / "ivy" / "cache")
+	override def ivyRepositories = Resolver.file("local", "ivy" / "local" asFile)(Resolver.ivyStylePatterns) :: Nil
+
+	override def libraryDependencies = Set() ++( if("mavenStyle".asFile.exists) mavenStyleDependencies else autoStyleDependencies )
+
+	def autoStyleDependencies = parentDep("A") :: subDep("A") :: subDep("B") ::parentDep("D") :: Nil
+	def mavenStyleDependencies = parentDep("B") :: parentDep("C") :: subDep("C") :: subDep("D") :: Nil
+
+	def parentDep(org: String) =  org %% "publish-test" % "1.0"
+	def subDep(org: String) = org %% "sub-project" % "1.0"
+}
diff --git a/src/sbt-test/dependency-management/publish-local/test b/src/sbt-test/dependency-management/publish-local/test
index c2dd386b7..943920c4a 100644
--- a/src/sbt-test/dependency-management/publish-local/test
+++ b/src/sbt-test/dependency-management/publish-local/test
@@ -1,16 +1,34 @@
+> set project.organization A
+> reload
 > publish-local
 
-> clean 
-$ touch mavenStyle 
-> reload 
+> set project.organization B
+$ touch mavenStyle
+> reload
 > publish-local
 
-> clean 
-$ touch sub/mavenStyle 
-> reload 
+> set project.organization C
+$ touch sub/mavenStyle
+> reload
 > publish-local
 
-> clean 
-$ delete mavenStyle 
-> reload 
+> set project.organization D
+$ delete mavenStyle
+> reload
 > publish-local
+
+
+> set project.name Retrieve Test
+> clean
+$ delete project/build/
+$ copy-file project/changes/RetrieveTest.scala project/build/RetrieveTest.scala
+> reload
+
+> clean-lib
+>debug
+> update
+
+$ touch mavenStyle
+> reload
+> clean-lib
+> update
\ No newline at end of file

From a0ca8536c00cf09af480dcffa40b6153e96d022f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 6 Feb 2010 19:22:41 -0500
Subject: [PATCH 230/268] Fix 'trace' help

---
 src/main/scala/sbt/Main.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 67872e74c..38c9e8c0d 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -407,7 +407,7 @@ class xMain extends xsbti.AppMain
 		printCmd(HelpAction, "Displays this help message.")
 		printCmd(ShowCurrent, "Shows the current project, Scala version, and logging level.")
 		printCmd(Level.levels.mkString(", "), "Set logging for the current project to the specified level.")
-		printCmd(TraceCommand + " " + validTraceArguments, "Configures stack trace logging.")
+		printCmd(TraceCommand + " " + validTraceArguments, "Configures stack trace logging. " + traceExplanation)
 		printCmd(ProjectAction + " <project name>", "Sets the currently active project.")
 		printCmd(ShowProjectsAction, "Shows all available projects.")
 		printCmd(TerminateActions.elements.mkString(", "), "Terminates the build.")
@@ -690,7 +690,8 @@ class xMain extends xsbti.AppMain
 		actionValid
 	}
 
-	def validTraceArguments = "'on', 'nosbt', 'off', or <integer>.\n    'nosbt' prints stack traces up to the first sbt frame.\n    An integer argument defines the number of stack elements to show per exception."
+	def validTraceArguments = "'on', 'nosbt', 'off', or <integer>"
+	def traceExplanation = "'nosbt' prints stack traces up to the first sbt frame.  An integer gives the number of frames to show per exception."
 	private def isTerminateAction(s: String) = TerminateActions.elements.contains(s.toLowerCase)
 	private def setTraceError(log: Logger) = logError(log)("Invalid arguments for 'trace': expected " + validTraceArguments + ".")
 	private def setArgumentError(log: Logger) = logError(log)("Invalid arguments for 'set': expected property name and new value.")

From 5c34ea0a2b26bd8246288fc6d0a5a0bd8f561654 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 7 Feb 2010 14:12:40 -0500
Subject: [PATCH 231/268] Some documentation on Project

---
 src/main/scala/sbt/Project.scala | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index ae2f2abfe..2a2002438 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -249,7 +249,13 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	lazy val localScalaInstances: Seq[ScalaInstance] = localScala ++ info.parent.toList.flatMap(_.localScalaInstances)
 	def localScala: Seq[ScalaInstance] = Nil
 	def buildCompiler = new AnalyzingCompiler(buildScalaInstance, componentManager)
+	/** Get a `ScalaInstance` for the Scala version with base directory `home`.  The library and compiler jars are
+	* assumed to be at `new File(home, "lib/scala-library.jar")` and `new File(home, "lib/scala-compiler.jar")`.
+	* The label for this instance is determined by the version String in the `compiler.properties` file in `scala-compiler.jar`.*/
 	def defineScala(home: File): ScalaInstance = ScalaInstance(home, info.launcher)
+	/** Get a `ScalaInstance` for the Scala version with base directory `home`.  The library and compiler jars are
+	* assumed to be at `new File(home, "lib/scala-library.jar")` and `new File(home, "lib/scala-compiler.jar")`.
+	* `version` is used as the label for this instance.*/
 	def defineScala(version: String, home: File): ScalaInstance = ScalaInstance(version, home, info.launcher)
 
 	/** If this project is cross-building, returns `base` with an additional path component containing the scala version

From c48feb5cd207b9181bfbe6b2a4d4f634b143933a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 7 Feb 2010 14:12:57 -0500
Subject: [PATCH 232/268] versions for 0.6.13

---
 project/build.properties          | 2 +-
 scripted/project/build.properties | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index ea816b43f..cafdc2955 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.13-SNAPSHOT
+project.version=0.6.13
 scala.version=2.7.7
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 0944e8938..5919d5e18 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,8 +1,6 @@
-#Project properties
-#Thu Jan 28 10:55:25 EST 2010
 project.organization=org.scala-tools.sbt
 project.name=scripted
 sbt.version=0.5.6
-project.version=0.6.13-SNAPSHOT
+project.version=0.6.13
 scala.version=2.7.7
 project.initialize=false

From 85bbd7a29d957ee9caddb68a818bcccf589fd4f4 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 7 Feb 2010 23:45:55 -0500
Subject: [PATCH 233/268] legal cleanup

---
 NOTICE                                   | 32 ----------------------
 licenses/LICENSE_Scala                   | 35 ------------------------
 licenses/LICENSE_ScalaCheck              | 32 ----------------------
 licenses/LICENSE_specs                   | 23 ----------------
 project/plugins/Plugins.scala            |  2 +-
 scripted/LICENSE                         | 25 +++++++++++++++++
 scripted/NOTICE                          |  3 ++
 scripted/project/build/SbtTest.scala     |  2 ++
 scripted/src/main/scala/SbtHandler.scala |  4 ++-
 9 files changed, 34 insertions(+), 124 deletions(-)
 delete mode 100644 licenses/LICENSE_Scala
 delete mode 100644 licenses/LICENSE_ScalaCheck
 delete mode 100644 licenses/LICENSE_specs
 create mode 100644 scripted/LICENSE
 create mode 100644 scripted/NOTICE

diff --git a/NOTICE b/NOTICE
index 1c90f88f5..7d09e8161 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,35 +10,3 @@ Licensed under BSD-style license (see licenses/LICENSE_jdepend)
 Portions based on code by Pete Kirkham in Nailgun
 Copyright 2004, Martian Software, Inc
 Licensed under the Apache License, Version 2.0 (see licenses/LICENSE_Apache)
-
-Portions based on code from the Scala compiler
-Copyright 2002-2008 EPFL, Lausanne
-Licensed under BSD-style license (see licenses/LICENSE_Scala)
-
-JLine is distributed with the sbt launcher.
-It is licensed under a BSD-style license (see licenses/LICENSE_JLine)
-
-Apache Ivy, licensed under the Apache License, Version 2.0
-(see licenses/LICENSE_Apache) is distributed with the sbt launcher.
-It requires the following notice:
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of Ivy were originally developed by
-Jayasoft SARL (http://www.jayasoft.fr/)
-and are licensed to the Apache Software Foundation under the
-"Software Grant License Agreement"
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
\ No newline at end of file
diff --git a/licenses/LICENSE_Scala b/licenses/LICENSE_Scala
deleted file mode 100644
index 968bcd6e9..000000000
--- a/licenses/LICENSE_Scala
+++ /dev/null
@@ -1,35 +0,0 @@
-SCALA LICENSE
-
-Copyright (c) 2002-2008 EPFL, Lausanne, unless otherwise specified.
-All rights reserved.
-
-This software was developed by the Programming Methods Laboratory of the
-Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
-
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-   3. Neither the name of the EPFL nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
\ No newline at end of file
diff --git a/licenses/LICENSE_ScalaCheck b/licenses/LICENSE_ScalaCheck
deleted file mode 100644
index d8ad3a10d..000000000
--- a/licenses/LICENSE_ScalaCheck
+++ /dev/null
@@ -1,32 +0,0 @@
-ScalaCheck LICENSE
-
-Copyright (c) 2007, Rickard Nilsson
-All rights reserved.
-
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-   3. Neither the name of the author nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
\ No newline at end of file
diff --git a/licenses/LICENSE_specs b/licenses/LICENSE_specs
deleted file mode 100644
index 81af36785..000000000
--- a/licenses/LICENSE_specs
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2007-2008 Eric Torreborre
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-Neither the name of specs nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index dd0152155..3f7281ee0 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,6 +4,6 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.12"
+	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.13"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/LICENSE b/scripted/LICENSE
new file mode 100644
index 000000000..27b5d6df2
--- /dev/null
+++ b/scripted/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2008, 2009, 2010 Mark Harrah
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/scripted/NOTICE b/scripted/NOTICE
new file mode 100644
index 000000000..05434b284
--- /dev/null
+++ b/scripted/NOTICE
@@ -0,0 +1,3 @@
+Simple Build Tool: Scripted Testing
+Copyright 2008, 2009, 2010  Mark Harrah
+Licensed under BSD-style license (see LICENSE)
\ No newline at end of file
diff --git a/scripted/project/build/SbtTest.scala b/scripted/project/build/SbtTest.scala
index 896e1b933..fac2d03c9 100644
--- a/scripted/project/build/SbtTest.scala
+++ b/scripted/project/build/SbtTest.scala
@@ -8,6 +8,8 @@ class SbtTest(info: ProjectInfo) extends PluginProject(info)
 {
 	val xsbtTest = "org.scala-tools.sbt" %% "test" % version.toString
 
+	override def mainResources = super.mainResources +++ "LICENSE" +++ "NOTICE"
+
 	override def managedStyle = ManagedStyle.Ivy
 	val publishTo = Resolver.file("technically", new java.io.File("/var/dbwww/repo/"))
 }
\ No newline at end of file
diff --git a/scripted/src/main/scala/SbtHandler.scala b/scripted/src/main/scala/SbtHandler.scala
index e7a5942aa..e024a76f0 100644
--- a/scripted/src/main/scala/SbtHandler.scala
+++ b/scripted/src/main/scala/SbtHandler.scala
@@ -1,4 +1,6 @@
-
+/* sbt -- Simple Build Tool
+ * Copyright 2009  Mark Harrah
+ */
 package sbt.test
 
 import java.io.{File, IOException}

From 8cc12a00684776a44a6a41ad4a31d045b09931b9 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 8 Feb 2010 18:33:19 -0500
Subject: [PATCH 234/268] clean-plugins task and web/jsp test fix

---
 src/main/scala/sbt/BasicProjectTypes.scala |  2 +-
 src/main/scala/sbt/ScalaProject.scala      | 46 ++++++++++++----------
 src/sbt-test/web/jsp/changes/index.jsp     |  2 +-
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index afbbcadaa..83c168e3c 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -563,7 +563,7 @@ trait ReflectiveModules extends Project
 trait ReflectiveProject extends ReflectiveModules with ReflectiveTasks with ReflectiveMethods
 
 /** This Project subclass is used to contain other projects as dependencies.*/
-class ParentProject(val info: ProjectInfo) extends BasicDependencyProject
+class ParentProject(val info: ProjectInfo) extends BasicDependencyProject with Cleanable
 {
 	def dependencies: Iterable[Project] = info.dependencies ++ subProjects.values.toList
 	/** The directories to which a project writes are listed here and is used
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index bbb3869b4..8b8d2c491 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -8,32 +8,12 @@ import java.io.File
 import java.util.jar.{Attributes, Manifest}
 import scala.collection.mutable.ListBuffer
 
-trait SimpleScalaProject extends ExecProject
+trait Cleanable extends Project
 {
-	def errorTask(message: String) = task{ Some(message) }
-
 	trait CleanOption extends ActionOption
 	case class ClearAnalysis(analysis: TaskAnalysis[_, _, _]) extends CleanOption
 	case class Preserve(paths: PathFinder) extends CleanOption
 
-	case class CompileOption(val asString: String) extends ActionOption
-	case class JavaCompileOption(val asString: String) extends ActionOption
-
-	val Deprecation = CompileOption(CompileOptions.Deprecation)
-	val ExplainTypes = CompileOption("-explaintypes")
-	val Optimize = CompileOption("-optimise")
-	def Optimise = Optimize
-	val Verbose = CompileOption(CompileOptions.Verbose)
-	val Unchecked = CompileOption(CompileOptions.Unchecked)
-	val DisableWarnings = CompileOption("-nowarn")
-	def target(target: Target.Value) = CompileOption("-target:" + target)
-	object Target extends Enumeration
-	{
-		val Java1_5 = Value("jvm-1.5")
-		val Java1_4 = Value("jvm-1.4")
-		val Msil = Value("msil")
-	}
-
 	def cleanTask(paths: PathFinder, options: CleanOption*): Task =
 		cleanTask(paths, options)
 	def cleanTask(paths: PathFinder, options: => Seq[CleanOption]): Task =
@@ -53,6 +33,30 @@ trait SimpleScalaProject extends ExecProject
 				pathClean orElse restored
 			}
 		}
+	
+	lazy val cleanPlugins = cleanTask(info.pluginsOutputPath +++ info.pluginsManagedSourcePath +++ info.pluginsManagedDependencyPath)
+}
+trait SimpleScalaProject extends ExecProject with Cleanable
+{
+	def errorTask(message: String) = task{ Some(message) }
+
+	case class CompileOption(val asString: String) extends ActionOption
+	case class JavaCompileOption(val asString: String) extends ActionOption
+
+	val Deprecation = CompileOption(CompileOptions.Deprecation)
+	val ExplainTypes = CompileOption("-explaintypes")
+	val Optimize = CompileOption("-optimise")
+	def Optimise = Optimize
+	val Verbose = CompileOption(CompileOptions.Verbose)
+	val Unchecked = CompileOption(CompileOptions.Unchecked)
+	val DisableWarnings = CompileOption("-nowarn")
+	def target(target: Target.Value) = CompileOption("-target:" + target)
+	object Target extends Enumeration
+	{
+		val Java1_5 = Value("jvm-1.5")
+		val Java1_4 = Value("jvm-1.4")
+		val Msil = Value("msil")
+	}
 }
 trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProject with Exec
 {
diff --git a/src/sbt-test/web/jsp/changes/index.jsp b/src/sbt-test/web/jsp/changes/index.jsp
index 2a7d1f317..1725708c9 100644
--- a/src/sbt-test/web/jsp/changes/index.jsp
+++ b/src/sbt-test/web/jsp/changes/index.jsp
@@ -1,5 +1,5 @@
 <html>
 	<body>
-		<% out.println(" Hello World!"); %>
+		<% out.println(" Hello World 2!"); %>
 	</body>
 </html>
\ No newline at end of file

From 8ca162ef96a40cd46abfeeadc0e231d6aaad43af Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 9 Feb 2010 18:53:51 -0500
Subject: [PATCH 235/268] Update installer plugin to use 0.6.13

---
 install/extract/src/main/scala/Main.scala     |  4 +-
 .../main/scala/SelfExtractingProject.scala    |  2 +-
 install/project/build.properties              | 11 ++-
 .../project/build/InstallExtractProject.scala | 67 +++++++++++++++
 .../project/build/InstallPluginProject.scala  | 20 +++++
 install/project/build/InstallProject.scala    | 83 +------------------
 6 files changed, 99 insertions(+), 88 deletions(-)
 create mode 100644 install/project/build/InstallExtractProject.scala
 create mode 100644 install/project/build/InstallPluginProject.scala

diff --git a/install/extract/src/main/scala/Main.scala b/install/extract/src/main/scala/Main.scala
index 02770c749..89e5d333e 100644
--- a/install/extract/src/main/scala/Main.scala
+++ b/install/extract/src/main/scala/Main.scala
@@ -12,7 +12,7 @@ object Main
 	
 	def main(args: Array[String])
 	{
-		if(args.contains("debug"))
+		if( args contains "debug" )
 			log.setLevel(Level.Debug)
 		val result = OpenResource.zipFile.ioOption(FileUtilities.classLocationFile[Install], "processing", log)(process)
 		for(msg <- result)
@@ -84,7 +84,7 @@ object Main
 	private def filterEmpty(list: List[String]) = list.filter(!_.isEmpty)
 	private def run(loader: File, project: File, install: Install) =
 	{
-		val command = "java" :: "-cp" :: loader.getAbsolutePath :: filterEmpty(install.options) ::: "sbt.boot.Boot" :: filterEmpty(install.actions)
+		val command = "java" :: "-jar" :: loader.getAbsolutePath :: filterEmpty(install.options) ::: filterEmpty(install.actions)
 		val builder = new java.lang.ProcessBuilder(command.toArray : _*)
 		builder.directory(project)
 		val exitCode = (Process(builder) !<)
diff --git a/install/plugin/src/main/scala/SelfExtractingProject.scala b/install/plugin/src/main/scala/SelfExtractingProject.scala
index 516228676..8dc079e76 100644
--- a/install/plugin/src/main/scala/SelfExtractingProject.scala
+++ b/install/plugin/src/main/scala/SelfExtractingProject.scala
@@ -12,7 +12,7 @@ trait SelfExtractingProject extends Project
 	protected def createSelfExtractingJar(actions: List[String], jvmOptions: List[String], projectZip: Path, outputJar: Path): Option[String] =
 	{
 		def jarForClass(name: String) = Path.fromFile(classLocationFile(Class.forName(name)))
-		val loaderJar = jarForClass("sbt.boot.Boot")
+		val loaderJar = jarForClass("xsbti.Launcher")
 		val bytes = new ByteArrayOutputStream
 		transferAndClose(this.getClass.getResourceAsStream("extract.location"), bytes, log) orElse
 		{
diff --git a/install/project/build.properties b/install/project/build.properties
index 08c52f681..7e95b7a58 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -1,7 +1,6 @@
-#Project properties
-#Sun Jul 26 22:17:46 EDT 2009
-project.organization=org.scala-tools.sbt
 project.name=extract
-sbt.version=0.5.4
-project.version=0.2.1
-scala.version=2.7.4
+project.organization=org.scala-tools.sbt
+project.version=0.3.0
+sbt.version=0.6.13
+def.scala.version=2.7.7
+build.scala.versions=2.7.7
diff --git a/install/project/build/InstallExtractProject.scala b/install/project/build/InstallExtractProject.scala
new file mode 100644
index 000000000..255eff382
--- /dev/null
+++ b/install/project/build/InstallExtractProject.scala
@@ -0,0 +1,67 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010 Mark Harrah
+ */
+
+import sbt._
+import java.io.File
+
+protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info) with NoPublish
+{
+	override def unmanagedClasspath = super.unmanagedClasspath +++ info.sbtClasspath
+	private lazy val plugin = pluginProject
+	val mainClassName = "sbt.extract.Main"
+	val proguardConfigurationPath: Path = outputPath / "proguard.pro"
+	val toolsConfig = config("tools")
+	val defaultConfig = Configurations.Default
+	val proguardJar = "net.sf.proguard" % "proguard" % "4.3" % "tools"
+	def rootProjectDirectory = rootProject.info.projectPath
+	def outputJar = (plugin.outputPath ##) / defaultJarName
+	
+	/******** Proguard *******/
+	lazy val proguard = proguardTask dependsOn(`package`, writeProguardConfiguration, cleanProguard)
+	lazy val writeProguardConfiguration = writeProguardConfigurationTask dependsOn `package`
+	lazy val cleanProguard = cleanTask(outputJar)
+	private def proguardTask =
+		task
+		{
+			val proguardClasspathString = Path.makeString(managedClasspath(toolsConfig).get)
+			val configFile = proguardConfigurationPath.asFile.getAbsolutePath
+			val exitValue = Process("java", List("-Xmx256M", "-cp", proguardClasspathString, "proguard.ProGuard", "@" + configFile)) ! log
+			if(exitValue == 0) None else Some("Proguard failed with nonzero exit code (" + exitValue + ")")
+		}
+	private def writeProguardConfigurationTask =
+		task
+		{
+			// the template for the proguard configuration file
+			val outTemplate = """
+				|-dontoptimize
+				|-dontobfuscate
+				|-dontnote
+				|-dontwarn
+				|-libraryjars %s
+				|%s
+				|-outjars %s
+				|-ignorewarnings
+				|-keep public class %s {
+				|    public static void main(java.lang.String[]);
+				|}"""
+			
+			val defaultJar = jarPath.absolutePath
+			log.debug("proguard configuration using main jar " + defaultJar)
+			val externalDependencies = (mainCompileConditional.analysis.allExternals).map(_.getAbsoluteFile).filter(_.getName.endsWith(".jar"))
+			debugJars("external dependencies", externalDependencies)
+			// partition jars from the external jar dependencies of this project by whether they are located in the project directory
+			// if they are, they are specified with -injars, otherwise they are specified with -libraryjars
+			val (externalJars, libraryJars) = externalDependencies.toList.partition{jar => Path.relativize(rootProjectDirectory, jar).isDefined}
+			debugJars("library jars", libraryJars)
+			val externalJarStrings = externalJars.map( _ + "(!META-INF/**,!*.properties)")
+			// exclude properties files and manifests from scala-library jar
+			val inJars = (defaultJar :: externalJarStrings).map("-injars " + _).mkString("\n")
+			
+			val proguardConfiguration = outTemplate.stripMargin.format(libraryJars.mkString(File.pathSeparator), inJars, outputJar.absolutePath, mainClassName)
+			log.debug("Proguard configuration written to " + proguardConfigurationPath)
+			FileUtilities.write(proguardConfigurationPath.asFile, proguardConfiguration, log)
+		}
+	private def debugJars[T](label: String, jars: Iterable[T]): Unit =
+		log.debug("proguard configuration " + label + ": \n\t" + jars.mkString("\n\t"))
+}
\ No newline at end of file
diff --git a/install/project/build/InstallPluginProject.scala b/install/project/build/InstallPluginProject.scala
new file mode 100644
index 000000000..36e0a7739
--- /dev/null
+++ b/install/project/build/InstallPluginProject.scala
@@ -0,0 +1,20 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2009, 2010 Mark Harrah
+ */
+
+import sbt._
+import java.nio.charset.Charset
+
+protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtractProject) extends PluginProject(info)
+{
+	private lazy val extractProject = extract
+	override def mainResources = super.mainResources +++ extractProject.outputJar +++ extractLocation
+	
+	def extractLocation = (outputPath ##) / "extract.location"
+	lazy val writeProperties = task { FileUtilities.write(extractLocation.asFile, extractProject.outputJar.relativePath, Charset.forName("UTF-8"), log) }
+	override def packageAction = super.packageAction dependsOn(extractProject.proguard, writeProperties)
+	
+	override def deliverProjectDependencies = Nil
+	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
+	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
+}
\ No newline at end of file
diff --git a/install/project/build/InstallProject.scala b/install/project/build/InstallProject.scala
index bdfbe97ef..701d5bfc7 100644
--- a/install/project/build/InstallProject.scala
+++ b/install/project/build/InstallProject.scala
@@ -3,93 +3,18 @@
  */
 import sbt._
 
-import java.io.File
-import java.nio.charset.Charset
-
 class InstallerProject(info: ProjectInfo) extends ParentProject(info) with NoPublish
 {
-	lazy val installExtractor: InstallExtractProject = project("extract", "Installer Extractor", new InstallExtractProject(_, installPlugin))
+	/** Project for the sbt plugin that a project uses to generate the installer jar. */
 	lazy val installPlugin: InstallPluginProject = project("plugin", "Installer Plugin", new InstallPluginProject(_, installExtractor), installExtractor)
+	/** Project for the code that runs when the generated installer jar is run. */
+	lazy val installExtractor: InstallExtractProject = project("extract", "Installer Extractor", new InstallExtractProject(_, installPlugin))
 }
-protected class InstallPluginProject(info: ProjectInfo, extract: => InstallExtractProject) extends PluginProject(info)
-{
-	private lazy val extractProject = extract
-	override def mainResources = super.mainResources +++ extractProject.outputJar +++ extractLocation
-	
-	def extractLocation = (outputPath ##) / "extract.location"
-	lazy val writeProperties = task { FileUtilities.write(extractLocation.asFile, extractProject.outputJar.relativePath, Charset.forName("UTF-8"), log) }
-	override def packageAction = super.packageAction dependsOn(extractProject.proguard, writeProperties)
-	
-	override def deliverProjectDependencies = Nil
-	val publishTo = "Scala Tools Nexus" at "http://nexus.scala-tools.org/content/repositories/releases/"
-	Credentials(Path.fromFile(System.getProperty("user.home")) / ".ivy2" / ".credentials", log)
-}
+
 trait NoPublish extends BasicManagedProject
 {
 	override def publishLocalAction = publishAction
 	override def deliverAction = publishAction
 	override def deliverLocalAction = publishAction
 	override def publishAction = task {None}
-}
-protected class InstallExtractProject(info: ProjectInfo, pluginProject: => InstallPluginProject) extends DefaultProject(info) with NoPublish
-{
-	override def unmanagedClasspath = super.unmanagedClasspath +++ Path.lazyPathFinder(Path.fromFile(FileUtilities.sbtJar) :: Nil)
-	private lazy val plugin = pluginProject
-	val mainClassName = "sbt.extract.Main"
-	val proguardConfigurationPath: Path = outputPath / "proguard.pro"
-	val toolsConfig = config("tools")
-	val defaultConfig = Configurations.Default
-	val proguardJar = "net.sf.proguard" % "proguard" % "4.3" % "tools->default"
-	def rootProjectDirectory = rootProject.info.projectPath
-	def outputJar = (plugin.outputPath ##) / defaultJarName
-	
-	/******** Proguard *******/
-	lazy val proguard = proguardTask dependsOn(`package`, writeProguardConfiguration)
-	lazy val writeProguardConfiguration = writeProguardConfigurationTask dependsOn `package`
-	
-	private def proguardTask =
-		task
-		{
-			FileUtilities.clean(outputJar :: Nil, log)
-			val proguardClasspathString = Path.makeString(managedClasspath(toolsConfig).get)
-			val configFile = proguardConfigurationPath.asFile.getAbsolutePath
-			val exitValue = Process("java", List("-Xmx256M", "-cp", proguardClasspathString, "proguard.ProGuard", "@" + configFile)) ! log
-			if(exitValue == 0) None else Some("Proguard failed with nonzero exit code (" + exitValue + ")")
-		}
-	private def writeProguardConfigurationTask =
-		task
-		{
-			// the template for the proguard configuration file
-			val outTemplate = """
-				|-dontoptimize
-				|-dontobfuscate
-				|-dontnote
-				|-dontwarn
-				|-libraryjars %s
-				|%s
-				|-outjars %s
-				|-ignorewarnings
-				|-keep public class %s {
-				|    public static void main(java.lang.String[]);
-				|}"""
-			
-			val defaultJar = jarPath.absolutePath
-			log.debug("proguard configuration using main jar " + defaultJar)
-			val externalDependencies = (mainCompileConditional.analysis.allExternals).map(_.getAbsoluteFile).filter(_.getName.endsWith(".jar"))
-			debugJars("external dependencies", externalDependencies)
-			// partition jars from the external jar dependencies of this project by whether they are located in the project directory
-			// if they are, they are specified with -injars, otherwise they are specified with -libraryjars
-			val (externalJars, libraryJars) = externalDependencies.toList.partition{jar => Path.relativize(rootProjectDirectory, jar).isDefined}
-			debugJars("library jars", libraryJars)
-			val sbtJarString = FileUtilities.sbtJar.getAbsolutePath + "(!META-INF/**,!licenses/**,LICENSE,NOTICE,!*.xml)"
-			val externalJarStrings = externalJars.map( _ + "(!META-INF/**,!*.properties)")
-			// exclude properties files and manifests from scala-library jar
-			val inJars = (defaultJar :: externalJarStrings).map("-injars " + _).mkString("\n")
-			
-			val proguardConfiguration = outTemplate.stripMargin.format(libraryJars.mkString(File.pathSeparator), inJars, outputJar.absolutePath, mainClassName)
-			log.debug("Proguard configuration written to " + proguardConfigurationPath)
-			FileUtilities.write(proguardConfigurationPath.asFile, proguardConfiguration, log)
-		}
-	private def debugJars[T](label: String, jars: Iterable[T]): Unit =
-		log.debug("proguard configuration " + label + ": \n\t" + jars.mkString("\n\t"))
 }
\ No newline at end of file

From a863e866d5ed5b58ac15e7f4d85d84da841c264d Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 9 Feb 2010 18:54:30 -0500
Subject: [PATCH 236/268] small logging fix

---
 src/main/scala/sbt/Project.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 2a2002438..0ff98d73d 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -200,7 +200,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 		result match
 		{
 			case LoadSetupDeclined => Predef.error("No project exists at path " + path)
-			case lse: LoadSetupError => Predef.error("Error setting up new project at path " + Path + " : " + lse.message)
+			case lse: LoadSetupError => Predef.error("Error setting up new project at path " + path + " : " + lse.message)
 			case err: LoadError => Predef.error("Error loading project at path " + path + " : " + err.message)
 			case success: LoadSuccess => success.project
 		}

From 8bea7ec3161114edb6b7832ac2deb6386f490b01 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Feb 2010 16:29:09 -0500
Subject: [PATCH 237/268]  * Make tab completion of method tasks lazy, so that
 javap and test-only don't slow down initial tab completion.  * cleanup of
 builder related code, including removing duplication from classpath in
 console-project  * only replace relevant version in build.scala.versions when
 user enters new Scala version to replace bad entry

---
 project/build.properties                   |  2 +-
 src/main/scala/sbt/BasicProjectTypes.scala |  2 +-
 src/main/scala/sbt/BuilderProject.scala    | 11 +++--
 src/main/scala/sbt/LineReader.scala        | 15 +++++--
 src/main/scala/sbt/Main.scala              |  3 +-
 src/main/scala/sbt/Project.scala           | 47 +++++++++++++++-------
 src/main/scala/sbt/Run.scala               |  7 +---
 src/main/scala/sbt/ScalaProject.scala      |  6 +--
 8 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index cafdc2955..ea56294fa 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,5 @@
 project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
 sbt.version=0.5.6
-project.version=0.6.13
+project.version=0.7.0-SNAPSHOT
 scala.version=2.7.7
diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 83c168e3c..0856079db 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -576,7 +576,7 @@ object Reflective
 {
 	def reflectiveMappings[T](obj: AnyRef)(implicit m: scala.reflect.Manifest[T]): Map[String, T] =
 	{
-		val mappings = new mutable.OpenHashMap[String, T]
+		val mappings = new mutable.HashMap[String, T]
 		for ((name, value) <- ReflectUtilities.allVals[T](obj))
 			mappings(ReflectUtilities.transformCamelCase(name, '-')) = value
 		mappings
diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index 9545b04bc..0697659e8 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -59,7 +59,7 @@ private sealed abstract class BasicBuilderProject extends InternalProject
 
 		import xsbt.ScalaInstance
 
-	val definitionCompileConditional = new BuilderCompileConditional(definitionCompileConfiguration, buildCompiler, tpe)
+	lazy val definitionCompileConditional = new BuilderCompileConditional(definitionCompileConfiguration, buildCompiler, tpe)
 	final class BuilderCompileConditional(config: BuilderCompileConfiguration, compiler: xsbt.AnalyzingCompiler, tpe: String) extends AbstractCompileConditional(config, compiler)
 	{
 		type AnalysisType = BuilderCompileAnalysis
@@ -111,9 +111,9 @@ private sealed abstract class BasicBuilderProject extends InternalProject
 	override final def methods = Map.empty
 }
 /** The project definition used to build project definitions. */
-private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, additional: PathFinder, rawLogger: Logger) extends BasicBuilderProject
+private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path, rawLogger: Logger) extends BasicBuilderProject
 {
-	private lazy val pluginProject =
+	lazy val pluginProject =
 	{
 		if(pluginPath.exists)
 			Some(new PluginBuilderProject(ProjectInfo(pluginPath.asFile, Nil, None)(rawLogger, info.app, info.buildScalaVersion)))
@@ -121,15 +121,14 @@ private final class BuilderProject(val info: ProjectInfo, val pluginPath: Path,
 			None
 	}
 	override def projectClasspath = super.projectClasspath +++
-		pluginProject.map(_.pluginClasspath).getOrElse(Path.emptyPathFinder) +++
-		additional
+		pluginProject.map(_.pluginClasspath).getOrElse(Path.emptyPathFinder)
 	def tpe = "project definition"
 
 	override def compileTask = super.compileTask dependsOn(pluginProject.map(_.syncPlugins).toList : _*)
 
 	final class PluginBuilderProject(val info: ProjectInfo) extends BasicBuilderProject
 	{
-		val pluginUptodate = propertyOptional[Boolean](false)
+		lazy val pluginUptodate = propertyOptional[Boolean](false)
 		def tpe = "plugin definition"
 		def managedSourcePath = path(BasicDependencyPaths.DefaultManagedSourceDirectoryName)
 		def managedDependencyPath = crossPath(BasicDependencyPaths.DefaultManagedDirectoryName)
diff --git a/src/main/scala/sbt/LineReader.scala b/src/main/scala/sbt/LineReader.scala
index b67651b62..476621ea5 100644
--- a/src/main/scala/sbt/LineReader.scala
+++ b/src/main/scala/sbt/LineReader.scala
@@ -10,8 +10,15 @@ trait LineReader extends NotNull
 class Completors(val projectAction: String, val projectNames: Iterable[String],
 	val generalCommands: Iterable[String], val propertyActions: Iterable[String],
 	val specificPrefix: String, val scalaVersions: Iterable[String],
-	val prefixes: Iterable[String], val taskNames: Iterable[String], 
-	val propertyNames: Iterable[String], val extra: Iterable[(String, Iterable[String])]) extends NotNull
+	val prefixes: Iterable[String], val taskNames: Iterable[String],
+	val propertyNames: Iterable[String], val extra: ExtraCompletions) extends NotNull
+
+trait ExtraCompletions extends NotNull
+{
+	def names: Iterable[String]
+	def completions(name: String): Iterable[String]
+}
+
 
 import jline.{Completor, ConsoleReader}
 abstract class JLine extends LineReader
@@ -91,8 +98,10 @@ object MainCompletor
 			val specific = simpleCompletor(specificPrefix :: Nil) // TODO
 			new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
 		}
+		def extraCompletor(name: String) =
+			repeatedArgumentCompletor(simpleCompletor(name :: Nil), new LazyCompletor(simpleCompletor(extra.completions(name))))
 		val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
-		val extraCompletors = for( (first, repeat) <- extra) yield repeatedArgumentCompletor(simpleCompletor(first :: Nil), simpleCompletor(repeat))
+		val extraCompletors = extra.names.map(extraCompletor)
 		val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
 		val baseCompletor = new MultiCompletor(baseCompletors.toArray)
 
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 38c9e8c0d..884a2147b 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -310,7 +310,8 @@ class xMain extends xsbti.AppMain
 		lazy val projectNames = baseProject.projectClosure.map(_.name)
 		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
 		lazy val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value)
-		lazy val methodCompletions = for( (name, method) <- project.methods) yield (name, method.completions)
+		lazy val methods = project.methods
+		lazy val methodCompletions = new ExtraCompletions { def names = methods.keys.toList; def completions(name: String) = methods(name).completions }
 		lazy val completors = new Completors(ProjectAction, projectNames, interactiveCommands, List(GetAction, SetAction), SpecificBuildPrefix, scalaVersions, prefixes, project.taskNames, project.propertyNames, methodCompletions)
 		val reader = new LazyJLineReader(baseProject.historyPath, MainCompletor(completors), baseProject.log)
 		reader.readLine("> ").getOrElse(ExitCommand)
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index 0ff98d73d..c14978333 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -233,16 +233,21 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	def buildScalaInstance = buildScalaInstance0
 	final def buildScalaInstance0: ScalaInstance =
 	{
-		try { getScalaInstance(buildScalaVersion) }
+		val scalaVersion = buildScalaVersion
+		try { getScalaInstance(scalaVersion) }
 		catch { case e: xsbti.RetrieveException if info.buildScalaVersion.isEmpty => // only catch the exception if this is the default Scala version
 			log.error(e.getMessage)
 			SimpleReader.readLine("\nProvide a new Scala version or press enter to exit: ") match
 			{
-				case Some(v) if v.length > 0=> buildScalaVersions() = v; saveEnvironment(); buildScalaInstance0
+				case Some(v) if v.length > 0=>
+					buildScalaVersions() = replace(scalaVersion, v)
+					saveEnvironment()
+					buildScalaInstance0
 				case _ => throw e
 			}
 		}
 	}
+	private def replace(originalV: String, newV: String) = buildScalaVersions.value.replaceAll("""\b\Q""" + originalV + """\E\b""", newV)
 	def getScalaInstance(version: String) =
 		localScalaInstances.find(_.version == version) getOrElse
 			xsbt.ScalaInstance(version, info.launcher)
@@ -407,28 +412,40 @@ object Project
 		}
 		val useName = p.projectName.get.getOrElse("at " + p.info.projectDirectory.getAbsolutePath)
 		checkDependencies(useName, p.info.dependencies, log)
+		p.buildScalaInstance // done so that build Scala version is initialized on project startup
 		p
 	}
 	/** Compiles the project definition classes and returns the project definition class name
 	* and the class loader that should be used to load the definition. */
 	private def getProjectDefinition(info: ProjectInfo, buildLog: Logger): Either[String, Class[P] forSome { type P <: Project }] =
-	{
-		val builderProjectPath = info.builderPath / BuilderProjectDirectoryName
-		if(builderProjectPath.asFile.isDirectory)
+		getProjectBuilder(info, buildLog) match
 		{
-			val pluginProjectPath = info.builderPath / PluginProjectDirectoryName
-			val additionalPaths = info.sbtClasspath
-			val builderInfo = ProjectInfo(builderProjectPath.asFile, Nil, None)(buildLog, info.app, Some(info.definitionScalaVersion))
-			val builderProject = new BuilderProject(builderInfo, pluginProjectPath, additionalPaths, buildLog)
-			builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
-				builderProject.projectDefinition.right.map {
-					case Some(definition) =>  getProjectClass[Project](definition, builderProject.projectClasspath, getClass.getClassLoader)
-					case None => DefaultBuilderClass
-				}
+			case Some(builder) => buildProjectDefinition(builder)
+			case None => Right(DefaultBuilderClass)
+		}
+	private def buildProjectDefinition(builderProject: BuilderProject): Either[String, Class[P] forSome { type P <: Project }] =
+		builderProject.compile.run.toLeft(()).right.flatMap { ignore =>
+			builderProject.projectDefinition.right.map {
+				case Some(definition) =>  getProjectClass[Project](definition, builderProject.projectClasspath, getClass.getClassLoader)
+				case None => DefaultBuilderClass
 			}
 		}
+	private[sbt] def getProjectClasspath(project: Project): PathFinder =
+		getProjectBuilder(project.info, project.log) match
+		{
+			case Some(builder) => builder.projectClasspath
+			case None => project.info.sbtClasspath
+		}
+	private[sbt] def getProjectBuilder(info: ProjectInfo, buildLog: Logger): Option[BuilderProject] =
+	{
+		if(info.builderProjectPath.asFile.isDirectory)
+		{
+			val builderInfo = ProjectInfo(info.builderProjectPath.asFile, Nil, None)(buildLog, info.app, Some(info.definitionScalaVersion))
+			val builderProject = new BuilderProject(builderInfo, info.pluginsPath, buildLog)
+			Some(builderProject)
+		}
 		else
-			Right(DefaultBuilderClass)
+			None
 	}
 	/** Verifies that the given list of project dependencies contains no nulls.  The
 	* String argument should be the project name with the dependencies.*/
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 3a04533a4..9be5b208e 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -109,11 +109,8 @@ object Run
 		override def createInterpreter()
 		{
 			val projectLoader = project.getClass.getClassLoader
-			val launcherJar = FileUtilities.classLocationFile[xsbti.Launcher]
-			val app = project.info.app
-			val projectJars: Array[File] = projectLoader.asInstanceOf[URLClassLoader].getURLs.flatMap(ClasspathUtilities.asFile).toArray[File]
-			val classpathFiles = app.mainClasspath ++ app.scalaProvider.jars ++ Array(launcherJar) ++ projectJars
-			compilerSettings.classpath.value = classpathFiles.map(_.getAbsolutePath).mkString(File.pathSeparator)
+			val classpath = Project.getProjectClasspath(project)
+			compilerSettings.classpath.value = Path.makeString(classpath.get ++ Path.fromFiles(project.info.app.scalaProvider.jars))
 			project.log.debug("  Compiler classpath: " + compilerSettings.classpath.value)
 
 			in = InteractiveReader.createDefault()
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index 8b8d2c491..ad2aa4075 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -125,7 +125,7 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 		val Private = Value("private")
 	}
 
-	def javapTask(classpath: PathFinder, conditional: CompileConditional, compilePath: Path) =
+	def javapTask(classpath: PathFinder, conditional: => CompileConditional, compilePath: Path) =
 	 task { args =>
 		val cp = classpath +++ Path.fromFile(FileUtilities.scalaLibraryJar) +++ Path.fromFile(FileUtilities.scalaCompilerJar)
 		execOut { Process("javap" :: "-classpath" :: Path.makeString(cp.get) :: args.toList) }
@@ -179,9 +179,9 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 	}
 	private def toTask(testTask: NamedTestTask) = task(testTask.run()) named(testTask.name)
 
-	def graphSourcesTask(outputDirectory: Path, roots: PathFinder, analysis: CompileAnalysis): Task =
+	def graphSourcesTask(outputDirectory: Path, roots: PathFinder, analysis: => CompileAnalysis): Task =
 		task { DotGraph.sources(analysis, outputDirectory, roots.get, log) }
-	def graphPackagesTask(outputDirectory: Path, roots: PathFinder, analysis: CompileAnalysis): Task =
+	def graphPackagesTask(outputDirectory: Path, roots: PathFinder, analysis: => CompileAnalysis): Task =
 		task { DotGraph.packages(analysis, outputDirectory, roots.get, log) }
 	def scaladocTask(label: String, sources: PathFinder, outputDirectory: Path, classpath: PathFinder, options: ScaladocOption*): Task =
 		scaladocTask(label, sources, outputDirectory, classpath, options)

From bbe980e9a5fba2e839affe469780963a738cb040 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Feb 2010 17:36:54 -0500
Subject: [PATCH 238/268] remove unneeded arguments to Resources

---
 src/main/scala/sbt/Resources.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/Resources.scala b/src/main/scala/sbt/Resources.scala
index 5ea2510f8..5c7137258 100644
--- a/src/main/scala/sbt/Resources.scala
+++ b/src/main/scala/sbt/Resources.scala
@@ -9,7 +9,7 @@ import FileUtilities._
 
 object Resources
 {
-	def apply(basePath: String, provider: AppProvider, buildScalaVersion: Option[String]) =
+	def apply(basePath: String) =
 	{
 		require(basePath.startsWith("/"))
 		val resource = getClass.getResource(basePath)
@@ -19,7 +19,7 @@ object Resources
 		{
 			val file = toFile(resource)
 			if(file.exists)
-				new Resources(file, provider, buildScalaVersion)
+				new Resources(file)
 			else
 				error("Resource base directory '" + basePath + "' does not exist.")
 		}
@@ -27,7 +27,7 @@ object Resources
 	private val LoadErrorPrefix = "Error loading initial project: "
 }
 
-class Resources(val baseDirectory: File, app: AppProvider, buildScalaVersion: Option[String])
+class Resources(val baseDirectory: File)
 {
 	import Resources._
 	// The returned directory is not actually read-only, but it should be treated that way

From 345d2fbfcdf28b118806665cfff56c34ecdac93f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 14 Feb 2010 20:21:05 -0500
Subject: [PATCH 239/268] Fix issue where projects using scala-compiler.jar
 were always recompiled

---
 src/main/scala/sbt/Conditional.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Conditional.scala b/src/main/scala/sbt/Conditional.scala
index e85e1c68e..d02c8e753 100644
--- a/src/main/scala/sbt/Conditional.scala
+++ b/src/main/scala/sbt/Conditional.scala
@@ -248,9 +248,10 @@ abstract class AbstractCompileConditional(val config: AbstractCompileConfigurati
 	protected def productLastModified(product: Path) = product.asFile.lastModified
 
 	private def libraryJar = compiler.scalaInstance.libraryJar
+	private def compilerJar = compiler.scalaInstance.compilerJar
 	protected def externalInfo(externals: Iterable[File]) =
 	{
-		val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get)
+		val (classpathJars, classpathDirs) = ClasspathUtilities.buildSearchPaths(classpath.get ++ Seq(Path.fromFile(libraryJar),  Path.fromFile(compilerJar)))
 		for(external <- externals) yield
 		{
 			val available = external.exists && (external == libraryJar || ClasspathUtilities.onClasspath(classpathJars, classpathDirs, external) )

From 9605435d874027e581ccc865aa5fc6d763360b57 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 14 Feb 2010 20:22:07 -0500
Subject: [PATCH 240/268] cleanup console-project

---
 src/main/scala/sbt/Run.scala | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index 9be5b208e..d82974634 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -99,8 +99,8 @@ object Run
 	*   import Process._
 	*   import current._.
 	* To do this,
-	* 1)  The compiler uses a different settings instance: 'compilerSettings', which will have its classpath set to include the classpath
-	*    of the loader that loaded 'project'.  The compiler can then find the classes it needs to compile code referencing the project.
+	* 1)  The compiler uses a different settings instance: 'compilerSettings', which will have its classpath set to include
+	*    the Scala compiler and library jars and the classpath used to compile the project.
 	* 2) The parent class loader for the interpreter is the loader that loaded the project, so that the project can be bound to a variable
 	*    in the interpreter.
 	*/
@@ -110,8 +110,9 @@ object Run
 		{
 			val projectLoader = project.getClass.getClassLoader
 			val classpath = Project.getProjectClasspath(project)
-			compilerSettings.classpath.value = Path.makeString(classpath.get ++ Path.fromFiles(project.info.app.scalaProvider.jars))
-			project.log.debug("  Compiler classpath: " + compilerSettings.classpath.value)
+			val fullClasspath = classpath.get ++ Path.fromFiles(project.info.app.scalaProvider.jars)
+			compilerSettings.classpath.value = Path.makeString(fullClasspath)
+			project.log.debug("  console-project classpath:\n\t" + fullClasspath.mkString("\n\t"))
 
 			in = InteractiveReader.createDefault()
 			interpreter = new Interpreter(settings)

From c8081e020af7d6fddbda8d7d6601c4aa192e43f7 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 14 Feb 2010 20:22:26 -0500
Subject: [PATCH 241/268] filter and flatMap on Path

---
 src/main/scala/sbt/Path.scala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
index 9693bfa70..7affd5a58 100644
--- a/src/main/scala/sbt/Path.scala
+++ b/src/main/scala/sbt/Path.scala
@@ -269,6 +269,8 @@ sealed abstract class PathFinder extends NotNull
 		addTo(pathSet)
 		wrap.Wrappers.readOnly(pathSet)
 	}
+	final def filter(f: Path => Boolean): PathFinder = Path.lazyPathFinder(get.filter(f))
+	final def flatMap(f: Path => PathFinder): PathFinder = Path.lazyPathFinder(get.flatMap(p => f(p).get))
 	final def getFiles: scala.collection.Set[File] = Set( get.map(_.asFile).toSeq : _*)
 	final def getPaths: scala.collection.Set[String] = Set( get.map(_.absolutePath).toSeq : _*)
 	private[sbt] def addTo(pathSet: Set[Path])

From 43be49ba3d4d2e8de781157132bfde85fbe4803a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 14 Feb 2010 22:59:35 -0500
Subject: [PATCH 242/268] adjustments and versions for 0.7.0

---
 project/build.properties                 |  9 +++++----
 project/build/SbtProject.scala           | 10 ++++------
 project/plugins/Plugins.scala            |  3 ++-
 scripted/project/build.properties        |  9 +++++----
 scripted/project/build/SbtTest.scala     |  1 +
 scripted/src/main/scala/SbtHandler.scala |  7 ++++---
 scripted/src/main/scala/Scripted.scala   |  4 ++--
 7 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index ea56294fa..48c7f1db5 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,5 +1,6 @@
-project.organization=org.scala-tools.sbt
 project.name=Simple Build Tool
-sbt.version=0.5.6
-project.version=0.7.0-SNAPSHOT
-scala.version=2.7.7
+project.organization=org.scala-tools.sbt
+project.version=0.7.0
+sbt.version=0.6.13
+def.scala.version=2.7.7
+build.scala.versions=2.7.7
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 184ffb795..2487b5a3f 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -6,7 +6,7 @@ import sbt._
 import java.io.File
 import java.net.URL
 
-class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted
+class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.SbtScripted with posterous.Publish
 {
 	/* Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
@@ -23,10 +23,10 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 
 	/**  configuration of scripted testing **/
 	// Set to false to show logging as it happens without buffering, true to buffer until it completes and only show if the task fails.
-	//   The output of scripted tasks executed in parallel will be inteleaved if true.
-	override def scriptedBufferLog = true
+	//   The output of scripted tasks executed in parallel will be inteleaved if false.
+	//override def scriptedBufferLog = true
 	// Configure which versions of Scala to test against for those tests that do cross building
-	override def scriptedCompatibility = sbt.test.CompatibilityLevel.Full
+	//override def scriptedCompatibility = sbt.test.CompatibilityLevel.Minimal
 
 	override def useDefaultConfigurations = false
 	val default = Configurations.Default
@@ -34,8 +34,6 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	val provided = Configurations.Provided
 	val testConf = Configurations.Test
 
-	override def crossScalaVersions = Set("2.7.7")
-
 	//testing
 	val scalacheck = "org.scala-tools.testing" %% "scalacheck" % "1.6" % "test"
 
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 3f7281ee0..5d67a4b0d 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,6 +4,7 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-	val scripted = "org.scala-tools.sbt" % "scripted" % "0.6.13"
+//	val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0-SNAPSHOT"
+//	val posterous = "net.databinder" % "posterous-sbt" % "0.1.0-SNAPSHOT"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 5919d5e18..d2c0f2559 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,6 +1,7 @@
-project.organization=org.scala-tools.sbt
 project.name=scripted
-sbt.version=0.5.6
-project.version=0.6.13
-scala.version=2.7.7
+project.organization=org.scala-tools.sbt
+project.version=0.7.0
+sbt.version=0.7.0
+def.scala.version=2.7.7
+build.scala.versions=2.7.7
 project.initialize=false
diff --git a/scripted/project/build/SbtTest.scala b/scripted/project/build/SbtTest.scala
index fac2d03c9..091847a8e 100644
--- a/scripted/project/build/SbtTest.scala
+++ b/scripted/project/build/SbtTest.scala
@@ -7,6 +7,7 @@ import sbt._
 class SbtTest(info: ProjectInfo) extends PluginProject(info)
 {
 	val xsbtTest = "org.scala-tools.sbt" %% "test" % version.toString
+	val interface = "org.scala-tools.sbt" % "launcher-interface" % version.toString % "provided"
 
 	override def mainResources = super.mainResources +++ "LICENSE" +++ "NOTICE"
 
diff --git a/scripted/src/main/scala/SbtHandler.scala b/scripted/src/main/scala/SbtHandler.scala
index e024a76f0..acd98c122 100644
--- a/scripted/src/main/scala/SbtHandler.scala
+++ b/scripted/src/main/scala/SbtHandler.scala
@@ -32,7 +32,9 @@ final class SbtHandler(directory: File, log: Logger, server: IPC.Server) extends
 		}
 	def newRemote =
 	{
-		val builder = new java.lang.ProcessBuilder("xsbt", "<" + server.port).directory(directory)
+		val launcherJar = FileUtilities.classLocationFile(Class.forName("xsbti.AppProvider")).getAbsolutePath
+		val args = "java" :: "-jar" :: launcherJar :: ( "<" + server.port) :: Nil
+		val builder = new java.lang.ProcessBuilder(args.toArray : _*).directory(directory)
 		val io = BasicIO(log, false).withInput(_.close())
 		val p = Process(builder) run( io )
 		Spawn { p.exitValue(); server.close() }
@@ -40,9 +42,8 @@ final class SbtHandler(directory: File, log: Logger, server: IPC.Server) extends
 		catch { case e: java.net.SocketException => error("Remote sbt initialization failed") }
 		p
 	}
+	import java.util.regex.Pattern.{quote => q}
 	// if the argument contains spaces, enclose it in quotes, quoting backslashes and quotes
 	def escape(argument: String) =
 		if(argument.contains(" ")) "\"" + argument.replaceAll(q("""\"""), """\\""").replaceAll(q("\""), "\\\"") + "\"" else argument
-	def q(s: String) = java.util.regex.Pattern.quote(s)
-//		Process("java" :: "-classpath" :: classpath.map(_.getAbsolutePath).mkString(File.pathSeparator) :: "xsbt.boot.Boot" :: ( "<" + server.port) :: Nil) run log
 }
diff --git a/scripted/src/main/scala/Scripted.scala b/scripted/src/main/scala/Scripted.scala
index f46ee4d42..3b5962cda 100644
--- a/scripted/src/main/scala/Scripted.scala
+++ b/scripted/src/main/scala/Scripted.scala
@@ -29,13 +29,13 @@ final case class ScriptedTest(group: String, name: String) extends NotNull
 trait Scripted extends Project with MultiTaskProject
 {
 	def scriptedCompatibility = CompatibilityLevel.Minimal
-	def scriptedDefScala = scalaVersion.value.toString
+	def scriptedDefScala = buildScalaVersion
 	def scriptedSbt = projectVersion.value.toString
 	def scriptedBufferLog = true
 	
 	def sbtTests: Path
 	def scriptedTask(dependencies: ManagedTask*) = dynamic(scriptedTests(listTests)) dependsOn(dependencies : _*)
-	def scriptedMethodTask(dependencies: ManagedTask*) = multiTask(listTests.map(_.toString).toList) { includeFunction =>
+	def scriptedMethodTask(dependencies: ManagedTask*) = multiTask(listTests.map(_.toString).toList) { (args, includeFunction) =>
 		scriptedTests(listTests.filter(test => includeFunction(test.toString)), dependencies : _*)
 	}
 	def listTests = (new ListTests(sbtTests.asFile, include _, log)).listTests

From 3907dc36dab78558e571b8b0ecacda18e9d8300f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 14 Feb 2010 23:43:51 -0500
Subject: [PATCH 243/268] version bumps

---
 install/project/build.properties  | 2 +-
 project/build.properties          | 4 ++--
 project/build/SbtProject.scala    | 6 +++---
 project/plugins/Plugins.scala     | 2 +-
 scripted/project/build.properties | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/install/project/build.properties b/install/project/build.properties
index 7e95b7a58..53b14ff63 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -1,6 +1,6 @@
 project.name=extract
 project.organization=org.scala-tools.sbt
 project.version=0.3.0
-sbt.version=0.6.13
+sbt.version=0.7.0
 def.scala.version=2.7.7
 build.scala.versions=2.7.7
diff --git a/project/build.properties b/project/build.properties
index 48c7f1db5..55844cc15 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,6 +1,6 @@
 project.name=Simple Build Tool
 project.organization=org.scala-tools.sbt
-project.version=0.7.0
-sbt.version=0.6.13
+project.version=0.7.1-SNAPSHOT
+sbt.version=0.7.0
 def.scala.version=2.7.7
 build.scala.versions=2.7.7
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 2487b5a3f..1b2189e5c 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -6,7 +6,7 @@ import sbt._
 import java.io.File
 import java.net.URL
 
-class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.SbtScripted with posterous.Publish
+class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted //with posterous.Publish
 {
 	/* Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
@@ -24,9 +24,9 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) //with test.Sbt
 	/**  configuration of scripted testing **/
 	// Set to false to show logging as it happens without buffering, true to buffer until it completes and only show if the task fails.
 	//   The output of scripted tasks executed in parallel will be inteleaved if false.
-	//override def scriptedBufferLog = true
+	override def scriptedBufferLog = true
 	// Configure which versions of Scala to test against for those tests that do cross building
-	//override def scriptedCompatibility = sbt.test.CompatibilityLevel.Minimal
+	override def scriptedCompatibility = sbt.test.CompatibilityLevel.Minimal
 
 	override def useDefaultConfigurations = false
 	val default = Configurations.Default
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index 5d67a4b0d..dc50f8a8c 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -4,7 +4,7 @@ import java.net.URL
 
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
-//	val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0-SNAPSHOT"
+	val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0"
 //	val posterous = "net.databinder" % "posterous-sbt" % "0.1.0-SNAPSHOT"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index d2c0f2559..1ffc2e543 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,6 +1,6 @@
 project.name=scripted
 project.organization=org.scala-tools.sbt
-project.version=0.7.0
+project.version=0.7.1-SNAPSHOT
 sbt.version=0.7.0
 def.scala.version=2.7.7
 build.scala.versions=2.7.7

From 3c789c8a8130671a39c39339c4d3841031c8a4d7 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 15 Feb 2010 20:05:40 -0500
Subject: [PATCH 244/268] posterous-sbt plugin

---
 project/build/SbtProject.scala | 2 +-
 project/plugins/Plugins.scala  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 1b2189e5c..23ef7c534 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -6,7 +6,7 @@ import sbt._
 import java.io.File
 import java.net.URL
 
-class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted //with posterous.Publish
+class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtScripted with posterous.Publish
 {
 	/* Additional resources to include in the produced jar.*/
 	def extraResources = descendents(info.projectPath / "licenses", "*") +++ "LICENSE" +++ "NOTICE"
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index dc50f8a8c..69c22133f 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -5,6 +5,7 @@ import java.net.URL
 class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 {
 	val scripted = "org.scala-tools.sbt" % "scripted" % "0.7.0"
-//	val posterous = "net.databinder" % "posterous-sbt" % "0.1.0-SNAPSHOT"
+	val t_repo = "t_repo" at "http://tristanhunt.com:8081/content/groups/public/"
+	val posterous = "net.databinder" % "posterous-sbt" % "0.1.3"
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 }

From 46c5e0f92a684eb646dd6f52bcbc79390d7feba3 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 15 Feb 2010 20:06:17 -0500
Subject: [PATCH 245/268] Fix Jetty 7 support with JRebel

---
 src/main/scala/sbt/jetty/LazyJettyRun.scala.templ | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
index 09aec20ab..4de20ee22 100644
--- a/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
+++ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
@@ -15,6 +15,10 @@ private object LazyJettyRun${jetty.version} extends JettyRun
 
 	import java.lang.ref.{Reference, WeakReference}
 
+	// Jetty classes must be loaded on initialization in order for the version detection code in WebApp to work properly
+	//   this forces them to be loaded- otherwise, it is possible they aren't loaded until 'apply' is called
+	private[this] val forceJettyLoad = classOf[Server]
+
 	val DefaultMaxIdleTime = 30000
 
 	def apply(configuration: JettyConfiguration, jettyLoader: ClassLoader): Stoppable =

From a9b69e4425ef4dd5f5c2801d69511959c0e9d42a Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 16 Feb 2010 12:30:15 -0500
Subject: [PATCH 246/268] make-pom test for added repositories

---
 .../make-pom/project/build.properties         |  3 +
 .../make-pom/project/build/MakePomTest.scala  | 55 +++++++++++++++++++
 .../dependency-management/make-pom/test       |  7 +++
 3 files changed, 65 insertions(+)
 create mode 100644 src/sbt-test/dependency-management/make-pom/project/build.properties
 create mode 100644 src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala
 create mode 100644 src/sbt-test/dependency-management/make-pom/test

diff --git a/src/sbt-test/dependency-management/make-pom/project/build.properties b/src/sbt-test/dependency-management/make-pom/project/build.properties
new file mode 100644
index 000000000..2ca57b677
--- /dev/null
+++ b/src/sbt-test/dependency-management/make-pom/project/build.properties
@@ -0,0 +1,3 @@
+project.name=Make Pom Test
+project.organization=test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala b/src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala
new file mode 100644
index 000000000..37325d933
--- /dev/null
+++ b/src/sbt-test/dependency-management/make-pom/project/build/MakePomTest.scala
@@ -0,0 +1,55 @@
+import sbt._
+
+import scala.xml._
+
+class MakePomTest(info: ProjectInfo) extends DefaultProject(info)
+{
+	val fakeName = "fake"
+	val fakeURL = "http://example.org"
+	val fakeRepo = fakeName at fakeURL
+	
+	def extraTagName = "extra-tag"
+	override def pomExtra = <extra-tag/>
+	def readPom = XML.loadFile(pomPath.asFile)
+	def checkProject(pom: Elem): Either[String, Elem] = if(pom.label == "project") Right(pom) else Left("Top level element was not 'project': " + pom.label)
+	
+	def withPom(f: Elem => Either[String, Unit]) = task {
+		checkProject(readPom).right.flatMap(f).left.toOption
+	}
+	def withRepositories[T](pomXML: Elem)(f: NodeSeq => Either[String, T]) =
+	{
+		val repositoriesElement = pomXML \ "repositories"
+		if(repositoriesElement.size == 1) f(repositoriesElement) else Left("'repositories' element not found in generated pom")
+	}
+	
+	
+	lazy val checkExtra = withPom { pomXML =>
+		val extra =  pomXML \ extraTagName
+		if(extra.isEmpty) Left("'" + extraTagName + "' not found in generated pom.xml.") else Right(())
+	}
+	
+	lazy val checkPom = withPom { pomXML =>
+		withRepositories(pomXML) { repositoriesElement =>
+		
+			val repositories =  repositoriesElement \ "repository"
+			val writtenRepositories = Set() ++ repositories.map(read)
+			val mavenStyleRepositories = Set() ++ ivyRepositories.filter(x => x.isInstanceOf[MavenRepository] && x.name != "public").map(normalize)
+			
+			lazy val explain = ("Written:" :: writtenRepositories.toList ::: "Declared:" :: mavenStyleRepositories.toList).mkString("\n\t")
+			
+			if( writtenRepositories  == mavenStyleRepositories ) Right(())
+			else Left("Written repositories did not match declared repositories.\n\t" + explain)
+		}
+	}
+	
+	def read(repository: Node): MavenRepository =
+		(repository \ "name").text at normalize((repository \ "url").text)
+		
+	def normalize(url: String): String =
+	{
+		val base = (new java.net.URI( url )).normalize.toString
+		if(base.endsWith("/")) base else (base + "/")
+	}
+	def normalize(repo: Resolver): Resolver = repo match { case mr: MavenRepository => normalize(mr); case _ => repo }
+	def normalize(repo: MavenRepository): MavenRepository = new MavenRepository(repo.name, normalize(repo.root))
+}
\ No newline at end of file
diff --git a/src/sbt-test/dependency-management/make-pom/test b/src/sbt-test/dependency-management/make-pom/test
new file mode 100644
index 000000000..d6cd7da32
--- /dev/null
+++ b/src/sbt-test/dependency-management/make-pom/test
@@ -0,0 +1,7 @@
+-> check-pom
+-> check-extra
+
+> make-pom
+
+> check-pom
+> check-extra
\ No newline at end of file

From ff6395fc35e97e321bbfaeae02b4da0b1c5b6464 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 16 Feb 2010 19:12:18 -0500
Subject: [PATCH 247/268] New 'sbt-update' action enabled by mixing in
 UpdateSbt:  Changes 'sbt.version' after verifying the version is valid by
 downloading that version of sbt.  Updates the current launcher jar or the
 location specified in the second argument with either a downloaded
 sbt-launch-<version>.jar if available or a copy of the current launcher jar
 that uses <version> by default when starting new projects.

---
 src/main/scala/sbt/Update.scala | 213 ++++++++++++++++++++++++++++++++
 1 file changed, 213 insertions(+)
 create mode 100644 src/main/scala/sbt/Update.scala

diff --git a/src/main/scala/sbt/Update.scala b/src/main/scala/sbt/Update.scala
new file mode 100644
index 000000000..a0ba342c3
--- /dev/null
+++ b/src/main/scala/sbt/Update.scala
@@ -0,0 +1,213 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010 Mark Harrah
+ */
+package sbt
+
+/** A trait that provides a task for updating sbt.  */
+trait UpdateSbt extends Project
+{
+	/** The first argument is the version to update to and is mandatory.
+	* The second argument is the location of the launcher jar.  If omitted, the launcher used to launch the currently running instance of sbt is used.*/
+	lazy val sbtUpdate = task { args => task { (new Update(this))(args) } } describedAs("Updates the version of sbt used to build this project and updates the launcher jar.")
+}
+
+import java.io.{File, InputStream, IOException}
+import java.net.{HttpURLConnection, URL}
+import HttpURLConnection.{HTTP_NOT_FOUND , HTTP_OK}
+import SimpleReader.readLine
+import xsbt.FileUtilities.{classLocationFile, copyFile, readLines, transfer, unzip, withTemporaryDirectory, write, zip}
+import xsbt.PathMapper.relativeTo
+import xsbt.Paths._
+import xsbt.OpenResource.{fileOutputStream, urlInputStream}
+
+private class Update(project: Project)
+{
+	val info = project.info
+	val app = info.app
+	val log = project.log
+	
+	/** The location of the jar used to launch the currently running instance of sbt.*/
+	lazy val launcherJar = classLocationFile[xsbti.AppProvider]
+	/** A temporary jar file to use in the given directory. */
+	def tempJar(dir: File) = dir / launcherJar.getName
+		
+	/** Implementation of the sbt-update task: reads arguments and hands off to the other `apply`.*/
+	def apply(args: Array[String]): Option[String] =
+		args match
+		{
+			case Array(version) if validVersion(version) => apply(version, None)
+			case Array(version, temporaryJar) if validVersion(version) => apply(version, Some(new File(temporaryJar) getAbsoluteFile))
+			case _ => Some("Expected '<version>' or '<version> <new-launcher-file>', got '" + args.mkString(" ") + "'")
+		}
+
+	def validVersion(version: String) = !version.trim.isEmpty
+
+	/** Implementation of the sbt-update task after arguments have checked.  Gives user a chance to cancel and continues with `doUpdate`.*/
+	def apply(version: String, temporaryJar: Option[File]): Option[String] =
+	{
+		readLine("Updating the sbt version requires a restart.  Continue? (Y/n) ") match
+		{
+			case Some(line) if(isYes(line)) => doUpdate(version, temporaryJar)
+			case _ => Some("Update declined.")
+		}
+	}
+	/** Implementation of the sbt-update task: high-level control after initial verification.*/
+	def doUpdate(version: String, temporaryJar: Option[File]): Option[String] =
+	{
+		retrieveNewVersion(version)
+		log.info("Version is valid.  Setting 'sbt.version' to " + version + "...")
+		setNewVersion(version)
+
+		log.info("'sbt.version' updated.")
+		if(temporaryJar.isDefined || updateInPlace(version))
+		{
+			log.info("Downloading new launcher ...")
+			
+			if(downloadLauncher(version, temporaryJar))
+				log.info("Downloaded launcher.")
+			else
+				tryUpdateLauncher(version, temporaryJar)
+		}
+		else
+			log.info("Launcher update declined.")
+
+		log.info("Please restart sbt.")
+		System.exit(0)
+		None
+	}
+	/** Updates 'sbt.version' in `project/build.properties`.*/
+	def setNewVersion(version: String)
+	{
+		project.sbtVersion() = version
+		project.saveEnvironment()
+	}
+	/** Retrieves the given `version` of sbt in order to verify the version is valid.*/
+	def retrieveNewVersion(version: String)
+	{
+		val newAppID = changeVersion(app.id, version)
+		log.info("Checking repositories for sbt " + version + " ...")
+		app.scalaProvider.app(newAppID)
+	}
+	/** Asks the user whether the current launcher should be overrwritten.  Called when no file is explicitly specified as an argument. */
+	def updateInPlace(version: String) =
+	{
+		val input = readLine(" The current launcher (" + launcherJar + ") will be updated in place.  Continue? (Y/n) ")
+		isYes(input)
+	}
+	def isYes(line: Option[String]): Boolean = line.filter(isYes).isDefined
+	
+	/** Updates the launcher as in `updateLauncher` but performs various checks and logging around it. */
+	def tryUpdateLauncher(version: String, temporaryJar: Option[File])
+	{
+		log.warn("No launcher found for '" + version + "'")
+		def promptStart = if(temporaryJar.isDefined) " Copy current launcher but with " else " Modify current launcher to use "
+		val input = readLine(promptStart + version + " as the default for new projects? (Y/n) ")
+		val updated = isYes(input)
+		if(updated) updateLauncher(version, temporaryJar)
+		
+		def extra =  if(temporaryJar.isDefined) " at " + temporaryJar.get + "." else "."
+		log.info(if(updated) "Launcher updated" + extra else "Launcher not updated.")
+	}
+	/** The jar to copy/download to.  If `userJar` is not defined, it is a temporary file in `tmpDir` that should then be moved to the current launcher file.
+	* If it is defined and is a directory, the jar is defined in that directory.  If it is a file, that file is returned. */
+	def targetJar(tmpDir: File, userJar: Option[File]): File = 
+		userJar match { case Some(file) => if(file.isDirectory) tempJar(file) else file; case None => tempJar(tmpDir) }
+		
+	/** Gets the given `version` of the launcher from Google Code.  If `userProvidedJar` is defined,
+	* this updated launcher is downloaded there, otherwise it overwrites the current launcher. */
+	def downloadLauncher(version: String, userProvidedJar: Option[File]): Boolean =
+	{
+		def getLauncher(tmp: File): Boolean =
+		{
+			val temporaryJar = targetJar(tmp, userProvidedJar)
+			temporaryJar.getParentFile.mkdirs()
+			val url = launcherURL(version)
+			val connection = url.openConnection.asInstanceOf[HttpURLConnection]
+			connection.setInstanceFollowRedirects(false)
+			
+			def download(in: InputStream): Unit = fileOutputStream(false)(temporaryJar) { out => transfer(in, out) }
+			def checkAndRetrieve(in: InputStream): Boolean =  (connection.getResponseCode == HTTP_OK) && { download(in); true }
+			def handleError(e: IOException) = if(connection.getResponseCode == HTTP_NOT_FOUND ) false else throw e
+			def retrieve() =
+			{
+				val in = connection.getInputStream
+				try { checkAndRetrieve(in) } finally { in.close() }
+			}
+			
+			val success = try { retrieve() } catch { case e: IOException => handleError(e)} finally { connection.disconnect() }
+			if(success && userProvidedJar.isEmpty)
+				move(temporaryJar, launcherJar)
+			success
+		}
+		withTemporaryDirectory(getLauncher)
+	}
+	/** The location of the launcher for the given version, if it exists. */
+	def launcherURL(version: String): URL =
+		new URL("http://simple-build-tool.googlecode.com/files/sbt-launch-" + version + ".jar")
+		
+	/** True iff the given user input is empty, 'y' or 'yes' (case-insensitive).*/
+	def isYes(line: String) =
+	{
+		val lower = line.toLowerCase
+		lower.isEmpty || lower == "y" || lower == "yes"
+	}
+	/** Copies the current launcher but with the default 'sbt.version' set to `version`.  If `userProvidedJar` is defined,
+	* the updated launcher is copied there, otherwise the copy overwrites the current  launcher. */
+	def updateLauncher(version: String, userProvidedJar: Option[File])
+	{
+		def makeUpdated(base: File, newJar: File)
+		{
+			val files = unzip(launcherJar, base)
+			updateBootProperties(files, version)
+			zip(relativeTo(base)( files ), newJar)
+		}
+		def updateLauncher(tmp: File)
+		{
+			val basePath = tmp / "launcher-jar"
+			val temporaryJar = targetJar(tmp, userProvidedJar)
+			makeUpdated(basePath, temporaryJar)
+			if(userProvidedJar.isEmpty)
+				move(temporaryJar, launcherJar)
+		}
+
+		withTemporaryDirectory(updateLauncher)
+	}
+	
+	/** Copies the `src` file to the `dest` file, preferably by renaming.  The `src` file may or may not be removed.*/
+	def move(src: File, dest: File)
+	{
+		val renameSuccess = src renameTo dest
+		if(!renameSuccess)
+			copyFile(src, dest)
+	}
+	
+	/** Updates the default value used for 'sbt.version' in the 'sbt.boot.properties' file in the launcher `files` to be `version`.*/
+	def updateBootProperties(files: Iterable[File], version: String): Unit =
+		files.find(_.getName == "sbt.boot.properties").foreach(updateBootProperties(version))
+	/** Updates the default value used for 'sbt.version' in the given `file` to be `version`.*/
+	def updateBootProperties(version: String)(file: File)
+	{
+		val newContent = readLines(file) map updateSbtVersion(version)
+		write(file, newContent.mkString("\n"))
+	}
+	
+	/** If the given `line` is the 'sbt.version' configuration, update it to use the `newVersion`.*/
+	def updateSbtVersion(newVersion: String)(line: String) =
+		if(line.trim.startsWith("sbt.version")) sbtVersion(newVersion) else line
+		
+	/** The configuration line that defines the 'sbt.version' property, using the provided `version` for defaults.*/
+	def sbtVersion(version: String) =
+		" sbt.version: quick=set(" + version + "), new=prompt(sbt version)[" + version + "], fill=prompt(sbt version)[" + version + "]"
+	
+	/** Copies the given ApplicationID but with the specified version.*/
+	def changeVersion(appID: xsbti.ApplicationID, versionA: String): xsbti.ApplicationID =
+		new xsbti.ApplicationID {
+			def groupID = appID.groupID
+			def name = appID.name
+			def version = versionA
+			def mainClass = appID.mainClass
+			def mainComponents = appID.mainComponents
+			def crossVersioned = appID.crossVersioned
+			def classpathExtra = appID.classpathExtra
+		}
+}

From 522b412d14cee5a887d0d5dc321728d6d426f53d Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 19 Feb 2010 18:59:33 -0500
Subject: [PATCH 248/268] processors

---
 src/main/scala/sbt/BuilderProject.scala       |  10 ++
 src/main/scala/sbt/Main.scala                 |  38 +++++-
 .../scala/sbt/processor/CommandRunner.scala   |  28 ++++
 src/main/scala/sbt/processor/Execute.scala    |  24 ++++
 src/main/scala/sbt/processor/Handler.scala    |  34 +++++
 src/main/scala/sbt/processor/Info.scala       |  26 ++++
 src/main/scala/sbt/processor/Loader.scala     |  41 ++++++
 src/main/scala/sbt/processor/Manager.scala    |  84 ++++++++++++
 src/main/scala/sbt/processor/Parser.scala     |  50 +++++++
 src/main/scala/sbt/processor/Persist.scala    |  26 ++++
 src/main/scala/sbt/processor/Processor.scala  | 125 ++++++++++++++++++
 src/main/scala/sbt/processor/Retrieve.scala   |  30 +++++
 12 files changed, 512 insertions(+), 4 deletions(-)
 create mode 100644 src/main/scala/sbt/processor/CommandRunner.scala
 create mode 100644 src/main/scala/sbt/processor/Execute.scala
 create mode 100644 src/main/scala/sbt/processor/Handler.scala
 create mode 100644 src/main/scala/sbt/processor/Info.scala
 create mode 100644 src/main/scala/sbt/processor/Loader.scala
 create mode 100644 src/main/scala/sbt/processor/Manager.scala
 create mode 100644 src/main/scala/sbt/processor/Parser.scala
 create mode 100644 src/main/scala/sbt/processor/Persist.scala
 create mode 100644 src/main/scala/sbt/processor/Processor.scala
 create mode 100644 src/main/scala/sbt/processor/Retrieve.scala

diff --git a/src/main/scala/sbt/BuilderProject.scala b/src/main/scala/sbt/BuilderProject.scala
index 0697659e8..793c7c1b9 100644
--- a/src/main/scala/sbt/BuilderProject.scala
+++ b/src/main/scala/sbt/BuilderProject.scala
@@ -221,4 +221,14 @@ class PluginProject(info: ProjectInfo) extends DefaultProject(info)
 	/* Some setup to make publishing quicker to configure. */
 	override def useMavenConfigurations = true
 	override def managedStyle = ManagedStyle.Maven
+}
+class ProcessorProject(info: ProjectInfo) extends DefaultProject(info)
+{
+	/* Fix the version used to build to the version currently running sbt. */
+	override def buildScalaVersion = defScalaVersion.value
+	/* Add sbt to the classpath */
+	override def unmanagedClasspath = super.unmanagedClasspath +++ info.sbtClasspath
+	/* Some setup to make publishing quicker to configure. */
+	override def useMavenConfigurations = true
+	override def managedStyle = ManagedStyle.Maven
 }
\ No newline at end of file
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 884a2147b..7ba273dce 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -1,5 +1,5 @@
 /* sbt -- Simple Build Tool
- * Copyright 2008, 2009  Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
+ * Copyright 2008, 2009, 2010  Steven Blundy, Mark Harrah, David MacIver, Mikko Peltonen
  */
 package sbt
 
@@ -117,6 +117,7 @@ class xMain extends xsbti.AppMain
 		def ExitOnFailure = None
 		lazy val interactiveContinue = Some( InteractiveCommand )
 		def remoteContinue(port: Int) = Some( FileCommandsPrefix + "-" + port )
+		lazy val PHandler = new processor.Handler(baseProject)
 		
 		// replace in 2.8
 		trait Trampoline
@@ -134,6 +135,7 @@ class xMain extends xsbti.AppMain
 			def rememberCurrent(newArgs: List[String]) = rememberProject(rememberFail(newArgs))
 			def rememberProject(newArgs: List[String]) = if(baseProject.name != project.name) (ProjectAction + " " + project.name) :: newArgs else newArgs
 			def rememberFail(newArgs: List[String]) = failAction.map(f => (FailureHandlerPrefix + f)).toList :::  newArgs
+			def tryOrFail(action: => Trampoline)  =  try { action } catch { case e: Exception => logCommandError(project.log, e); failed(BuildErrorExitCode) }
 			def failed(code: Int) =
 				failAction match
 				{
@@ -204,7 +206,21 @@ class xMain extends xsbti.AppMain
 				case action :: tail if action.startsWith(FailureHandlerPrefix) =>
 					val errorAction = action.substring(FailureHandlerPrefix.length).trim
 					continue(project, tail, if(errorAction.isEmpty) None else Some(errorAction) )
-					
+
+				case action :: tail if action.startsWith(ProcessorPrefix) =>
+					val processorCommand = action.substring(ProcessorPrefix.length).trim
+					val runner = processor.CommandRunner(PHandler.manager, PHandler.defParser, ProcessorPrefix, project.log)
+					tryOrFail {
+						runner(processorCommand)
+						continue(project, tail, failAction)
+					}
+
+				case PHandler(processor, arguments) :: tail =>
+					 tryOrFail {
+						val result =processor(project, arguments)
+						continue(project, result.insertArguments ::: tail, failAction)
+					 }
+		
 				case action :: tail =>
 					val success = processAction(baseProject, project, action, failAction == interactiveContinue)
 					if(success) continue(project, tail, failAction)
@@ -356,6 +372,8 @@ class xMain extends xsbti.AppMain
 	val FileCommandsPrefix = "<"
 	/** The prefix used to identify the action to run after an error*/
 	val FailureHandlerPrefix = "!"
+	/** The prefix used to identify commands for managing processors.*/
+	val ProcessorPrefix = "*"
 
 	/** The number of seconds between polling by the continuous compile command.*/
 	val ContinuousCompilePollDelaySeconds = 1
@@ -387,7 +405,7 @@ class xMain extends xsbti.AppMain
 					handleCommand(currentProject, action)
 		}
 
-	private def printCmd(name:String, desc:String) = Console.println("\t" + name + " : " + desc)
+	private def printCmd(name:String, desc:String) = Console.println("   " + name + " : " + desc)
 	val BatchHelpHeader = "You may execute any project action or method or one of the commands described below."
 	val InteractiveHelpHeader = "You may execute any project action or one of the commands described below. Only one action " +
 			"may be executed at a time in interactive mode and is entered by name, as it would be at the command line." +
@@ -399,10 +417,12 @@ class xMain extends xsbti.AppMain
 
 		printCmd("<action name>", "Executes the project specified action.")
 		printCmd("<method name> <parameter>*", "Executes the project specified method.")
+		printCmd("<processor label> <arguments>", "Runs the specified processor.")
 		printCmd(ContinuousExecutePrefix + " <command>", "Executes the project specified action or method whenever source files change.")
 		printCmd(FileCommandsPrefix + " file", "Executes the commands in the given file.  Each command should be on its own line.  Empty lines and lines beginning with '#' are ignored")
 		printCmd(CrossBuildPrefix + " <command>", "Executes the project specified action or method for all versions of Scala defined in crossScalaVersions.")
 		printCmd(SpecificBuildPrefix + "<version> <command>", "Changes the version of Scala building the project and executes the provided command.  <command> is optional.")
+		printCmd(ProcessorPrefix, "Prefix for commands for managing processors.  Run '" + ProcessorPrefix + "help' for details.")
 		printCmd(ShowActions, "Shows all available actions.")
 		printCmd(RebootCommand, "Reloads sbt, picking up modifications to sbt.version or scala.version and recompiling modified project definitions.")
 		printCmd(HelpAction, "Displays this help message.")
@@ -504,7 +524,7 @@ class xMain extends xsbti.AppMain
 	}
 	private def printTraceEnabled(project: Project)
 	{
-		def traceLevel(level: Int) = if(level == 0) " (no stack elements)" else if(level == MaxInt) "" else " (maximum " + level + " stack elements per exception)"
+		def traceLevel(level: Int) = if(level == 0) " (no sbt stack elements)" else if(level == MaxInt) "" else " (maximum " + level + " stack elements per exception)"
 		Console.println("Stack traces are " + (if(project.log.traceEnabled) "enabled" + traceLevel(project.log.getTrace) else "disabled"))
 	}
 	/** Sets the logging level on the given project.*/
@@ -700,4 +720,14 @@ class xMain extends xsbti.AppMain
 	private def setProjectError(log: Logger) = logError(log)("Invalid arguments for 'project': expected project name.")
 	private def logError(log: Logger)(s: String) = { log.error(s); false }
 
+	private def logCommandError(log: Logger, e: Throwable) =
+		e match
+		{
+			case pe: processor.ProcessorException =>
+				if(pe.getCause ne null) log.trace(pe.getCause)
+				log.error(e.getMessage)
+			case e =>
+				log.trace(e)
+				log.error(e.toString)
+		}
 }
diff --git a/src/main/scala/sbt/processor/CommandRunner.scala b/src/main/scala/sbt/processor/CommandRunner.scala
new file mode 100644
index 000000000..3428036d9
--- /dev/null
+++ b/src/main/scala/sbt/processor/CommandRunner.scala
@@ -0,0 +1,28 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+/** Parses and executes a command (connects a parser to a runner). */
+class CommandRunner(parser: CommandParsing, execute: Executing)
+{
+	def apply(processorCommand: String): Unit =
+		parser.parseCommand(processorCommand) match
+		{
+			case Left(err) => throw new ProcessorException(err)
+			case Right(command) => execute(command)
+		}
+}
+object CommandRunner
+{
+	/** Convenience method for constructing a CommandRunner with the minimal information required.*/
+	def apply(manager: Manager, defParser: DefinitionParser, prefix: String, log: Logger): CommandRunner =
+	{
+		val parser = new CommandParser(defaultErrorMessage(prefix), defParser)
+		val info = new InfoImpl(manager, prefix, parser, System.out.println)
+		val execute = new Execute(manager, info, log)
+		new CommandRunner(parser, execute)
+	}
+	def defaultErrorMessage(prefix: String) =
+		"Invalid processor command.  Run " + prefix + "help to see valid commands."
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/processor/Execute.scala b/src/main/scala/sbt/processor/Execute.scala
new file mode 100644
index 000000000..5b86b8564
--- /dev/null
+++ b/src/main/scala/sbt/processor/Execute.scala
@@ -0,0 +1,24 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+/** Executes a parsed command. */
+class Execute(manager: Manager, info: Info, log: Logger) extends Executing
+{
+	def apply(command: Command): Unit =
+		command match
+		{
+			case dr: DefineRepository =>
+				manager.defineRepository(dr.repo)
+				log.info("Defined new processor repository '" + dr.repo + "'")
+			case dp: DefineProcessor =>
+				manager.defineProcessor(dp.pdef)
+				log.info("Defined new processor '" + dp.pdef + "'")
+			case rd: RemoveDefinition =>
+				val removed = manager.removeDefinition(rd.label)
+				log.info("Removed '" + removed + "'")
+			case Help => info.help()
+			case Show => info.show()
+		}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/processor/Handler.scala b/src/main/scala/sbt/processor/Handler.scala
new file mode 100644
index 000000000..9933f2e4c
--- /dev/null
+++ b/src/main/scala/sbt/processor/Handler.scala
@@ -0,0 +1,34 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+class Handler(baseProject: Project) extends NotNull
+{
+	def unapply(line: String): Option[(Processor, String)] =
+		line.split("""\s+""", 2) match
+		{
+			case Array(GetProcessor(processor), args @ _*) => Some( (processor, args.mkString) )
+			case _ => None
+		}
+	private object GetProcessor
+	{
+		def unapply(name: String): Option[Processor] =
+			manager.processorDefinition(name).flatMap(manager.processor)
+	}
+	
+	def lock = baseProject.info.launcher.globalLock
+	
+	lazy val scalaVersion = baseProject.defScalaVersion.value
+	lazy val base = baseProject.info.bootPath / ("scala-" + scalaVersion) / "sbt-processors"
+	lazy val persistBase = Path.userHome / ".ivy2" / "sbt"
+	
+	def retrieveLockFile = base / lockName
+	def persistLockFile = persistBase / lockName
+	def lockName = "processors.lock"
+	def definitionsFile = persistBase / "processors.properties"
+	def files = new ManagerFiles(base.asFile, retrieveLockFile.asFile, definitionsFile.asFile)
+	
+	lazy val defParser = new DefinitionParser
+	lazy val manager = new ManagerImpl(files, scalaVersion, new Persist(lock, persistLockFile.asFile, defParser), baseProject.log)
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/processor/Info.scala b/src/main/scala/sbt/processor/Info.scala
new file mode 100644
index 000000000..cc84f6e33
--- /dev/null
+++ b/src/main/scala/sbt/processor/Info.scala
@@ -0,0 +1,26 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+class InfoImpl(manager: Manager, prefix: String, parser: CommandParser, print: String => Unit) extends Info
+{
+	def show()
+	{
+		print("Processors:\n\t" + manager.processors.values.mkString("\n\t"))
+		print("\nProcessor repositories:\n\t" + manager.repositories.values.mkString("\n\t"))
+	}
+	def help()
+	{
+		import parser.{ShowCommand, HelpCommand, ProcessorCommand, RemoveCommand, RepositoryCommand}
+		val usage =
+			(HelpCommand -> "Display this help message") ::
+			(ShowCommand -> "Display defined processors and repositories") ::
+			(ProcessorCommand -> "Define 'label' to be the processor with the given ID") ::
+			(RepositoryCommand -> "Add a repository for searching for processors") ::
+			(RemoveCommand -> "Undefine the repository or processor with the given 'label'") ::
+			Nil
+		
+		print("Processor management commands:\n   " + (usage.map{ case (c,d) => prefix + "" + c + "    " + d}).mkString("\n   "))
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/processor/Loader.scala b/src/main/scala/sbt/processor/Loader.scala
new file mode 100644
index 000000000..46f6a9096
--- /dev/null
+++ b/src/main/scala/sbt/processor/Loader.scala
@@ -0,0 +1,41 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+import java.io.File
+import java.net.{URL, URLClassLoader}
+import xsbt.FileUtilities.read
+import xsbt.OpenResource.urlInputStream
+import xsbt.Paths._
+import xsbt.GlobFilter._
+
+import ProcessorException.error
+
+class Loader extends NotNull
+{
+	def classNameResource = "sbt.processor"
+	def getProcessor(directory: File): Either[Throwable, Processor] = getProcessor( getLoader(directory) )
+	private def getProcessor(loader: ClassLoader): Either[Throwable, Processor] =
+	{
+		val resource = loader.getResource(classNameResource)
+		if(resource eq null) Left(new ProcessorException("Processor existed but did not contain '" + classNameResource + "' descriptor."))
+		else loadProcessor(loader, resource)
+	}
+	private def loadProcessor(loader: ClassLoader, resource : URL): Either[Throwable, Processor] =
+		try { Right(loadProcessor(loader, className(resource))) }
+		catch { case e: Exception => Left(e) }
+		
+	private def loadProcessor(loader: ClassLoader, className: String): Processor =
+	{
+		val processor = Class.forName(className, true, loader).newInstance
+		classOf[Processor].cast(processor)
+	}
+	private def className(resource: URL): String = urlInputStream(resource) { in => read(in).trim }
+	private def getLoader(dir: File) =
+	{
+		val jars = dir ** "*.jar"
+		val jarURLs = jars.files.toArray[File].map(_.toURI.toURL)
+		new URLClassLoader(jarURLs, getClass.getClassLoader)
+	}
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/processor/Manager.scala b/src/main/scala/sbt/processor/Manager.scala
new file mode 100644
index 000000000..ac7254ad9
--- /dev/null
+++ b/src/main/scala/sbt/processor/Manager.scala
@@ -0,0 +1,84 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+import java.io.File
+import xsbt.Paths._
+import ProcessorException.error
+
+/** Files needed by ManagerImpl.
+* `retrieveBaseDirectory` is the directory that processors are retrieved under.
+* `retrieveLockFile` is used to synchronize access to that directory.
+* `definitionsFile` is the file to save repository and processor definitions to.  It is usually per-user instead of per-project.*/
+class ManagerFiles(val retrieveBaseDirectory: File, val retrieveLockFile: File, val definitionsFile: File)
+
+class ManagerImpl(files: ManagerFiles, scalaVersion: String, persist: Persist, log: Logger) extends Manager
+{
+	import files._
+	
+	def processorDefinition(label: String): Option[ProcessorDefinition] = processors.get(label)
+	def processor(pdef: ProcessorDefinition): Option[Processor] =
+	{
+		def tryProcessor: Either[Throwable, Processor] =
+			(new Loader).getProcessor( retrieveDirectory(pdef) )
+
+		 // try to load the processor.  It will succeed here if the processor has already been retrieved
+		tryProcessor.left.flatMap { _ =>
+			 // if it hasn't been retrieved, retrieve the processor and its dependencies
+			retrieveProcessor(pdef)
+			// try to load the processor now that it has been retrieved
+			tryProcessor.left.map { // if that fails, log a warning
+				case p: ProcessorException => log.warn(p.getMessage)
+				case t => log.trace(t); log.warn(t.toString)
+			}
+		}.right.toOption
+	}
+	def defineProcessor(p: ProcessorDefinition)
+	{
+		checkExisting(p)
+		retrieveProcessor(p)
+		add(p)
+	}
+	def defineRepository(r: RepositoryDefinition)
+	{
+		checkExisting(r)
+		add(r)
+	}
+	def removeDefinition(label: String): Definition =
+		definitions.removeKey(label) match
+		{
+			case Some(removed) =>
+				saveDefinitions()
+				removed
+			case None => error("Label '" + label + "' not defined.")
+		}
+	
+	private def retrieveProcessor(p: ProcessorDefinition): Unit =
+	{
+		val resolvers = repositories.values.toList.map(toResolver)
+		val module = p.toModuleID(scalaVersion)
+		( new Retrieve(retrieveDirectory(p), module, persist.lock, retrieveLockFile, resolvers, log) ).retrieve()
+	}
+	private def add(d: Definition)
+	{
+		definitions(d.label) = d
+		saveDefinitions()
+	}
+
+	private lazy val definitions = loadDefinitions(definitionsFile)
+	def repositories = Map() ++ partialMap(definitions) { case (label, d: RepositoryDefinition) => (label, d) }
+	def processors = Map() ++ partialMap(definitions) { case (label, p: ProcessorDefinition) => (label, p) }
+	
+	private def checkExisting(p: Definition): Unit  =  definitions.get(p.label) map { d => error ("Label '" + p.label + "' already in use: " + d) }
+	private def partialMap[T,S](i: Iterable[T])(f: PartialFunction[T,S]) = i.filter(f.isDefinedAt).map(f)
+	private def toResolver(repo: RepositoryDefinition): Resolver = new MavenRepository(repo.label, repo.url)
+
+	def retrieveDirectory(p: ProcessorDefinition) = retrieveBaseDirectory / p.group / p.module / p.rev
+	
+	private def saveDefinitions(): Unit = saveDefinitions(definitionsFile)
+	private def saveDefinitions(file: File): Unit = persist.save(file)(definitions.values.toList)
+	private def loadDefinitions(file: File): scala.collection.mutable.Map[String, Definition] =
+		scala.collection.mutable.HashMap(  (if(file.exists) rawLoad(file) else Nil) : _*)
+	private def rawLoad(file: File): Seq[(String, Definition)] = persist.load(definitionsFile).map { d => (d.label, d) }
+}
\ No newline at end of file
diff --git a/src/main/scala/sbt/processor/Parser.scala b/src/main/scala/sbt/processor/Parser.scala
new file mode 100644
index 000000000..4d379f522
--- /dev/null
+++ b/src/main/scala/sbt/processor/Parser.scala
@@ -0,0 +1,50 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+/** Parses commands.  `errorMessage` is the String used when a command is invalid.
+* There is no detailed error reporting.
+* Input Strings are assumed to be trimmed.*/
+class CommandParser(errorMessage: String, defParser: DefinitionParsing) extends CommandParsing
+{
+	def parseCommand(line: String): Either[String, Command] =
+		defParser.parseDefinition(line) match
+		{
+			case Some(p: ProcessorDefinition) => Right(new DefineProcessor(p))
+			case Some(r: RepositoryDefinition) => Right(new DefineRepository(r))
+			case None => parseOther(line)
+		}
+	
+	def parseOther(line: String) =
+		line match
+		{
+			case RemoveRegex(label) => Right(new RemoveDefinition(label))
+			case HelpCommand | "" => Right(Help)
+			case ShowCommand => Right(Show)
+			case _ => Left(errorMessage)
+		}
+
+	val ShowCommand = "show"
+	val HelpCommand = "help"
+	val ProcessorCommand = "<label> is <group> <module> <rev>"
+	val RepositoryCommand = "<label> at <url>"
+	val RemoveCommand = "remove <label>"
+	
+	val RemoveRegex = """remove\s+(\w+)""".r
+}
+
+/** Parses the String representation of definitions.*/
+class DefinitionParser extends DefinitionParsing
+{
+	def parseDefinition(line: String): Option[Definition] =
+		line match
+		{
+			case ProcessorRegex(label, group, name, rev) =>  Some( new ProcessorDefinition(label, group, name, rev) )
+			case RepositoryRegex(label, url) =>  Some( new RepositoryDefinition(label, url) )
+			case _ => None
+		}
+		
+	val ProcessorRegex = """(\w+)\s+is\s+(\S+)\s+(\S+)\s+(\S+)""".r
+	val RepositoryRegex = """(\w+)\s+at\s+(\S+)""".r
+}
diff --git a/src/main/scala/sbt/processor/Persist.scala b/src/main/scala/sbt/processor/Persist.scala
new file mode 100644
index 000000000..bb1ee0074
--- /dev/null
+++ b/src/main/scala/sbt/processor/Persist.scala
@@ -0,0 +1,26 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+import java.io.File
+
+import xsbt.FileUtilities.{readLines, write}
+
+// lock file should be for synchronizing access to the persisted files
+class Persist(val lock: xsbti.GlobalLock, lockFile: File, defParser: DefinitionParser) extends Persisting
+{
+	private def withDefinitionsLock[T](f: => T): T = lock(lockFile,Callable(f))
+	
+	def save(file: File)(definitions: Iterable[Definition])
+	{
+		val lines = definitions.mkString(LineSeparator)
+		withDefinitionsLock { write(file, lines) }
+	}
+	def load(file: File): Seq[Definition] =
+	{
+		def parseLine(line: String) = defParser.parseDefinition(line).toList
+		withDefinitionsLock { if(file.exists) readLines(file) else Nil } flatMap(parseLine)
+	}
+	private final val LineSeparator = System.getProperty("line.separator", "\n")
+}
diff --git a/src/main/scala/sbt/processor/Processor.scala b/src/main/scala/sbt/processor/Processor.scala
new file mode 100644
index 000000000..883467bd8
--- /dev/null
+++ b/src/main/scala/sbt/processor/Processor.scala
@@ -0,0 +1,125 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+import java.io.File
+
+/** An interface for code that operates on an sbt `Project`.*/
+trait Processor extends NotNull
+{
+	/** Apply this processor's action to the given `project`.
+	* The arguments are passed unparsed as a single String `args`.
+	* The return value optionally provides additional commands to run, such as 'reload'.
+	* Note: `project` is not necessarily the root project.  To get the root project, use `project.rootProject`.*/
+	def apply(project: Project, args: String): ProcessorResult
+}
+/** The result of a Processor run.
+* `insertArgs` allows the Processor to insert additional commands to run.
+* These commands are run before pending commands.
+* 
+* For example, consider a Processor bound to 'cleanCompile' that returns
+*   `ProcessorResult("clean", "compile")`
+* 
+* If a user runs:
+*   `sbt a cleanCompile b `
+* This runs `a`, `cleanCompile`, `clean`, `compile`, and finally `b`.
+* Commands are processed as if they were entered at the prompt or from the command line.*/
+final class ProcessorResult(insertArgs: String*) extends NotNull
+{
+	val insertArguments = insertArgs.toList
+}
+
+/** Manages the processor and repository definitions.*/
+trait Manager extends NotNull
+{
+	def defineProcessor(pdef: ProcessorDefinition)
+	def removeDefinition(label: String): Definition
+	def defineRepository(repo: RepositoryDefinition)
+	def processor(pdef: ProcessorDefinition): Option[Processor]
+	def processorDefinition(label: String): Option[ProcessorDefinition]
+	
+	def processors: Map[String, ProcessorDefinition]
+	def repositories: Map[String, RepositoryDefinition]
+}
+
+/** Executes a parsed command. */
+trait Executing extends NotNull
+{
+	def apply(command: Command)
+}
+/** Prints information about processors. */
+trait Info extends NotNull
+{
+	/** Prints available processors and defined repositories.*/
+	def show()
+	/** Prints usage of processor management commands.*/
+	def help()
+}
+
+/** Parses a command String */
+trait CommandParsing extends NotNull
+{
+	/** Parses a command String that has been preprocessed.
+	* It should have any prefix (like the * used by Main) removed
+	* and whitespace trimmed
+	*
+	* If parsing is successful, a `Command` instance is returned wrapped in `Right`.
+	*  Otherwise, an error message is returned wrapped in `Left`.*/
+	def parseCommand(line: String): Either[String, Command]
+}
+/** Parses a definition `String`.*/
+trait DefinitionParsing extends NotNull
+{
+	/** Parses the given definition `String`.
+	* The result is wrapped in `Some` if successful, or `None` if the string is not of the correct form. */
+	def parseDefinition(line: String): Option[Definition]
+}
+/** Handles serializing `Definition`s.*/
+trait Persisting extends NotNull
+{
+	def save(file: File)(definitions: Iterable[Definition])
+	def load(file: File): Seq[Definition]
+}
+
+sealed trait Definition extends NotNull
+{
+	def label: String
+}
+final class ProcessorDefinition(val label: String, val group: String, val module: String, val rev: String) extends Definition
+{
+	override def toString = Seq(label, "is", group, module, rev).mkString(" ")
+	def idString = Seq(group, module, rev).mkString(" ")
+	def toModuleID(scalaVersion: String) = ModuleID(group, module + "_" + scalaVersion, rev)
+}
+// maven-style repositories only right now
+final class RepositoryDefinition(val label: String, val url: String) extends Definition
+{
+	override def toString = Seq(label, "at", url).mkString(" ")
+}
+
+/** Data type representing a runnable command related to processor management.*/
+sealed trait Command extends NotNull
+/** A command to add the given processor definition. */
+final class DefineProcessor(val pdef: ProcessorDefinition) extends Command
+/** A command to remove the processor or repository definition currently associated with the given `label`.
+* If the definition is associated with other labels, those are not affected.*/
+final class RemoveDefinition(val label: String) extends Command
+/** A command to register the given repository to be used for obtaining `Processor`s. */
+final class DefineRepository(val repo: RepositoryDefinition) extends Command
+/** A command to show help for processor management command usage. */
+object Help extends Command
+/** A command to show available processors and repositories.*/
+object Show extends Command
+
+/** An exception used when a `Processor` wants to terminate with an error message, but the stack trace is not important.
+* If a `cause` is provided, its stack trace is assumed to be important.*/
+final class ProcessorException(val message: String, cause: Throwable) extends RuntimeException(message, cause)
+{
+	def this(message: String) = this(message, null)
+}
+object ProcessorException
+{
+	def error(msg: String): Nothing = throw new ProcessorException(msg)
+	def error(msg: String, t: Throwable): Nothing = throw new ProcessorException(msg, t)
+}
diff --git a/src/main/scala/sbt/processor/Retrieve.scala b/src/main/scala/sbt/processor/Retrieve.scala
new file mode 100644
index 000000000..d7552368b
--- /dev/null
+++ b/src/main/scala/sbt/processor/Retrieve.scala
@@ -0,0 +1,30 @@
+/* sbt -- Simple Build Tool
+ * Copyright 2010  Mark Harrah
+ */
+package sbt.processor
+
+import java.io.File
+
+class Retrieve(retrieveDirectory: File, module: ModuleID, lock: xsbti.GlobalLock, lockFile: File, repositories: Seq[Resolver], log: IvyLogger) extends NotNull
+{
+	def retrieve()
+	{
+		val paths = new IvyPaths(retrieveDirectory, None)
+		val ivyScala = new IvyScala("", Nil, false, true)
+		val fullRepositories = Resolver.withDefaultResolvers(repositories) // TODO: move this somewhere under user control
+		val configuration = new InlineIvyConfiguration(paths, fullRepositories, Nil, Some(lock), log)
+		val moduleConfiguration = new InlineConfiguration(thisID, module :: Nil, scala.xml.NodeSeq.Empty, Nil, None, Some(ivyScala), false)
+		val update = new UpdateConfiguration(retrieveDirectory, retrievePattern, true, true)
+		val ivySbt = new IvySbt(configuration)
+		val ivyModule = new ivySbt.Module(moduleConfiguration)
+		
+		lock(lockFile, Callable { IvyActions.update(ivyModule, update) } )
+	}
+	def thisID = ModuleID("org.scala-tools.sbt", "retrieve-processor", "1.0")
+	def retrievePattern = "[artifact](-[revision])(-[classifier]).[ext]"
+}
+
+object Callable
+{
+	def apply[T](f: => T): java.util.concurrent.Callable[T] = new java.util.concurrent.Callable[T] { def call = f }
+}
\ No newline at end of file

From 7254885162ce92b8a5bc02e6125abe63a7dc3a4f Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 21 Feb 2010 20:20:48 -0500
Subject: [PATCH 249/268] cleanup

---
 src/main/scala/sbt/BasicProjectTypes.scala | 11 ++++++-----
 src/main/scala/sbt/Main.scala              |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index 0856079db..ead69c76e 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -29,6 +29,9 @@ trait ClasspathProject extends Project
 			}
 			set.toList
 		}
+	/* Filter used to select dependencies for the classpath from managed and unmanaged directories.
+	* By default, it explicitly filters (x)sbt-launch(er)-<version>.jar, since it contains minified versions of various classes.*/
+   def classpathFilter: FileFilter = "*.jar" - "*sbt-launch*.jar"
 }
 trait BasicDependencyProject extends BasicManagedProject with UnmanagedClasspathProject
 {
@@ -43,14 +46,12 @@ trait UnmanagedClasspathProject extends ClasspathProject
 	/** The classpath containing all jars in the unmanaged directory. */
 	def unmanagedClasspath: PathFinder =
 	{
-		val base = descendents(dependencyPath, jarFilter)
+		val base = descendents(dependencyPath, classpathFilter)
 		if(scratch)
-			base +++ (info.projectPath * jarFilter)
+			base +++ (info.projectPath * classpathFilter)
 		else
 			base
 	}
-	/* Explicitly filter (x)sbt-launch(er)-<version>.jar, since it contains minified versions of various classes.*/
-	private def jarFilter: NameFilter = "*.jar" - "*sbt-launch*.jar"
 	/** The classpath containing all unmanaged classpath elements for the given configuration. This typically includes
 	* at least 'unmanagedClasspath'.*/
 	def fullUnmanagedClasspath(config: Configuration): PathFinder
@@ -123,7 +124,7 @@ trait ManagedProject extends ClasspathProject with IvyTasks
 	def managedClasspath(config: Configuration): PathFinder = configurationClasspath(config)
 	/** All dependencies in the given configuration. */
 	final def configurationClasspath(config: Configuration): PathFinder = descendents(configurationPath(config), classpathFilter)
-	def classpathFilter: FileFilter = "*.jar"
+
 	/** The base path to which dependencies in configuration 'config' are downloaded.*/
 	def configurationPath(config: Configuration): Path = managedDependencyPath / config.toString
 
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 7ba273dce..5cbf0fe21 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -135,7 +135,10 @@ class xMain extends xsbti.AppMain
 			def rememberCurrent(newArgs: List[String]) = rememberProject(rememberFail(newArgs))
 			def rememberProject(newArgs: List[String]) = if(baseProject.name != project.name) (ProjectAction + " " + project.name) :: newArgs else newArgs
 			def rememberFail(newArgs: List[String]) = failAction.map(f => (FailureHandlerPrefix + f)).toList :::  newArgs
+
 			def tryOrFail(action: => Trampoline)  =  try { action } catch { case e: Exception => logCommandError(project.log, e); failed(BuildErrorExitCode) }
+			def reload(newID: ApplicationID, args: List[String]) =
+				result( new Reboot(project.defScalaVersion.value, rememberCurrent(args), newID, configuration.baseDirectory) )
 			def failed(code: Int) =
 				failAction match
 				{
@@ -147,9 +150,7 @@ class xMain extends xsbti.AppMain
 			{
 				case "" :: tail => continue(project, tail, failAction)
 				case (ExitCommand | QuitCommand) :: _ => result( Exit(NormalExitCode) )
-				case RebootCommand :: tail =>
-					val newID = new ApplicationID(configuration.provider.id, baseProject.sbtVersion.value)
-					result( new Reboot(project.defScalaVersion.value, rememberCurrent(tail), newID, configuration.baseDirectory) )
+				case RebootCommand :: tail => reload( new ApplicationID(configuration.provider.id, baseProject.sbtVersion.value), tail )
 				case InteractiveCommand :: _ => continue(project, prompt(baseProject, project) :: arguments, interactiveContinue)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)

From 66b8eb27ef2a95cda96de3f788b4001f46884fd9 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 21 Feb 2010 20:21:03 -0500
Subject: [PATCH 250/268] 0.7.1

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index 55844cc15..06baa8db5 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,6 +1,6 @@
 project.name=Simple Build Tool
 project.organization=org.scala-tools.sbt
-project.version=0.7.1-SNAPSHOT
+project.version=0.7.1
 sbt.version=0.7.0
 def.scala.version=2.7.7
 build.scala.versions=2.7.7

From 8fb4325981dee776e5e541b7e18bd69c3fd336a3 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 21 Feb 2010 20:30:38 -0500
Subject: [PATCH 251/268] release notes

---
 notes/0.7.0.markdown | 64 ++++++++++++++++++++++++++++++++++++++++++++
 notes/0.7.1.markdown |  3 +++
 notes/about.markdown |  1 +
 3 files changed, 68 insertions(+)
 create mode 100644 notes/0.7.0.markdown
 create mode 100644 notes/0.7.1.markdown
 create mode 100644 notes/about.markdown

diff --git a/notes/0.7.0.markdown b/notes/0.7.0.markdown
new file mode 100644
index 000000000..3099ed27f
--- /dev/null
+++ b/notes/0.7.0.markdown
@@ -0,0 +1,64 @@
+### Major Features
+* Batch and interactive commands are now unifed.  All commands that can be executed at the interactive prompt can be run from the command line.  To run commands and then enter interactive prompt, make the last command 'shell'.
+* Scala version handling has been overhauled.
+	* The version of Scala used to run sbt (currently 2.7.7) is decoupled from the version used to build the project
+	* Easily change between Scala versions with `++<version>`
+	* Improved cross-building: project definition is only compiled against 2.7.7 instead of every Scala version cross-built against
+	* Works with Scala 2.8.0.Beta1; however, classpath handling in Scala 2.8 trunk is changing and sbt currently cannot use 2.8 trunk to build projects until this settles
+	* Using a [local version of Scala](http://code.google.com/p/simple-build-tool/wiki/LocalScala) is easier now.
+* Dependency management improvements:
+	+ `make-pom` task now uses custom pom generation code instead of Ivy's pom writer
+		- Writes Maven-style repositories to the pom by default
+		- Override the 'pomExtra' method to provide XML (scala.xml.NodeSeq) to insert directly into the generated pom
+	+ sbt's [Ivy interface](http://code.google.com/p/simple-build-tool/wiki/IvyInterface) can be used directly (useful for implementing certain tasks)
+* Test framework support is now done through a [uniform test interface](http://github.com/harrah/test-interface).  Implications:
+	+ New versions of specs, ScalaCheck, and ScalaTest are supported as soon as they are released
+	+ Stefan Zeiger has written an [implementation for running JUnit](http://github.com/szeiger/junit-interface)
+	+ Support is better, since the test framework authors are the ones providing the implementation
+	+ Arguments can be passed to the test framework.  In the simplest case: `test-only  your.test -- -a -b -c`
+* Generalized the [launcher](http://code.google.com/p/simple-build-tool/wiki/GeneralizedLauncher) to be able to launch Scala applications, not just sbt
+	* Provide a configuration file to the launcher and it can download the application and its dependencies from a repository and run it
+	* sbt's configuration can be customized.  For example,
+		* The default values used to create a new project can be changed
+		* The repositories used to fetch sbt and its dependencies, including Scala, can be configured
+		* The location that sbt is retrieved to is configurable.  For example, instead of `project/boot`, `/home/user/.ivy2/sbt/`
+		* Configurable method of project searching (previously configurable by system property)
+
+### Other Improvements
+* Jetty 7 support (doesn't work with JRebel at this time)
+* Control traces with 'on' 'off', 'nosbt', `<level>` (Thanks to Tony Sloane.)
+* New action 'test-run' method that is analogous to 'run', but for test classes.
+* New action 'clean-plugins' task that clears built plugins (useful for plugin development).
+* Can provide commands from a file with <file command (file is the name of the file to read from)
+* Can provide commands over loopback interface with <port command (port is the number to read commands from)
+* Launcher is allowed in root directory or `lib/` directory (jar name must match '*sbt-launch*.jar' and will be kept off classpath by default)
+* Compilation properly tracks certain types of synthetic classes (for comprehension with >30 clauses, for example)
+* Can provide custom task start and end delimiters by defining the system properties `sbt.start.delimiter` and `sbt.end.delimiter`
+
+### Migrating from 0.5.6
+* Get the 0.7.0 launcher and [set it up as usual](http://code.google.com/p/simple-build-tool/wiki/Setup)
+* In your `project/build.properties`
+	* Rename `scala.version`to `build.scala.versions`.  If you previously overrode `crossScalaVersions`, just put the versions in `build.scala.versions` separated by whitespace.
+	* Set `sbt.version` to 0.7.0
+* Check the compatibility section below
+
+### Compatibility with 0.5.6
+* Artifact IDs (like your project's jar and ID for publishing to repositories) and output paths (like `target/` and `lib_managed/`) now have _<scala.version> appended.  To keep the old way, `override def disableCrossPaths = true`.
+* 'reboot' is gone, 'reload' now covers 'reboot'
+* [Properties](http://code.google.com/p/simple-build-tool/wiki/Properties) need to be declared `lazy val` instead of just `val`.
+* The way to fork `run` has changed due to reworking the Scala version handling.  See [Forking](http://code.google.com/p/simple-build-tool/wiki/Forking) for details.  Forking the compiler is no longer supported.
+* The project definition is always compiled against the version of Scala running sbt (currently, 2.7.7).  It was previously the same as the version used to build the project.
+* The Ivy interface has been broken out into its own subproject and reworked.  All functional tests pass, but please report any issues you encounter.
+* `updateOptions` has been replaced by overriding the appropriate methods directly.  Some other advanced configuration options have changed- documentation pending.
+* Web application support was reworked.  Please report any issues you encounter.
+* Test framework support is now done through the uniform test interface.  If you manually manage your test dependencies, you will need the [test-compat implementation](http://github.com/harrah/test-compat) of this interface.  The earliest releases of test frameworks supported are:
+	+ specs: 1.6.1
+	+ ScalaCheck: 1.5
+	+ ScalaTest: 1.0
+
+### Other Notes
+* A message like `'compiler-interface' not compiled for '2.7.7'` is sbt adapting to your build Scala version (and Java version).  It takes 5-20s depending on your machine and is a one time compilation for a given Scala/Java version combination.
+* Version control is now done with git and the source code is hosted on [Github](http://github.com/harrah).  See the [instructions](http://code.google.com/p/simple-build-tool/wiki/Build) for building it locally.  [Issue tracking](http://code.google.com/p/simple-build-tool/issues/list) and [documentation](http://code.google.com/p/simple-build-tool/wiki/DocumentationHome) are still on [Google Code](http://code.google.com/p/simple-build-tool).
+* Reports of performance degradation or improvement in 0.7.0 are useful.
+* Regular documentation has been updated.  API Documentation is pending.
+* Now using the [posterous-sbt plugin](http://github.com/n8han/posterous-sbt) to generate and publish release notes to [http://implicit.ly/](http://implicit.ly/).
\ No newline at end of file
diff --git a/notes/0.7.1.markdown b/notes/0.7.1.markdown
new file mode 100644
index 000000000..99bc88886
--- /dev/null
+++ b/notes/0.7.1.markdown
@@ -0,0 +1,3 @@
+### Fixes
+* Fixed Jetty 7 support to work with JRebel
+* Fixed make-pom to generate valid repositories section
\ No newline at end of file
diff --git a/notes/about.markdown b/notes/about.markdown
new file mode 100644
index 000000000..6c853f0d7
--- /dev/null
+++ b/notes/about.markdown
@@ -0,0 +1 @@
+[Simple Build Tool](http://code.google.com/p/simple-build-tool/) is a build tool for Scala projects that aims to do the basics well.
\ No newline at end of file

From 9cc5a234313c1e0212f8f59d58b9fcd8157e2755 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 21 Feb 2010 20:54:24 -0500
Subject: [PATCH 252/268] version bumps

---
 install/project/build.properties  | 4 ++--
 project/build.properties          | 4 ++--
 scripted/project/build.properties | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/install/project/build.properties b/install/project/build.properties
index 53b14ff63..ebd6f7ff5 100644
--- a/install/project/build.properties
+++ b/install/project/build.properties
@@ -1,6 +1,6 @@
 project.name=extract
 project.organization=org.scala-tools.sbt
-project.version=0.3.0
-sbt.version=0.7.0
+project.version=0.3.1-SNAPSHOT
+sbt.version=0.7.1
 def.scala.version=2.7.7
 build.scala.versions=2.7.7
diff --git a/project/build.properties b/project/build.properties
index 06baa8db5..d8b0d7a53 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,6 +1,6 @@
 project.name=Simple Build Tool
 project.organization=org.scala-tools.sbt
-project.version=0.7.1
-sbt.version=0.7.0
+project.version=0.7.2-SNAPSHOT
+sbt.version=0.7.1
 def.scala.version=2.7.7
 build.scala.versions=2.7.7
diff --git a/scripted/project/build.properties b/scripted/project/build.properties
index 1ffc2e543..d37fb4bb2 100644
--- a/scripted/project/build.properties
+++ b/scripted/project/build.properties
@@ -1,7 +1,7 @@
 project.name=scripted
 project.organization=org.scala-tools.sbt
-project.version=0.7.1-SNAPSHOT
-sbt.version=0.7.0
+project.version=0.7.2-SNAPSHOT
+sbt.version=0.7.1
 def.scala.version=2.7.7
 build.scala.versions=2.7.7
 project.initialize=false

From 56339c34a68f4ed4c25bc6a9631cfa0b5fb05a18 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 3 Mar 2010 21:59:29 -0500
Subject: [PATCH 253/268]  * Prepend !shell to the commands to run when shell
 is the last command specified by the user.  * def.scala.version no longer
 required to be in build.properties

---
 src/main/scala/sbt/Main.scala    | 6 +++++-
 src/main/scala/sbt/Project.scala | 5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 5cbf0fe21..913c2010e 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -87,11 +87,15 @@ class xMain extends xsbti.AppMain
 			}
 		}
 	}
+	/** If no arguments are provided, drop to interactive prompt.
+	* If the user wants to run commands before dropping to the interactive prompt,
+	*   make dropping to the interactive prompt the action to perform on failure */
 	private def initialize(args: List[String]): List[String] =
 		args.lastOption match
 		{
 			case None => InteractiveCommand :: Nil
-			case Some(InteractiveCommand | ExitCommand | QuitCommand) => args
+			case Some(InteractiveCommand) => (FailureHandlerPrefix + InteractiveCommand) :: args
+			case Some(ExitCommand | QuitCommand) => args
 			case _ => args ::: ExitCommand :: Nil
 		}
 	private def startProject(project: Project, configuration: xsbti.AppConfiguration, remainingArguments: List[String], startTime: Long): xsbti.MainResult =
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index c14978333..bfb1d284e 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -213,9 +213,8 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	final val projectOrganization = propertyOptional[String](normalizedName, true)
 	/** The property that defines the version of Scala to use with the project definition.  This can be different
 	* from the version of Scala used to build the project (current version used is buildScalaVersion, available are in buildScalaVersions).
-	* This property is only read by `sbt` on startup and reload. It is the definitive source for the version of Scala
-	* that sbt and the project definition are using.*/
-	final val defScalaVersion = property[String]
+	* This property is only read by `sbt` on startup and reload.*/
+	final val defScalaVersion = propertyOptional[String](info.definitionScalaVersion)
 	final val sbtVersion = property[String]
 	final val projectInitialize = propertyOptional[Boolean](false)
 	final val projectScratch = propertyOptional[Boolean](false, true)

From 250a05c4a3ea1d649e2234a6b3b1997bc1bbd99b Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 4 Mar 2010 00:08:06 -0500
Subject: [PATCH 254/268] Separate repositories for publishing from
 repositories for retrieving

---
 src/main/scala/sbt/BasicProjectTypes.scala    | 21 +++++++++++--------
 src/main/scala/sbt/processor/Retrieve.scala   |  2 +-
 .../artifact/project/build/ArtifactTest.scala |  5 ++++-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/sbt/BasicProjectTypes.scala b/src/main/scala/sbt/BasicProjectTypes.scala
index ead69c76e..2cfaca54a 100644
--- a/src/main/scala/sbt/BasicProjectTypes.scala
+++ b/src/main/scala/sbt/BasicProjectTypes.scala
@@ -5,6 +5,7 @@ package sbt
 
 import scala.xml.NodeSeq
 import StringUtilities.{appendable,nonEmpty}
+import BasicManagedProject._
 
 /** A project that provides a classpath. */
 trait ClasspathProject extends Project
@@ -176,8 +177,6 @@ object ManagedStyle extends Enumeration
 import ManagedStyle.{Auto, Ivy, Maven, Value => ManagedType}
 trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject with BasicDependencyPaths
 {
-	import BasicManagedProject._
-
 	def ivyUpdateConfiguration =  new UpdateConfiguration(managedDependencyPath.asFile, outputPattern, true/*sync*/, true/*quiet*/)
 
 	def ivyRepositories: Seq[Resolver] =
@@ -185,12 +184,13 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		val repos = repositories.toSeq
 		if(repos.isEmpty) Nil else Resolver.withDefaultResolvers(repos)
 	}
+	def otherRepositories: Seq[Resolver] = defaultPublishRepository.toList
 	def ivyValidate = true
 	def ivyScala: Option[IvyScala] = Some(new IvyScala(buildScalaVersion, checkScalaInConfigurations, checkExplicitScalaDependencies, filterScalaJars))
 	def ivyCacheDirectory: Option[Path] = None
 	
 	def ivyPaths: IvyPaths = new IvyPaths(info.projectPath.asFile, ivyCacheDirectory.map(_.asFile))
-	def inlineIvyConfiguration = new InlineIvyConfiguration(ivyPaths, ivyRepositories.toSeq, moduleConfigurations.toSeq, Some(info.launcher.globalLock), log)
+	def inlineIvyConfiguration = new InlineIvyConfiguration(ivyPaths, ivyRepositories.toSeq, otherRepositories, moduleConfigurations.toSeq, Some(info.launcher.globalLock), log)
 	def ivyConfiguration: IvyConfiguration =
 	{
 		val in = inlineIvyConfiguration
@@ -198,7 +198,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 		def parentIvyConfiguration(default: IvyConfiguration)(p: Project) = p match { case b: BasicManagedProject => adapt(b.ivyConfiguration); case _ => default }
 		if(in.resolvers.isEmpty)
 		{
-			 if(in.moduleConfigurations.isEmpty)
+			 if(in.moduleConfigurations.isEmpty && in.otherResolvers.isEmpty)
 			 {
 				IvyConfiguration(in.paths, in.lock, in.log) match
 				{
@@ -207,7 +207,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 				}
 			}
 			else
-				new InlineIvyConfiguration(in.paths, Resolver.withDefaultResolvers(Nil), in.moduleConfigurations, in.lock, in.log)
+				new InlineIvyConfiguration(in.paths, Resolver.withDefaultResolvers(Nil), in.otherResolvers, in.moduleConfigurations, in.lock, in.log)
 		}
 		else
 			in
@@ -342,7 +342,7 @@ trait BasicManagedProject extends ManagedProject with ReflectiveManagedProject w
 	}
 	def defaultPublishRepository: Option[Resolver] =
 	{
-		reflectiveRepositories.get("publish-to") orElse
+		reflectiveRepositories.get(PublishToName) orElse
 		info.parent.flatMap
 			{
 				case managed: BasicManagedProject => managed.defaultPublishRepository
@@ -451,6 +451,9 @@ object BasicManagedProject
 		"Deletes the managed library directory."
 	val CleanCacheDescription =
 		"Deletes the cache of artifacts downloaded for automatically managed dependencies."
+
+	val PublishToName = "publish-to"
+	val RetrieveFromName = "retrieve-from"
 }
 
 class DefaultInstallProject(val info: ProjectInfo) extends InstallProject with MavenStyleScalaPaths with BasicDependencyProject
@@ -464,8 +467,8 @@ trait InstallProject extends BasicManagedProject
 	def installIvyModule: IvySbt#Module = newIvyModule(installModuleSettings)
 	
 	lazy val install = installTask(installIvyModule, fromResolver, toResolver)
-	def toResolver = reflectiveRepositories.get("publish-to").getOrElse(error("No repository to publish to was specified"))
-	def fromResolver = reflectiveRepositories.get("retrieve-from").getOrElse(error("No repository to retrieve from was specified"))
+	def toResolver = reflectiveRepositories.get(PublishToName).getOrElse(error("No repository to publish to was specified"))
+	def fromResolver = reflectiveRepositories.get(RetrieveFromName).getOrElse(error("No repository to retrieve from was specified"))
 }
 
 trait BasicDependencyPaths extends ManagedProject
@@ -621,7 +624,7 @@ trait ReflectiveRepositories extends Project
 {
 	def repositories: Set[Resolver] =
 	{
-		val reflective = Set[Resolver](reflectiveRepositories.values.toList: _*)
+		val reflective = Set[Resolver]() ++ reflectiveRepositories.toList.flatMap {  case (PublishToName, _) => Nil; case (_, value) => List(value) }
 		info.parent match
 		{
 			case Some(p: ReflectiveRepositories) => p.repositories ++ reflective
diff --git a/src/main/scala/sbt/processor/Retrieve.scala b/src/main/scala/sbt/processor/Retrieve.scala
index d7552368b..ee91f79f0 100644
--- a/src/main/scala/sbt/processor/Retrieve.scala
+++ b/src/main/scala/sbt/processor/Retrieve.scala
@@ -12,7 +12,7 @@ class Retrieve(retrieveDirectory: File, module: ModuleID, lock: xsbti.GlobalLock
 		val paths = new IvyPaths(retrieveDirectory, None)
 		val ivyScala = new IvyScala("", Nil, false, true)
 		val fullRepositories = Resolver.withDefaultResolvers(repositories) // TODO: move this somewhere under user control
-		val configuration = new InlineIvyConfiguration(paths, fullRepositories, Nil, Some(lock), log)
+		val configuration = new InlineIvyConfiguration(paths, fullRepositories, Nil, Nil, Some(lock), log)
 		val moduleConfiguration = new InlineConfiguration(thisID, module :: Nil, scala.xml.NodeSeq.Empty, Nil, None, Some(ivyScala), false)
 		val update = new UpdateConfiguration(retrieveDirectory, retrievePattern, true, true)
 		val ivySbt = new IvySbt(configuration)
diff --git a/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala b/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
index 3c61d9f35..07131bfb4 100644
--- a/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
+++ b/src/sbt-test/dependency-management/artifact/project/build/ArtifactTest.scala
@@ -7,7 +7,10 @@ class ArtifactTest(info: ProjectInfo) extends DefaultProject(info)
 
 	// define a test repository to publish to
 	override def managedStyle = ManagedStyle.Maven
-	val publishTo = Resolver.file("Test Repo", ("test-repo") asFile)
+	val publishTo = Resolver.file("Test Publish Repo", "test-repo" asFile)
+
+	// include the publishTo repository, which is normally excluded
+	override def ivyRepositories = publishTo :: Nil
 
 	// define strings for defining the artifact
 	override def artifactID = "test"

From 3493aa528566a41a0a3bc781131f4f39c116a0ed Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 4 Mar 2010 13:30:13 -0500
Subject: [PATCH 255/268] Make 'run' reuse warm Scala class loader and same
 JLine as sbt

---
 .gitignore                              |  3 +++
 project/build/SbtProject.scala          |  2 +-
 src/main/scala/sbt/DefaultProject.scala |  2 +-
 src/main/scala/sbt/Run.scala            | 36 +++++++++++++++++++++++--
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 130e42047..3f1ed73c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 LazyJettyRun6.scala
 LazyJettyRun7.scala
+install/project/boot/
+scripted/project/boot/
+project/plugins/project/
diff --git a/project/build/SbtProject.scala b/project/build/SbtProject.scala
index 23ef7c534..8edb601be 100644
--- a/project/build/SbtProject.scala
+++ b/project/build/SbtProject.scala
@@ -19,7 +19,7 @@ class SbtProject(info: ProjectInfo) extends DefaultProject(info) with test.SbtSc
 	//val publishTo = Resolver.file("technically", new File("/var/dbwww/repo/"))
 	val technically = Resolver.url("technically.us", new URL("http://databinder.net/repo/"))(Resolver.ivyStylePatterns)
 
-	override def compileOptions = Nil
+	override def compileOptions = CompileOption("-Xno-varargs-conversion") :: Nil
 
 	/**  configuration of scripted testing **/
 	// Set to false to show logging as it happens without buffering, true to buffer until it completes and only show if the task fails.
diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index ebff0a888..9b67ce97d 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -250,7 +250,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
 		fork match
 		{
 			case Some(fr: ForkScalaRun) => new ForkRun(fr)
-			case _ => new Run(buildCompiler)
+			case _ => new Run(buildScalaInstance)
 		}
 	}
 
diff --git a/src/main/scala/sbt/Run.scala b/src/main/scala/sbt/Run.scala
index d82974634..44e9fb34d 100644
--- a/src/main/scala/sbt/Run.scala
+++ b/src/main/scala/sbt/Run.scala
@@ -10,6 +10,7 @@ import scala.tools.nsc.util.ClassPath
 
 import java.io.File
 import java.net.{URL, URLClassLoader}
+import java.lang.reflect.Modifier.{isPublic, isStatic}
 
 trait ScalaRun
 {
@@ -35,14 +36,45 @@ class ForkRun(config: ForkScalaRun) extends ScalaRun
 			Some("Nonzero exit code returned from " + label + ": " + exitCode)
 	}
 }
-class Run(compiler: xsbt.AnalyzingCompiler) extends ScalaRun
+class Run(instance: xsbt.ScalaInstance) extends ScalaRun
 {
 	/** Runs the class 'mainClass' using the given classpath and options using the scala runner.*/
 	def run(mainClass: String, classpath: Iterable[Path], options: Seq[String], log: Logger) =
 	{
-		def execute = compiler.run(Set() ++ classpath.map(_.asFile), mainClass, options, log)
+		log.info("Running " + mainClass + " " + options.mkString(" "))
+
+		def execute = 
+			try { run0(mainClass, classpath, options, log) }
+			catch { case e: java.lang.reflect.InvocationTargetException => throw e.getCause }
+
 		Run.executeTrapExit( execute, log )
 	}
+	private def run0(mainClassName: String, classpath: Iterable[Path], options: Seq[String], log: Logger)
+	{
+		val loader = getLoader(classpath, log)
+		val main = getMainMethod(mainClassName, loader)
+
+		val currentThread = Thread.currentThread
+		val oldLoader = Thread.currentThread.getContextClassLoader()
+		currentThread.setContextClassLoader(loader)
+		try { main.invoke(null, options.toArray[String].asInstanceOf[Array[String]] ) }
+		finally { currentThread.setContextClassLoader(oldLoader) }
+	}
+	def getMainMethod(mainClassName: String, loader: ClassLoader) =
+	{
+		val mainClass = Class.forName(mainClassName, true, loader)
+		val method = mainClass.getMethod("main", classOf[Array[String]])
+		val modifiers = method.getModifiers
+		if(!isPublic(modifiers)) throw new NoSuchMethodException(mainClassName + ".main is not public")
+		if(!isStatic(modifiers)) throw new NoSuchMethodException(mainClassName + ".main is not static")
+		method
+	}
+	def getLoader(classpath: Iterable[Path], log: Logger) =
+	{
+		val classpathURLs = classpath.toSeq.map(_.asURL).toArray
+		log.debug("  Classpath:\n\t" + classpathURLs.mkString("\n\t"))
+		new URLClassLoader( classpathURLs, instance.loader)
+	}
 }
 
 /** This module is an interface to starting the scala interpreter or runner.*/

From 186112ee571f3a49f76bf3e601926386f86885a9 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Thu, 4 Mar 2010 16:34:27 -0500
Subject: [PATCH 256/268] Fix duplicate classpath entries in jetty-run

---
 .../scala/sbt/jetty/LazyJettyRun.scala.templ  | 13 +++++---
 .../servlet-nodup/changes/MyServlet1.scala    | 24 ++++++++++++++
 .../servlet-nodup/changes/MyServlet2.scala    | 24 ++++++++++++++
 .../servlet-nodup/project/build.properties    |  3 ++
 .../project/build/src/WebappBuild.scala       | 25 +++++++++++++++
 .../src/main/webapp/WEB-INF/web.xml           | 18 +++++++++++
 src/sbt-test/web/servlet-nodup/test           | 32 +++++++++++++++++++
 7 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala
 create mode 100644 src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala
 create mode 100644 src/sbt-test/web/servlet-nodup/project/build.properties
 create mode 100644 src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala
 create mode 100644 src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml
 create mode 100644 src/sbt-test/web/servlet-nodup/test

diff --git a/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
index 4de20ee22..41d88b60b 100644
--- a/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
+++ b/src/main/scala/sbt/jetty/LazyJettyRun.scala.templ
@@ -58,10 +58,15 @@ private object LazyJettyRun${jetty.version} extends JettyRun
 					
 					def createLoader =
 					{
-						class SbtWebAppLoader extends WebAppClassLoader(jettyLoader, webapp) { override def addURL(u: URL) = super.addURL(u) };
-						val loader = new SbtWebAppLoader
-						classpathURLs.foreach(loader.addURL)
-						loader
+						// Jetty treats WebAppClassLoader subclasses specially and we need this special behavior.
+						//   However, Jetty adds extra classpath components directly using 'addURL'.
+						//   We only want the 'urls' we provide in the constructor, so 'addURL' is overridden to do nothing.
+						class SbtWebAppLoader(urls: Seq[URL]) extends WebAppClassLoader(jettyLoader, webapp)
+						{
+							urls.foreach(super.addURL)
+							override def addURL(u: URL) = {}
+						}
+						new SbtWebAppLoader(classpathURLs)
 					}
 					def setLoader() = webapp.setClassLoader(createLoader)
 					
diff --git a/src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala b/src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala
new file mode 100644
index 000000000..4ebb25bf5
--- /dev/null
+++ b/src/sbt-test/web/servlet-nodup/changes/MyServlet1.scala
@@ -0,0 +1,24 @@
+package test
+
+import java.util.Collections
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+class MyServlet extends HttpServlet {
+
+	val html = <HTML>
+		<HEAD><TITLE>Hello, Scala!</TITLE></HEAD>
+		<BODY>Hello, Scala! This is a servlet.</BODY>
+	</HTML>
+
+	override def doGet(req:HttpServletRequest, resp:HttpServletResponse) {
+		val found = Collections.list(getClass.getClassLoader.getResources("test/MyServlet.class"))
+		assert( found.size == 1, "Multiple instances of MyServlet.class on classpath")
+		resp.setContentType("text/html")
+		resp.getWriter().print(html.toString)
+	}
+	def check28(f: Int = 3) = f
+}
+
diff --git a/src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala b/src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala
new file mode 100644
index 000000000..a83ddcf08
--- /dev/null
+++ b/src/sbt-test/web/servlet-nodup/changes/MyServlet2.scala
@@ -0,0 +1,24 @@
+package test
+
+import java.util.Collections
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+class MyServlet extends HttpServlet {
+
+	val html = <HTML>
+		<HEAD><TITLE>Hello, Scala 2!</TITLE></HEAD>
+		<BODY>Hello, Scala 2! This is a servlet.</BODY>
+	</HTML>
+
+	override def doGet(req:HttpServletRequest, resp:HttpServletResponse) {
+		val found = Collections.list(getClass.getClassLoader.getResources("test/MyServlet.class"))
+		assert( found.size == 1, "Multiple instances of MyServlet.class on classpath")
+		resp.setContentType("text/html")
+		resp.getWriter().print(html.toString)
+	}
+	def check28(f: Int = 3) = f
+}
+
diff --git a/src/sbt-test/web/servlet-nodup/project/build.properties b/src/sbt-test/web/servlet-nodup/project/build.properties
new file mode 100644
index 000000000..34162cdcd
--- /dev/null
+++ b/src/sbt-test/web/servlet-nodup/project/build.properties
@@ -0,0 +1,3 @@
+project.organization=tester
+project.name=sbtweb
+project.version=1.0
diff --git a/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala b/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala
new file mode 100644
index 000000000..4b0028732
--- /dev/null
+++ b/src/sbt-test/web/servlet-nodup/project/build/src/WebappBuild.scala
@@ -0,0 +1,25 @@
+import sbt._
+
+class WebappBuild(info: ProjectInfo) extends DefaultWebProject(info) {
+
+	override def libraryDependencies = if("jetty7".asFile.exists) jetty7Dependencies else jetty6Dependencies
+	def jetty6Dependencies =
+		Set("org.mortbay.jetty"          % "servlet-api-2.5"         % "6.1.14"  % "provided->default",
+		"org.mortbay.jetty"          % "jetty"                   % "6.1.14"  % "test->default")
+	def jetty7Dependencies =
+		Set("javax.servlet" % "servlet-api" % "2.5" % "provided",
+		"org.eclipse.jetty" % "jetty-server" % "7.0.1.v20091125" % "test",
+		"org.eclipse.jetty" % "jetty-webapp" % "7.0.1.v20091125" % "test")
+
+	def indexURL = new java.net.URL("http://localhost:8080")
+	def indexFile = new java.io.File("index.html")
+	import Process._
+	lazy val getPage = execTask { indexURL #> indexFile }
+	lazy val checkPage = task { args => task { checkHelloWorld(args.mkString(" ")) } dependsOn getPage }
+	
+	private def checkHelloWorld(checkString: String) =
+	{
+		val value = xsbt.FileUtilities.read(indexFile)
+		if(value.contains(checkString)) None else Some("index.html did not contain '" + checkString + "' :\n" +value)
+	}
+}
diff --git a/src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml b/src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..441ad39bd
--- /dev/null
+++ b/src/sbt-test/web/servlet-nodup/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,18 @@
+<!DOCTYPE web-app PUBLIC
+	"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+	"http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+	<display-name>Test Web Application</display-name>
+
+	<servlet>
+		<servlet-name>Home</servlet-name>
+		<servlet-class>test.MyServlet</servlet-class>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>Home</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+
+</web-app>
+
diff --git a/src/sbt-test/web/servlet-nodup/test b/src/sbt-test/web/servlet-nodup/test
new file mode 100644
index 000000000..39ebb15bd
--- /dev/null
+++ b/src/sbt-test/web/servlet-nodup/test
@@ -0,0 +1,32 @@
+> ++2.8.0.Beta1
+
+$ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
+> update
+> jetty-run
+> check-page "Hello, Scala!"
+
+$ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello, Scala 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
+
+# test that it works with Jetty 7 support
+$ touch jetty7
+
+$ copy-file changes/MyServlet1.scala src/main/scala/test/MyServlet.scala
+> update
+> jetty-run
+> check-page "Hello, Scala!"
+
+$ copy-file changes/MyServlet2.scala src/main/scala/test/MyServlet.scala
+
+> prepare-webapp
+> jetty-reload
+> check-page "Hello, Scala 2!"
+
+> jetty-stop
+-> check-page "Hello World 2!"
\ No newline at end of file

From 229ecaba5ee46454582c6c5fd101a8a4dcf399c6 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 7 Mar 2010 19:03:12 -0500
Subject: [PATCH 257/268] Documentation on ProjectInfo

---
 src/main/scala/sbt/ProjectInfo.scala | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/sbt/ProjectInfo.scala b/src/main/scala/sbt/ProjectInfo.scala
index 5a59d8111..6ff3fcc02 100644
--- a/src/main/scala/sbt/ProjectInfo.scala
+++ b/src/main/scala/sbt/ProjectInfo.scala
@@ -7,28 +7,47 @@ import java.io.File
 import xsbti.{AppProvider, ScalaProvider}
 import FileUtilities._
 
-// provider is for the build, not the build definition
+/** Represents the minimal information necessary to construct a Project.
+*
+* `projectDirectory` is the base directory for the project (not the root project directory)
+* `dependencies` are the Projects that this Project depends on.
+* `parent` is the parent Project, or None if this is the root project.
+* `log` is the Logger to use as a base for the default project Logger.
+* `buildScalaVersion` contains the explicitly requested Scala version to use  for building (as when using `+` or `++`) or None if the normal version should be used.
+*/
 final case class ProjectInfo(projectDirectory: File, dependencies: Iterable[Project], parent: Option[Project])
 	(log: Logger, val app: AppProvider, val buildScalaVersion: Option[String]) extends NotNull
 {
+	/** The version of Scala running sbt.*/
 	def definitionScalaVersion = app.scalaProvider.version
+	/** The launcher instance that booted sbt.*/
 	def launcher = app.scalaProvider.launcher
 
 	val logger = new FilterLogger(log)
+	/** The base path for the project, preserving information to the root project directory.*/
 	val projectPath: Path =
 	{
 		val toRoot = parent.flatMap(p => Path.relativize(p.info.projectPath, projectDirectory))
 		new ProjectDirectory(projectDirectory, toRoot)
 	}
+	/** The path to build information.  The current location is `project/`.
+	* Note: The directory used to be `metadata/`, hence the name of the constant in the implementation.
+	* Note 2: Although it is called builderPath, it is not the path to the builder definition, which is `builderProjectPath`*/
 	val builderPath = projectPath / ProjectInfo.MetadataDirectoryName
+	/** The boot directory contains the jars needed for building the project, including Scala, sbt, processors and dependencies of these.*/
 	def bootPath = builderPath / Project.BootDirectoryName
+	/** The path to the build definition project. */
 	def builderProjectPath = builderPath / Project.BuilderProjectDirectoryName
 	def builderProjectOutputPath = builderProjectPath / Project.DefaultOutputDirectoryName
+	/** The path to the plugin definition project. This declares the plugins to use for the build definition.*/
 	def pluginsPath = builderPath / Project.PluginProjectDirectoryName
 	def pluginsOutputPath = pluginsPath / Project.DefaultOutputDirectoryName
+	/** The path to which the source code for plugins are extracted.*/
 	def pluginsManagedSourcePath = pluginsPath / BasicDependencyPaths.DefaultManagedSourceDirectoryName
+	/** The path to which plugins are retrieved.*/
 	def pluginsManagedDependencyPath = pluginsPath / BasicDependencyPaths.DefaultManagedDirectoryName
-	
+
+	/** The classpath containing all jars comprising sbt, except for the launcher.*/
 	def sbtClasspath = Path.finder(app.mainClasspath)
 }
 

From f9dd30144edcd8182322e8c2fb43af8ebf4b7c59 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 7 Mar 2010 19:03:27 -0500
Subject: [PATCH 258/268] Use ComponentManager.version when printing the sbt
 version

---
 src/main/scala/sbt/Main.scala    | 2 +-
 src/main/scala/sbt/Project.scala | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 913c2010e..907115a6c 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -101,7 +101,7 @@ class xMain extends xsbti.AppMain
 	private def startProject(project: Project, configuration: xsbti.AppConfiguration, remainingArguments: List[String], startTime: Long): xsbti.MainResult =
 	{
 		project.log.info("Building project " + project.name + " " + project.version.toString + " against Scala " + project.buildScalaVersion)
-		project.log.info("   using " + project.getClass.getName + " with sbt " + project.sbtVersion.value + " and Scala " + project.defScalaVersion.value)
+		project.log.info("   using " + project.getClass.getName + " with sbt " + ComponentManager.version + " and Scala " + project.defScalaVersion.value)
 		processArguments(project, initialize(remainingArguments), configuration, startTime) match
 		{
 			case e: xsbti.Exit =>
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index bfb1d284e..add3433e2 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -215,6 +215,9 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* from the version of Scala used to build the project (current version used is buildScalaVersion, available are in buildScalaVersions).
 	* This property is only read by `sbt` on startup and reload.*/
 	final val defScalaVersion = propertyOptional[String](info.definitionScalaVersion)
+	/** The property to specify the sbt revision to use.
+	* Note that this can by a dynamic revision (see Ivy documentation for details on dynamic revisions).
+	*Therefore, use `sbt.ComponentManager.version` and `timestamp` for actual version information. */
 	final val sbtVersion = property[String]
 	final val projectInitialize = propertyOptional[Boolean](false)
 	final val projectScratch = propertyOptional[Boolean](false, true)
@@ -223,9 +226,10 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 	* This property is only read by `sbt` on startup and reload.  The definitive source for the version of Scala currently
 	* being used is buildScalaVersion.*/
 	final val buildScalaVersions = propertyOptional[String](defScalaVersion.value, true)
-	/** The definitive source for the version of Scala being used to *build* the project.*/
+	/** The definitive source for the version of Scala being requested to *build* the project.
+	* For the full version information, see buildScalaInstance.actualVersion.*/
 	def buildScalaVersion = info.buildScalaVersion.getOrElse(crossScalaVersions.first)
-	private[sbt] def isScala27 = buildScalaVersion.startsWith("2.7.")
+	private[sbt] def isScala27 = buildScalaInstance.actualVersion.startsWith("2.7.")
 
 
 	def componentManager = new ComponentManager(info.launcher.globalLock, info.app.components, log)

From 35b7e90110965b4c95436b9f3537ec3eab0a33e7 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 13:39:44 -0500
Subject: [PATCH 259/268] Added webappUnmanaged method to control extra paths
 in target/webapp

---
 src/main/scala/sbt/DefaultProject.scala     | 8 ++++++--
 src/main/scala/sbt/Process.scala            | 7 ++++---
 src/main/scala/sbt/ScalaProject.scala       | 7 ++++++-
 src/main/scala/sbt/impl/CommandParser.scala | 9 ++++++++-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/sbt/DefaultProject.scala b/src/main/scala/sbt/DefaultProject.scala
index 9b67ce97d..8397d254b 100644
--- a/src/main/scala/sbt/DefaultProject.scala
+++ b/src/main/scala/sbt/DefaultProject.scala
@@ -353,9 +353,13 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	import BasicWebScalaProject._
 	override def watchPaths = super.watchPaths +++ webappResources
 
+	/** Override this to define paths that `prepare-webapp` and `package` should ignore.
+	* They will not be pruned by prepare-webapp and will not be included in the war.*/
+	def webappUnmanaged: PathFinder = Path.emptyPathFinder
+
 	lazy val prepareWebapp = prepareWebappAction
 	protected def prepareWebappAction =
-		prepareWebappTask(webappResources, temporaryWarPath, webappClasspath, mainDependencies.scalaJars) dependsOn(compile, copyResources)
+		prepareWebappTask(webappResources, temporaryWarPath, webappClasspath, mainDependencies.scalaJars, webappUnmanaged) dependsOn(compile, copyResources)
 
 	lazy val jettyInstance = new JettyRunner(jettyConfiguration)
 
@@ -414,7 +418,7 @@ abstract class BasicWebScalaProject extends BasicScalaProject with WebScalaProje
 	override def cleanAction = super.cleanAction dependsOn jettyStop
 
 	/** Redefine the `package` action to make a war file.*/
-	override protected def packageAction = packageTask(descendents(temporaryWarPath ##, "*"), warPath, Nil) dependsOn(prepareWebapp) describedAs PackageWarDescription
+	override protected def packageAction = packageWarAction(temporaryWarPath, webappUnmanaged, warPath, Nil) dependsOn(prepareWebapp) describedAs PackageWarDescription
 
 	/** Redefine the default main artifact to be a war file.*/
 	override protected def defaultMainArtifact = Artifact(artifactID, "war", "war")
diff --git a/src/main/scala/sbt/Process.scala b/src/main/scala/sbt/Process.scala
index fda7b593c..87aa314c8 100644
--- a/src/main/scala/sbt/Process.scala
+++ b/src/main/scala/sbt/Process.scala
@@ -3,7 +3,6 @@
  */
 package sbt
 
-import sbt.impl.CommandParser
 import java.lang.{Process => JProcess, ProcessBuilder => JProcessBuilder}
 import java.io.{Closeable, File, IOException}
 import java.io.{BufferedReader, InputStream, InputStreamReader, OutputStream, PipedInputStream, PipedOutputStream}
@@ -22,10 +21,12 @@ object Process
 		apply(command, Some(cwd), extraEnv : _*)
 	/** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
 	def apply(command: String, cwd: Option[File], extraEnv: (String,String)*): ProcessBuilder = {
-		CommandParser.parse(command) match {
+		apply(command.split("""\s+"""), cwd, extraEnv : _*)
+		// not smart to use this on windows, because CommandParser uses \ to escape ".
+		/*CommandParser.parse(command) match {
 			case Left(errorMsg) => error(errorMsg)
 			case Right((cmd, args)) => apply(cmd :: args, cwd, extraEnv : _*)
-		}
+		}*/
 	}
 	/** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
 	def apply(command: Seq[String], cwd: Option[File], extraEnv: (String,String)*): ProcessBuilder = {
diff --git a/src/main/scala/sbt/ScalaProject.scala b/src/main/scala/sbt/ScalaProject.scala
index ad2aa4075..4e3d1a9ba 100644
--- a/src/main/scala/sbt/ScalaProject.scala
+++ b/src/main/scala/sbt/ScalaProject.scala
@@ -322,9 +322,14 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
 
 trait WebScalaProject extends ScalaProject
 {
+	protected def packageWarAction(stagedWarPath: Path, ignore: PathFinder, outputWarPath: => Path, options: => Seq[PackageOption]): Task =
+		packageTask(descendents(stagedWarPath ##, "*") --- ignore, outputWarPath, options)
+
 	@deprecated protected def prepareWebappTask(webappContents: PathFinder, warPath: => Path, classpath: PathFinder, extraJars: => Iterable[File]): Task =
 		prepareWebappTask(webappContents, warPath, classpath, Path.lazyPathFinder(extraJars.map(Path.fromFile)))
 	protected def prepareWebappTask(webappContents: PathFinder, warPath: => Path, classpath: PathFinder, extraJars: PathFinder): Task =
+		prepareWebappTask(webappContents, warPath, classpath, extraJars, Path.emptyPathFinder)
+	protected def prepareWebappTask(webappContents: PathFinder, warPath: => Path, classpath: PathFinder, extraJars: PathFinder, ignore: PathFinder): Task =
 		task
 		{
 			val webInfPath = warPath / "WEB-INF"
@@ -342,7 +347,7 @@ trait WebScalaProject extends ScalaProject
 			copyFlat(libs, webLibDirectory, log).right flatMap { copiedLibs =>
 			copyFilesFlat(extraJars.get.map(_.asFile), webLibDirectory, log).right flatMap { copiedExtraLibs =>
 				{
-					val toRemove = scala.collection.mutable.HashSet((warPath ** "*").get.toSeq : _*)
+					val toRemove = scala.collection.mutable.HashSet(((warPath ** "*") --- ignore).get.toSeq : _*)
 					toRemove --= copiedWebapp
 					toRemove --= copiedClasses
 					toRemove --= copiedLibs
diff --git a/src/main/scala/sbt/impl/CommandParser.scala b/src/main/scala/sbt/impl/CommandParser.scala
index b64011fed..a2fab873d 100644
--- a/src/main/scala/sbt/impl/CommandParser.scala
+++ b/src/main/scala/sbt/impl/CommandParser.scala
@@ -11,7 +11,14 @@ import scala.util.parsing.input.CharArrayReader.EofCh
 * identifier argument*
 * where argument may be quoted to include spaces and
 * quotes and backslashes should be escaped.
-* (Most of the complexity is for decent error handling.)*/
+*/
+object Arguments
+{
+	def apply(commandString: String): Either[String, (String, List[String])] =
+		CommandParser.parse(commandString)
+}
+
+/* Most of the complexity is for error handling.*/
 private[sbt] object CommandParser extends Parsers
 {
 	type Elem = Char

From 9afe2079933c04459cf76086be9b5427aeca1193 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 13:43:29 -0500
Subject: [PATCH 260/268] Use arguments file for calling javac to fix issue
 with long command lines

---
 src/main/scala/sbt/Compile.scala       | 20 ++++++++++++++++++--
 src/main/scala/sbt/FileUtilities.scala |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index bf65dded7..dbdb7d897 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -69,7 +69,7 @@ sealed abstract class CompilerBase extends CompilerCore
 // Copyright 2005-2008 LAMP/EPFL
 // Original author: Martin Odersky
 
-final class Compile(maximumErrors: Int, compiler: AnalyzingCompiler, analysisCallback: AnalysisCallback, baseDirectory: Path) extends CompilerBase
+final class Compile(maximumErrors: Int, compiler: AnalyzingCompiler, analysisCallback: AnalysisCallback, baseDirectory: Path) extends CompilerBase with WithArgumentFile
 {
 	protected def processScala(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger)
 	{
@@ -80,10 +80,26 @@ final class Compile(maximumErrors: Int, compiler: AnalyzingCompiler, analysisCal
 	{
 		val arguments = (new CompilerArguments(compiler.scalaInstance))(sources, classpath, outputDirectory, options, true)
 		log.debug("Calling 'javac' with arguments:\n\t" + arguments.mkString("\n\t"))
-		val code = Process("javac", arguments) ! log
+		def javac(argFile: File) = Process("javac", ("@" + normalizeSlash(argFile.getAbsolutePath)) :: Nil) ! log
+		val code = withArgumentFile(arguments)(javac)
 		if( code != 0 ) throw new CompileFailed(arguments.toArray, "javac returned nonzero exit code")
 	}
 }
+trait WithArgumentFile extends NotNull
+{
+	def withArgumentFile[T](args: Seq[String])(f: File => T): T =
+	{
+		import xsbt.FileUtilities._
+		withTemporaryDirectory { tmp =>
+			val argFile = new File(tmp, "argfile")
+			write(argFile, args.map(escapeSpaces).mkString(FileUtilities.Newline))
+			f(argFile)
+		}
+	}
+	// javac's argument file seems to allow naive space escaping with quotes.  escaping a quote with a backslash does not work
+	def escapeSpaces(s: String): String = '\"' + normalizeSlash(s) + '\"'
+	def normalizeSlash(s: String) = s.replace(File.separatorChar, '/')
+}
 final class Scaladoc(maximumErrors: Int, compiler: AnalyzingCompiler) extends CompilerCore
 {
 	protected def processScala(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger): Unit =
diff --git a/src/main/scala/sbt/FileUtilities.scala b/src/main/scala/sbt/FileUtilities.scala
index 0ad0d2c9b..863e8d4e5 100644
--- a/src/main/scala/sbt/FileUtilities.scala
+++ b/src/main/scala/sbt/FileUtilities.scala
@@ -35,7 +35,7 @@ object FileUtilities
 	import wrap.Wrappers.readOnly
 	/** The size of the byte or char buffer used in various methods.*/
 	private val BufferSize = 8192
-	private val Newline = System.getProperty("line.separator")
+	val Newline = System.getProperty("line.separator")
 	/** A pattern used to split a String by path separator characters.*/
 	private val PathSeparatorPattern = java.util.regex.Pattern.compile(File.pathSeparator)
 

From 7e541dde3152d2f34e9f011db6bd1a3cbd5d4436 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 13:44:29 -0500
Subject: [PATCH 261/268] lazier completions

---
 src/main/scala/sbt/LineReader.scala | 37 ++++++++++++++++-------------
 src/main/scala/sbt/Main.scala       |  4 ++--
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/main/scala/sbt/LineReader.scala b/src/main/scala/sbt/LineReader.scala
index 476621ea5..174a4ab23 100644
--- a/src/main/scala/sbt/LineReader.scala
+++ b/src/main/scala/sbt/LineReader.scala
@@ -7,11 +7,16 @@ trait LineReader extends NotNull
 {
 	def readLine(prompt: String): Option[String]
 }
-class Completors(val projectAction: String, val projectNames: Iterable[String],
+class Completors(val projectAction: String, projectNames0: => Iterable[String],
 	val generalCommands: Iterable[String], val propertyActions: Iterable[String],
-	val specificPrefix: String, val scalaVersions: Iterable[String],
+	val specificPrefix: String, scalaVersions0: => Iterable[String],
 	val prefixes: Iterable[String], val taskNames: Iterable[String],
-	val propertyNames: Iterable[String], val extra: ExtraCompletions) extends NotNull
+	propertyNames0: => Iterable[String], val extra: ExtraCompletions) extends NotNull
+{
+	lazy val scalaVersions = scalaVersions0
+	lazy val propertyNames = propertyNames0
+	lazy val projectNames = projectNames0
+}
 
 trait ExtraCompletions extends NotNull
 {
@@ -96,16 +101,17 @@ object MainCompletor
 		def specificCompletor(baseCompletor: Completor) =
 		{
 			val specific = simpleCompletor(specificPrefix :: Nil) // TODO
-			new ArgumentCompletor( Array( specific, simpleCompletor(scalaVersions), baseCompletor ) )
+			argumentCompletor( Array( specific, lazySimpleCompletor(scalaVersions), baseCompletor ) )
 		}
 		def extraCompletor(name: String) =
-			repeatedArgumentCompletor(simpleCompletor(name :: Nil), new LazyCompletor(simpleCompletor(extra.completions(name))))
+			repeatedArgumentCompletor(simpleCompletor(name :: Nil), lazySimpleCompletor(extra.completions(name)))
 		val taskCompletor = simpleCompletor(TreeSet(taskNames.toSeq : _*))
 		val extraCompletors = extra.names.map(extraCompletor)
-		val baseCompletors = generalCompletor :: taskCompletor :: projectCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
+		val baseCompletors = generalCompletor :: projectCompletor :: taskCompletor :: propertyCompletor(propertyNames) :: extraCompletors.toList
 		val baseCompletor = new MultiCompletor(baseCompletors.toArray)
 
 		val completor = new MultiCompletor()
+		//TODO: baseCompletor for prefixedCompletor should only be taskCompletor ++ extraCompletors
 		completor.setCompletors( Array(baseCompletor, prefixedCompletor(baseCompletor), specificCompletor(baseCompletor)) )
 		completor
 	}
@@ -116,22 +122,19 @@ object MainCompletor
 			(buffer.charAt(pos) == ' ') && buffer.substring(0, pos).trim.indexOf(' ') == -1
 	}
 
+	private def lazySimpleCompletor(completions: => Iterable[String]) = new LazyCompletor(simpleCompletor(completions))
 	private def simpleCompletor(completions: Iterable[String]) = new SimpleCompletor(completions.toList.toArray)
-	private def simpleArgumentCompletor(first: Iterable[String], second: Iterable[String]) =
-		singleArgumentCompletor(simpleCompletor(first), simpleCompletor(second))
+	private def simpleArgumentCompletor(first: Iterable[String], second: => Iterable[String]) =
+		singleArgumentCompletor(simpleCompletor(first), lazySimpleCompletor(second))
 	private def singleArgumentCompletor(first: Completor, second: Completor) =
 	{
 		val completors = Array(first, second, new NullCompletor)
-		val c = new ArgumentCompletor(completors, SingleArgumentDelimiter)
-		c.setStrict(true)
-		c
-	}
-	private def repeatedArgumentCompletor(first: Completor, repeat: Completor) =
-	{
-		val c = new ArgumentCompletor(Array(first, repeat))
-		c.setStrict(true)
-		c
+		strict(  new ArgumentCompletor(completors, SingleArgumentDelimiter) )
 	}
+	private def repeatedArgumentCompletor(first: Completor, repeat: Completor) = argumentCompletor(Array(first, repeat))
+	private def argumentCompletor(args: Array[Completor]) = strict(new ArgumentCompletor(args))
+		
+	private def strict(c: ArgumentCompletor) = { c.setStrict(true); c }
 }
 private class LazyCompletor(delegate0: => Completor) extends Completor
 {
diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index 907115a6c..e06770d1c 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -325,9 +325,9 @@ class xMain extends xsbti.AppMain
 			None
 		}
 	}
-	// todo:  project.log.info("No actions specified, interactive session started. Execute 'help' for more information.")
 	private def prompt(baseProject: Project, project: Project): String =
 	{
+		// the times for evaluating the lazy vals here are a few hundred ms out of a 2s startup
 		lazy val projectNames = baseProject.projectClosure.map(_.name)
 		val prefixes = ContinuousExecutePrefix :: CrossBuildPrefix :: Nil
 		lazy val scalaVersions = baseProject.crossScalaVersions ++ Seq(baseProject.defScalaVersion.value)
@@ -439,7 +439,7 @@ class xMain extends xsbti.AppMain
 		printCmd(TerminateActions.elements.mkString(", "), "Terminates the build.")
 		printCmd(SetAction + " <property> <value>", "Sets the value of the property given as its argument.")
 		printCmd(GetAction + " <property>", "Gets the value of the property given as its argument.")
-		printCmd(ProjectConsoleAction, "Enters the Scala interpreter with the current project bound to the variable 'current' and all members imported.")
+		printCmd(ProjectConsoleAction, "Enters the Scala interpreter with the current project definition bound to the variable 'current' and all members imported.")
 		if(!isInteractive)
 			printCmd(InteractiveCommand, "Enters the sbt interactive shell")
 	}

From 0caaec9422dbaebfd82e6fdde0104809212b6c92 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 13:44:56 -0500
Subject: [PATCH 262/268] work with latest xsbt compiler module

---
 src/main/scala/sbt/Project.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index add3433e2..a3b60e581 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -256,7 +256,7 @@ trait Project extends TaskManager with Dag[Project] with BasicEnvironment
 			xsbt.ScalaInstance(version, info.launcher)
 	lazy val localScalaInstances: Seq[ScalaInstance] = localScala ++ info.parent.toList.flatMap(_.localScalaInstances)
 	def localScala: Seq[ScalaInstance] = Nil
-	def buildCompiler = new AnalyzingCompiler(buildScalaInstance, componentManager)
+	lazy val buildCompiler = new AnalyzingCompiler(buildScalaInstance, componentManager, log)
 	/** Get a `ScalaInstance` for the Scala version with base directory `home`.  The library and compiler jars are
 	* assumed to be at `new File(home, "lib/scala-library.jar")` and `new File(home, "lib/scala-compiler.jar")`.
 	* The label for this instance is determined by the version String in the `compiler.properties` file in `scala-compiler.jar`.*/

From 6bee0f1176bb7b8caee828e401d42628c91ebed9 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 17:11:04 -0500
Subject: [PATCH 263/268] Extra String-related classes on Path

---
 src/main/scala/sbt/Path.scala | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
index 7affd5a58..4e6c68aba 100644
--- a/src/main/scala/sbt/Path.scala
+++ b/src/main/scala/sbt/Path.scala
@@ -120,12 +120,14 @@ object Path
 	def absolute(file: File) = new File(file.toURI.normalize).getAbsoluteFile
 	/** Constructs a String representation of <code>Path</code>s.  The absolute path String of each <code>Path</code> is
 	* separated by the platform's path separator.*/
-	def makeString(paths: Iterable[Path]): String = paths.map(_.absolutePath).mkString(pathSeparator)
+	def makeString(paths: Iterable[Path]): String = makeString(paths, pathSeparator)
+	/** Constructs a String representation of <code>Path</code>s.  The absolute path String of each <code>Path</code> is
+	* separated by the given separator String.*/
+	def makeString(paths: Iterable[Path], sep: String): String = paths.map(_.absolutePath).mkString(sep)
 	
 	/** Constructs a String representation of <code>Path</code>s.  The relative path String of each <code>Path</code> is
 	* separated by the platform's path separator.*/
-	def makeRelativeString(paths: Iterable[Path]): String = makeRelativeString(paths, sep.toString)
-	def makeRelativeString(paths: Iterable[Path], separator: String): String = paths.map(_.relativePathString(separator)).mkString(pathSeparator)
+	def makeRelativeString(paths: Iterable[Path]): String = paths.map(_.relativePathString(sep.toString)).mkString(pathSeparator)
 	
 	def splitString(projectPath: Path, value: String): Iterable[Path] =
 	{
@@ -273,7 +275,12 @@ sealed abstract class PathFinder extends NotNull
 	final def flatMap(f: Path => PathFinder): PathFinder = Path.lazyPathFinder(get.flatMap(p => f(p).get))
 	final def getFiles: scala.collection.Set[File] = Set( get.map(_.asFile).toSeq : _*)
 	final def getPaths: scala.collection.Set[String] = Set( get.map(_.absolutePath).toSeq : _*)
+	final def getRelativePaths: scala.collection.Set[String] = Set( get.map(_.relativePath).toSeq : _*)
 	private[sbt] def addTo(pathSet: Set[Path])
+
+	final def absString = Path.makeString(get)
+	final def relativeString = Path.makeRelativeString(get)
+	override def toString = getRelativePaths.mkString("\n")
 }
 private class BasePathFinder(base: PathFinder) extends PathFinder
 {

From 05e42502539f6eca3969d9ed16dae18b87055035 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 19:31:27 -0500
Subject: [PATCH 264/268] Add *** to Path for all descendents

---
 src/main/scala/sbt/Path.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
index 4e6c68aba..1a6db396d 100644
--- a/src/main/scala/sbt/Path.scala
+++ b/src/main/scala/sbt/Path.scala
@@ -241,6 +241,7 @@ sealed abstract class PathFinder extends NotNull
 	/** Constructs a new finder that selects all paths with a name that matches <code>filter</code> and are
 	* descendents of paths selected by this finder.*/
 	def **(filter: FileFilter): PathFinder = new DescendentOrSelfPathFinder(this, filter)
+	def *** : PathFinder = **(AllPassFilter)
 	/** Constructs a new finder that selects all paths with a name that matches <code>filter</code> and are
 	* immediate children of paths selected by this finder.*/
 	def *(filter: FileFilter): PathFinder = new ChildPathFinder(this, filter)

From df6d83911a4deb3b048fbcd80cbef2b5ed9ea505 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 19:33:58 -0500
Subject: [PATCH 265/268] tests for javac argument file and unmanaged webapp

---
 src/sbt-test/java/argfile/project/build.properties         | 2 ++
 src/sbt-test/java/argfile/project/build/A.scala            | 7 +++++++
 src/sbt-test/java/argfile/src/ java test /a/A.java         | 3 +++
 src/sbt-test/java/argfile/src/ scala test /Test s.scala    | 7 +++++++
 src/sbt-test/java/argfile/test                             | 1 +
 src/sbt-test/web/unmanaged/project/build.properties        | 2 ++
 .../web/unmanaged/project/build/UnmanagedTest.scala        | 7 +++++++
 src/sbt-test/web/unmanaged/test                            | 6 ++++++
 8 files changed, 35 insertions(+)
 create mode 100644 src/sbt-test/java/argfile/project/build.properties
 create mode 100644 src/sbt-test/java/argfile/project/build/A.scala
 create mode 100644 src/sbt-test/java/argfile/src/ java test /a/A.java
 create mode 100644 src/sbt-test/java/argfile/src/ scala test /Test s.scala
 create mode 100644 src/sbt-test/java/argfile/test
 create mode 100644 src/sbt-test/web/unmanaged/project/build.properties
 create mode 100644 src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
 create mode 100644 src/sbt-test/web/unmanaged/test

diff --git a/src/sbt-test/java/argfile/project/build.properties b/src/sbt-test/java/argfile/project/build.properties
new file mode 100644
index 000000000..f176ee56f
--- /dev/null
+++ b/src/sbt-test/java/argfile/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Arg File Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/project/build/A.scala b/src/sbt-test/java/argfile/project/build/A.scala
new file mode 100644
index 000000000..af3ae5f5a
--- /dev/null
+++ b/src/sbt-test/java/argfile/project/build/A.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class A(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def mainScalaSourcePath = sourcePath / " scala test "
+	override def mainJavaSourcePath = sourcePath / " java test "
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/src/ java test /a/A.java b/src/sbt-test/java/argfile/src/ java test /a/A.java
new file mode 100644
index 000000000..7e84311b2
--- /dev/null
+++ b/src/sbt-test/java/argfile/src/ java test /a/A.java	
@@ -0,0 +1,3 @@
+package a;
+public class A {
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/src/ scala test /Test s.scala b/src/sbt-test/java/argfile/src/ scala test /Test s.scala
new file mode 100644
index 000000000..16e70b30e
--- /dev/null
+++ b/src/sbt-test/java/argfile/src/ scala test /Test s.scala	
@@ -0,0 +1,7 @@
+object Test
+{
+	def main(args: Array[String])
+	{
+		println(new a.A)
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/test b/src/sbt-test/java/argfile/test
new file mode 100644
index 000000000..9e4c2371c
--- /dev/null
+++ b/src/sbt-test/java/argfile/test
@@ -0,0 +1 @@
+> run
\ No newline at end of file
diff --git a/src/sbt-test/web/unmanaged/project/build.properties b/src/sbt-test/web/unmanaged/project/build.properties
new file mode 100644
index 000000000..1a56e136a
--- /dev/null
+++ b/src/sbt-test/web/unmanaged/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Webapp Unmanaged
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala b/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
new file mode 100644
index 000000000..f675a295d
--- /dev/null
+++ b/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class UnmanagedTest(info: ProjectInfo) extends DefaultWebProject(info)
+{
+	override def disableCrossPaths = true
+	override def webappUnmanaged = temporaryWarPath / "WEB-INF" / "appengine-generated" ***
+}
\ No newline at end of file
diff --git a/src/sbt-test/web/unmanaged/test b/src/sbt-test/web/unmanaged/test
new file mode 100644
index 000000000..2826c6833
--- /dev/null
+++ b/src/sbt-test/web/unmanaged/test
@@ -0,0 +1,6 @@
+> prepare-webapp
+$ touch target/webapp/WEB-INF/appengine-generated/test-keep
+$ touch target/webapp/WEB-INF/other/test-remove
+> prepare-webapp
+$ exists target/webapp/WEB-INF/appengine-generated/test-keep
+$ absent target/webapp/WEB-INF/other/test-remove
\ No newline at end of file

From de8af817ac2a9f698c97e8495b11ebe121055b09 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 19 Mar 2010 19:21:40 -0400
Subject: [PATCH 266/268] Split Processor into Processor/BasicProcessor:  *
 Processor provides a high level of integration with command processing.  *
 BasicProcessor operates on a Project but does not affect command processing.

---
 src/main/scala/sbt/Main.scala                 | 17 +++--
 src/main/scala/sbt/processor/Handler.scala    |  7 +-
 src/main/scala/sbt/processor/Processor.scala  | 31 +++++++-
 .../processor/project/build.properties        |  2 +
 .../project/build/ProcessorProject.scala      |  8 ++
 .../src/test/scala/ProcessorTest.scala        | 74 +++++++++++++++++++
 src/sbt-test/project/processor/test           |  2 +
 7 files changed, 129 insertions(+), 12 deletions(-)
 create mode 100644 src/sbt-test/project/processor/project/build.properties
 create mode 100644 src/sbt-test/project/processor/project/build/ProcessorProject.scala
 create mode 100644 src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala
 create mode 100644 src/sbt-test/project/processor/test

diff --git a/src/main/scala/sbt/Main.scala b/src/main/scala/sbt/Main.scala
index e06770d1c..4d8f25bc2 100755
--- a/src/main/scala/sbt/Main.scala
+++ b/src/main/scala/sbt/Main.scala
@@ -141,8 +141,11 @@ class xMain extends xsbti.AppMain
 			def rememberFail(newArgs: List[String]) = failAction.map(f => (FailureHandlerPrefix + f)).toList :::  newArgs
 
 			def tryOrFail(action: => Trampoline)  =  try { action } catch { case e: Exception => logCommandError(project.log, e); failed(BuildErrorExitCode) }
-			def reload(newID: ApplicationID, args: List[String]) =
+			def reload(args: List[String]) =
+			{
+				val newID = new ApplicationID(configuration.provider.id, baseProject.sbtVersion.value)
 				result( new Reboot(project.defScalaVersion.value, rememberCurrent(args), newID, configuration.baseDirectory) )
+			}
 			def failed(code: Int) =
 				failAction match
 				{
@@ -154,7 +157,7 @@ class xMain extends xsbti.AppMain
 			{
 				case "" :: tail => continue(project, tail, failAction)
 				case (ExitCommand | QuitCommand) :: _ => result( Exit(NormalExitCode) )
-				case RebootCommand :: tail => reload( new ApplicationID(configuration.provider.id, baseProject.sbtVersion.value), tail )
+				case RebootCommand :: tail => reload( tail )
 				case InteractiveCommand :: _ => continue(project, prompt(baseProject, project) :: arguments, interactiveContinue)
 				case SpecificBuild(version, action) :: tail =>
 					if(Some(version) != baseProject.info.buildScalaVersion)
@@ -220,10 +223,14 @@ class xMain extends xsbti.AppMain
 						continue(project, tail, failAction)
 					}
 
-				case PHandler(processor, arguments) :: tail =>
+				case PHandler(parsed) :: tail =>
 					 tryOrFail {
-						val result =processor(project, arguments)
-						continue(project, result.insertArguments ::: tail, failAction)
+						parsed.processor(parsed.label, project, failAction, parsed.arguments) match
+						{
+							case s: processor.Success => continue(s.project, s.insertArguments ::: tail, s.onFailure)
+							case e: processor.Exit => result( Exit(e.code) )
+							case r: processor.Reload => reload( r.insertArguments ::: tail )
+						}
 					 }
 		
 				case action :: tail =>
diff --git a/src/main/scala/sbt/processor/Handler.scala b/src/main/scala/sbt/processor/Handler.scala
index 9933f2e4c..8cd349f98 100644
--- a/src/main/scala/sbt/processor/Handler.scala
+++ b/src/main/scala/sbt/processor/Handler.scala
@@ -5,10 +5,10 @@ package sbt.processor
 
 class Handler(baseProject: Project) extends NotNull
 {
-	def unapply(line: String): Option[(Processor, String)] =
+	def unapply(line: String): Option[ParsedProcessor] =
 		line.split("""\s+""", 2) match
 		{
-			case Array(GetProcessor(processor), args @ _*) => Some( (processor, args.mkString) )
+			case Array(label @ GetProcessor(processor), args @ _*) => Some( new ParsedProcessor(label, processor, args.mkString) )
 			case _ => None
 		}
 	private object GetProcessor
@@ -31,4 +31,5 @@ class Handler(baseProject: Project) extends NotNull
 	
 	lazy val defParser = new DefinitionParser
 	lazy val manager = new ManagerImpl(files, scalaVersion, new Persist(lock, persistLockFile.asFile, defParser), baseProject.log)
-}
\ No newline at end of file
+}
+class ParsedProcessor(val label: String, val processor: Processor, val arguments: String) extends NotNull
\ No newline at end of file
diff --git a/src/main/scala/sbt/processor/Processor.scala b/src/main/scala/sbt/processor/Processor.scala
index 883467bd8..5824f40df 100644
--- a/src/main/scala/sbt/processor/Processor.scala
+++ b/src/main/scala/sbt/processor/Processor.scala
@@ -11,10 +11,28 @@ trait Processor extends NotNull
 	/** Apply this processor's action to the given `project`.
 	* The arguments are passed unparsed as a single String `args`.
 	* The return value optionally provides additional commands to run, such as 'reload'.
-	* Note: `project` is not necessarily the root project.  To get the root project, use `project.rootProject`.*/
-	def apply(project: Project, args: String): ProcessorResult
+	* Note: `project` is not necessarily the root project.  To get the root project, use `project.rootProject`.
+	* The `label` used to call the processor is provided to allow recursing.*/
+	def apply(label: String, project: Project, onFailure: Option[String], args: String): ProcessorResult
 }
-/** The result of a Processor run.
+/** An interface for code that operates on an sbt `Project` but doesn't need to modify command processing.*/
+abstract class BasicProcessor extends Processor
+{
+	/** Apply this processor's action to the given `project`.
+	* The arguments are passed unparsed as a single String `args`.
+	* Note: `project` is not necessarily the root project.  To get the root project, use `project.rootProject`.*/
+	def apply(project: Project, args: String): Unit
+
+	override final def apply(label: String, project: Project, onFailure: Option[String], args: String): ProcessorResult =
+	{
+		apply(project, args)
+		new Success(project, onFailure)
+	}
+}
+
+/** The result of a Processor run.*/
+sealed trait ProcessorResult extends NotNull
+/* Processor success.
 * `insertArgs` allows the Processor to insert additional commands to run.
 * These commands are run before pending commands.
 * 
@@ -25,7 +43,12 @@ trait Processor extends NotNull
 *   `sbt a cleanCompile b `
 * This runs `a`, `cleanCompile`, `clean`, `compile`, and finally `b`.
 * Commands are processed as if they were entered at the prompt or from the command line.*/
-final class ProcessorResult(insertArgs: String*) extends NotNull
+final class Success(val project: Project, val onFailure: Option[String], insertArgs: String*) extends ProcessorResult
+{
+	val insertArguments = insertArgs.toList
+}
+final class Exit(val code: Int) extends ProcessorResult
+final class Reload(insertArgs: String*) extends ProcessorResult
 {
 	val insertArguments = insertArgs.toList
 }
diff --git a/src/sbt-test/project/processor/project/build.properties b/src/sbt-test/project/processor/project/build.properties
new file mode 100644
index 000000000..c45202545
--- /dev/null
+++ b/src/sbt-test/project/processor/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Processor Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/project/processor/project/build/ProcessorProject.scala b/src/sbt-test/project/processor/project/build/ProcessorProject.scala
new file mode 100644
index 000000000..7c1170aa4
--- /dev/null
+++ b/src/sbt-test/project/processor/project/build/ProcessorProject.scala
@@ -0,0 +1,8 @@
+import sbt._
+
+class PTest(info: ProjectInfo) extends ProcessorProject(info)
+{
+	val launcherJar = "org.scala-tools.sbt" % "launcher" % info.app.id.version % "test"
+	val specs = "org.scala-tools.testing" % "specs" % "1.6.0" % "test"
+	override def testClasspath = super.testClasspath +++ info.sbtClasspath
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala b/src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala
new file mode 100644
index 000000000..5be8aed72
--- /dev/null
+++ b/src/sbt-test/project/processor/src/test/scala/ProcessorTest.scala
@@ -0,0 +1,74 @@
+package ptest
+
+import sbt._
+import Path.fromFile
+import org.specs._
+
+class ProcessorTest extends Specification
+{
+	"basic processor " should {
+		def success(f: processor.Success => Unit) = successOrFail(basicProcessorResult)(f)
+
+		"succeed" in {
+			success(_ => ())
+		}
+		"not insert any arguments" in {
+			success(_.insertArguments must_== Nil)
+		}
+		"preserve the fail handler" in {
+			success(_.onFailure must_== basicFail)
+		}
+	}
+	"full processor " should {
+		def success(f: processor.Success => Unit) = successOrFail(fullProcessorResult)(f)
+		"succeed" in {
+			success(_ => ())
+		}
+		"insert correct arguments" in {
+			success(_.insertArguments must_== testArgs)
+		}
+		"preserve the fail handler" in {
+			success(_.onFailure must_== testFail)
+		}
+	}
+
+	def successOrFail(r: processor.ProcessorResult)(f: processor.Success => Unit) =
+		r match
+		{
+			case s: processor.Success => f(s)
+			case _ => error("Processor failed: " + r)
+		}
+		
+	def withProject[T](f: Project => T): T =
+	{
+		val log = new ConsoleLogger
+		xsbt.FileUtilities.withTemporaryDirectory { tmp =>
+			val app = xsbt.boot.Launcher.defaultAppProvider(tmp)
+			val info = new ProjectInfo(tmp, Nil, None)(log, app, None)
+			val project = new DefaultProject(info)
+			f(project)
+		}
+	}
+	def basicProcessorResult =
+	{
+		var ranBasicArgs: Option[String] = None
+		val basic = new processor.BasicProcessor {
+			def apply(p: Project, args: String) = { ranBasicArgs = Some(args) }
+		}
+		val result = withProject { project => basic("basic", project, basicFail, basicArgs) }
+		ranBasicArgs must_== Some(basicArgs)
+		result
+	}
+	def fullProcessorResult =
+	{
+		val full = new processor.Processor {
+			def apply(label: String, p: Project, failAction: Option[String], args: String) = new processor.Success(p, failAction, args.split("""\s+"""): _*)
+		}
+		withProject { project => full("full", project, testFail, testArgs.mkString(" ")) }
+	}
+
+	lazy val testFail = Some("fail")
+	lazy val testArgs = List("a", "b")
+	lazy val basicArgs = " a b c "
+	lazy val basicFail = Some("basic-fail")
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/processor/test b/src/sbt-test/project/processor/test
new file mode 100644
index 000000000..5fbb5d887
--- /dev/null
+++ b/src/sbt-test/project/processor/test
@@ -0,0 +1,2 @@
+> update
+> test
\ No newline at end of file

From 274ed92515378596ab06fe9551ee2d4cc1cb6a67 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Fri, 19 Mar 2010 22:27:50 -0400
Subject: [PATCH 267/268] fix some tests

---
 .../configurations/changes/ivy/TestUse.scala                  | 2 +-
 .../configurations/changes/maven/TestUse.scala                | 2 +-
 src/sbt-test/project/src-plugins/changes/Plugins.scala        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
index 2d71feffd..e8f3445ba 100644
--- a/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
+++ b/src/sbt-test/dependency-management/configurations/changes/ivy/TestUse.scala
@@ -4,7 +4,7 @@ import sbt._
 class TestUse(info: ProjectInfo) extends DefaultProject(info)
 {
 	override def managedStyle = ManagedStyle.Ivy
-	val publishTo = Resolver.file("test-repo", path("repo").asFile)(Patterns(false, Resolver.mavenStyleBasePattern))
+	val testLocal = Resolver.file("test-repo", path("repo").asFile)(Patterns(false, Resolver.mavenStyleBasePattern))
 	val mavenC = "org.example" %% "test-ivy" % "1.0"
 	val mavenT = "org.example" %% "test-ivy" % "1.0" % "test"
 	val mavenR = "org.example" %% "test-ivy" % "1.0" % "runtime"
diff --git a/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala b/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
index fa8b7b6dc..db2bea94f 100644
--- a/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
+++ b/src/sbt-test/dependency-management/configurations/changes/maven/TestUse.scala
@@ -3,7 +3,7 @@ import sbt._
 
 class TestUse(info: ProjectInfo) extends DefaultProject(info)
 {
-	val publishTo = Resolver.file("test-repo", path("repo").asFile)
+	val testLocal = Resolver.file("test-repo", path("repo").asFile)
 	val mavenC = "org.example" %% "test" % "1.0"
 	val mavenT = "org.example" %% "test" % "1.0" % "test"
 	val mavenR = "org.example" %% "test" % "1.0" % "runtime"
diff --git a/src/sbt-test/project/src-plugins/changes/Plugins.scala b/src/sbt-test/project/src-plugins/changes/Plugins.scala
index 31492926e..bca4f1444 100644
--- a/src/sbt-test/project/src-plugins/changes/Plugins.scala
+++ b/src/sbt-test/project/src-plugins/changes/Plugins.scala
@@ -6,7 +6,7 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info)
 
 	override def managedStyle = ManagedStyle.Ivy
 	def projectRoot = Path.fromFile(info.projectPath.asFile.getParentFile.getParentFile)
-	val publishTo = Resolver.file("test-repo", (projectRoot /"repo" / "test").asFile)
+	val local = Resolver.file("test-repo", (projectRoot /"repo" / "test").asFile)
 
 	val plug = "test" % "plugins-test" % "1.0"
-}
\ No newline at end of file
+}

From fd39a1f99ec2c8519821c6a3f558796693ff37b2 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Mon, 22 Mar 2010 20:44:51 -0400
Subject: [PATCH 268/268] Fix console-project on subprojects

---
 src/main/scala/sbt/Compile.scala                       |  4 ++--
 src/main/scala/sbt/Path.scala                          |  2 +-
 src/main/scala/sbt/Project.scala                       |  8 +++++++-
 src/sbt-test/project/console/project/build.properties  |  2 ++
 src/sbt-test/project/console/project/build/P.scala     | 10 ++++++++++
 .../project/console/sub1/project/build/TestSub.scala   |  3 +++
 src/sbt-test/project/console/test                      |  7 +++++++
 7 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 src/sbt-test/project/console/project/build.properties
 create mode 100644 src/sbt-test/project/console/project/build/P.scala
 create mode 100644 src/sbt-test/project/console/sub1/project/build/TestSub.scala
 create mode 100644 src/sbt-test/project/console/test

diff --git a/src/main/scala/sbt/Compile.scala b/src/main/scala/sbt/Compile.scala
index dbdb7d897..ae2712c93 100644
--- a/src/main/scala/sbt/Compile.scala
+++ b/src/main/scala/sbt/Compile.scala
@@ -74,11 +74,11 @@ final class Compile(maximumErrors: Int, compiler: AnalyzingCompiler, analysisCal
 	protected def processScala(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger)
 	{
 		val callbackInterface = new AnalysisInterface(analysisCallback, baseDirectory, outputDirectory)
-		compiler(Set() ++ sources, Set() ++ classpath, outputDirectory, options, true, callbackInterface, maximumErrors, log)
+		compiler(Set() ++ sources, Set() ++ classpath, outputDirectory, options, callbackInterface, maximumErrors, log)
 	}
 	protected def processJava(sources: Set[File], classpath: Set[File], outputDirectory: File, options: Seq[String], log: Logger)
 	{
-		val arguments = (new CompilerArguments(compiler.scalaInstance))(sources, classpath, outputDirectory, options, true)
+		val arguments = (new CompilerArguments(compiler.scalaInstance, false, compiler.compilerOnClasspath))(sources, classpath, outputDirectory, options)
 		log.debug("Calling 'javac' with arguments:\n\t" + arguments.mkString("\n\t"))
 		def javac(argFile: File) = Process("javac", ("@" + normalizeSlash(argFile.getAbsolutePath)) :: Nil) ! log
 		val code = withArgumentFile(arguments)(javac)
diff --git a/src/main/scala/sbt/Path.scala b/src/main/scala/sbt/Path.scala
index 1a6db396d..7a0e4e6b8 100644
--- a/src/main/scala/sbt/Path.scala
+++ b/src/main/scala/sbt/Path.scala
@@ -281,7 +281,7 @@ sealed abstract class PathFinder extends NotNull
 
 	final def absString = Path.makeString(get)
 	final def relativeString = Path.makeRelativeString(get)
-	override def toString = getRelativePaths.mkString("\n")
+	override def toString = getRelativePaths.mkString("\n   ", "\n   ","")
 }
 private class BasePathFinder(base: PathFinder) extends PathFinder
 {
diff --git a/src/main/scala/sbt/Project.scala b/src/main/scala/sbt/Project.scala
index a3b60e581..6555f72d4 100644
--- a/src/main/scala/sbt/Project.scala
+++ b/src/main/scala/sbt/Project.scala
@@ -437,7 +437,13 @@ object Project
 		getProjectBuilder(project.info, project.log) match
 		{
 			case Some(builder) => builder.projectClasspath
-			case None => project.info.sbtClasspath
+			case _ if project.getClass == DefaultBuilderClass => project.info.sbtClasspath
+			case _ =>
+				project.info.parent match
+				{
+					case Some(p) => getProjectClasspath(p)
+					case None => project.info.sbtClasspath
+				}
 		}
 	private[sbt] def getProjectBuilder(info: ProjectInfo, buildLog: Logger): Option[BuilderProject] =
 	{
diff --git a/src/sbt-test/project/console/project/build.properties b/src/sbt-test/project/console/project/build.properties
new file mode 100644
index 000000000..3f2496999
--- /dev/null
+++ b/src/sbt-test/project/console/project/build.properties
@@ -0,0 +1,2 @@
+project.name=test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/project/console/project/build/P.scala b/src/sbt-test/project/console/project/build/P.scala
new file mode 100644
index 000000000..ee02785e3
--- /dev/null
+++ b/src/sbt-test/project/console/project/build/P.scala
@@ -0,0 +1,10 @@
+import sbt._
+
+class Root(info: ProjectInfo) extends ParentProject(info)
+{
+	lazy val sub1 = project("sub1", "sub1")
+	lazy val sub2 = project("sub2", "sub2", new Sub2(_))
+	lazy val sub3 = project("sub3", "sub3", new DefaultProject(_))
+	
+	class Sub2(info: ProjectInfo) extends DefaultProject(info)
+}
\ No newline at end of file
diff --git a/src/sbt-test/project/console/sub1/project/build/TestSub.scala b/src/sbt-test/project/console/sub1/project/build/TestSub.scala
new file mode 100644
index 000000000..f27b286af
--- /dev/null
+++ b/src/sbt-test/project/console/sub1/project/build/TestSub.scala
@@ -0,0 +1,3 @@
+import sbt._
+
+class TestSub(info: ProjectInfo) extends DefaultProject(info)
\ No newline at end of file
diff --git a/src/sbt-test/project/console/test b/src/sbt-test/project/console/test
new file mode 100644
index 000000000..ef1e4e956
--- /dev/null
+++ b/src/sbt-test/project/console/test
@@ -0,0 +1,7 @@
+> console-project
+> project sub3
+> console-project
+> project sub1
+> console-project
+> project sub2
+> console-project
\ No newline at end of file